diff options
author | vamsic007 <vamsic007@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-11 14:52:52 +0000 |
---|---|---|
committer | vamsic007 <vamsic007@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-11 14:52:52 +0000 |
commit | 5d35591322d6a3f6912f6d6e9040663ec9f2755c (patch) | |
tree | 016e2b05fdd99ff67ca293f87b0ea20932c0ddec /java/sca/modules | |
parent | ed610805f791ea1d3224301f4d902f855b1df67a (diff) |
Code to model Web and EJB archives (non-SCA enhanced archives) as SCA contributions.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@684766 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
9 files changed, 956 insertions, 0 deletions
diff --git a/java/sca/modules/contribution-jee/pom.xml b/java/sca/modules/contribution-jee/pom.xml new file mode 100644 index 0000000000..5910e75608 --- /dev/null +++ b/java/sca/modules/contribution-jee/pom.xml @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-modules</artifactId> + <version>1.4-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>tuscany-contribution-jee</artifactId> + <name>Apache Tuscany SCA Java EE</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-contribution</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-core-spi</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-interface-java</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-interface-java-xml</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-ejb</artifactId> + <version>1.4-SNAPSHOT</version> + <!--scope>runtime</scope--> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-web</artifactId> + <version>1.4-SNAPSHOT</version> + <!--scope>runtime</scope--> + </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-core</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-jee</artifactId> + <version>3.0</version> + </dependency> + + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>wstx-asl</artifactId> + <version>3.2.1</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + + <configuration> + <instructions> + <Bundle-Version>${tuscany.version}</Bundle-Version> + <Bundle-SymbolicName>org.apache.tuscany.sca.contribution.jee</Bundle-SymbolicName> + <Bundle-Description>${pom.name}</Bundle-Description> + <Export-Package>org.apache.tuscany.sca.contribution.jee*</Export-Package> + <DynamicImport-Package>org.apache.tuscany.sca.contribution.osgi.impl</DynamicImport-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java new file mode 100644 index 0000000000..224180ff5a --- /dev/null +++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java @@ -0,0 +1,141 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.contribution.jee; + +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.ComponentProperty; +import org.apache.tuscany.sca.assembly.ComponentReference; +import org.apache.tuscany.sca.assembly.ComponentService; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.CompositeReference; +import org.apache.tuscany.sca.assembly.CompositeService; +import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; +import org.apache.tuscany.sca.assembly.Property; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; +import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; +import org.apache.tuscany.sca.interfacedef.java.JavaInterface; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; +import org.apache.tuscany.sca.policy.DefaultPolicyFactory; +import org.apache.tuscany.sca.policy.Intent; +import org.apache.tuscany.sca.policy.PolicyFactory; + +/** + * @version $Rev$ $Date$ + */ +public class AssemblyHelper { + private static AssemblyFactory af = new DefaultAssemblyFactory(); + private static JavaInterfaceFactory jif = new DefaultJavaInterfaceFactory(); + + public static final Map<String, QName> ALLOWED_ENV_ENTRY_TYPES; + public static Intent CONVERSATIONAL_INTENT; + static { + ALLOWED_ENV_ENTRY_TYPES = new HashMap<String, QName>(); + ALLOWED_ENV_ENTRY_TYPES.put(String.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Character.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "string", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Byte.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "byte", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Short.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "short", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Integer.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "int", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Long.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "long", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Boolean.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "boolean", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Double.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "double", "xsd")); + ALLOWED_ENV_ENTRY_TYPES.put(Float.class.getName(), new QName("http://www.w3.org/2001/XMLSchema", "float", "xsd")); + } + + static { + PolicyFactory dpf = new DefaultPolicyFactory(); + CONVERSATIONAL_INTENT = dpf.createIntent(); + CONVERSATIONAL_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "conversational")); + + } + + public static JavaInterfaceContract createInterfaceContract(Class<?> clazz) throws InvalidInterfaceException { + JavaInterface ji = jif.createJavaInterface(clazz); + JavaInterfaceContract jic = jif.createJavaInterfaceContract(); + jic.setInterface(ji); + + return jic; + } + + public static ComponentService createComponentService() { + return af.createComponentService(); + } + + public static ComponentReference createComponentReference() { + return af.createComponentReference(); + } + + public static ComponentProperty createComponentProperty() { + return af.createComponentProperty(); + } + + public static ComponentType createComponentType() { + return af.createComponentType(); + } + + public static Component createComponentFromComponentType(ComponentType componentType, String componentName) { + Component component = af.createComponent(); + component.setName(componentName); + + for(Service service : componentType.getServices()) { + ComponentService compService = af.createComponentService(); + compService.setService(service); + component.getServices().add(compService); + } + + for(Reference reference : componentType.getReferences()) { + ComponentReference compReference = af.createComponentReference(); + compReference.setReference(reference); + component.getReferences().add(compReference); + } + + for(Property property : componentType.getProperties()) { + ComponentProperty compProperty = af.createComponentProperty(); + compProperty.setProperty(property); + component.getProperties().add(compProperty); + } + return component; + } + + public static Composite createComposite() { + return af.createComposite(); + } + + public static Component createComponent() { + return af.createComponent(); + } + + public static CompositeReference createCompositeReference() { + return af.createCompositeReference(); + } + + public static CompositeService createCompositeService() { + return af.createCompositeService(); + } +} diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java new file mode 100644 index 0000000000..970d1baad6 --- /dev/null +++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java @@ -0,0 +1,351 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.contribution.jee; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.openejb.config.EjbModule; +import org.apache.openejb.jee.EjbJar; +import org.apache.openejb.jee.EjbRef; +import org.apache.openejb.jee.EjbReference; +import org.apache.openejb.jee.EnterpriseBean; +import org.apache.openejb.jee.EnvEntry; +import org.apache.openejb.jee.MessageDrivenBean; +import org.apache.openejb.jee.SessionBean; +import org.apache.openejb.jee.SessionType; +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.ComponentProperty; +import org.apache.tuscany.sca.assembly.ComponentReference; +import org.apache.tuscany.sca.assembly.ComponentService; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.CompositeReference; +import org.apache.tuscany.sca.assembly.CompositeService; +import org.apache.tuscany.sca.assembly.Property; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.service.ContributionException; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; +import org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory; +import org.apache.tuscany.sca.interfacedef.InterfaceContract; +import org.apache.tuscany.sca.interfacedef.java.JavaInterface; + +/** + * @version $Rev$ $Date$ + */ +public class EJBModuleProcessor { + + private EjbModule ejbModule; + + private Map<String, List<String>> intfToBean = new HashMap<String, List<String>>(); + private List<String> statefulBeans = new ArrayList<String>(); + + public EJBModuleProcessor(EjbModule ejbModule) { + this.ejbModule = ejbModule; + } + + public Map<String, ComponentType> getEjbComponentTypes() throws ContributionException { + intfToBean.clear(); + statefulBeans.clear(); + Map<String, ComponentType> ejbComponentTypes = new HashMap<String, ComponentType>(); + + EjbJar ejbJar = ejbModule.getEjbJar(); + if(!ejbJar.getVersion().startsWith("3")) { + // Not an EJB3 module + // TODO: should throw an exception + } + + Map<String, EnterpriseBean> beansMap = ejbJar.getEnterpriseBeansByEjbName(); + for (Map.Entry<String, EnterpriseBean> entry : beansMap.entrySet()) { + EnterpriseBean bean = entry.getValue(); + ComponentType ct = null; + if (bean instanceof SessionBean) { + SessionBean sbean = (SessionBean) bean; + ct = getEjbComponentType(sbean, ejbModule.getClassLoader()); + } else if (bean instanceof MessageDrivenBean) { + MessageDrivenBean mdbean = (MessageDrivenBean) bean; + ct = getEjbComponentType(mdbean, ejbModule.getClassLoader()); + } else { + continue; + } + ejbComponentTypes.put(bean.getEjbName(), ct); + } + + // Adjust the references to STATEFUL beans + for (Map.Entry<String, ComponentType> entry : ejbComponentTypes + .entrySet()) { + ComponentType ct = entry.getValue(); + for (Reference reference : ct.getReferences()) { + String intf = ((JavaInterface) reference.getInterfaceContract().getInterface()).getName(); + for (String bean : intfToBean.get(intf)) { + if (statefulBeans.contains(bean)) { + reference.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT); + break; + } + } + } + } + + return ejbComponentTypes; + } + + public ComponentType getEjbAppComponentType() throws ContributionException { + ComponentType componentType = AssemblyHelper.createComponentType(); + + Map<String, ComponentType> ejbComponentTypes = getEjbComponentTypes(); + + for(Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) { + String beanName = entry.getKey(); + ComponentType ejbComponentType = entry.getValue(); + + for(Service service : ejbComponentType.getServices()) { + Service service2 = AssemblyHelper.createComponentService(); + service2.setName(beanName+"_"+service.getName()); + service2.setInterfaceContract(service.getInterfaceContract()); + service2.getRequiredIntents().addAll(service.getRequiredIntents()); + + componentType.getServices().add(service2); + } + + for(Reference reference : ejbComponentType.getReferences()) { + Reference reference2 = AssemblyHelper.createComponentReference(); + reference2.setName(beanName+"_"+reference.getName()); + reference2.setInterfaceContract(reference.getInterfaceContract()); + reference2.getRequiredIntents().addAll(reference.getRequiredIntents()); + + componentType.getReferences().add(reference2); + } + } + + return componentType; + } + + public Composite getEjbAppComposite() throws ContributionException { + Composite composite = AssemblyHelper.createComposite(); + + Map<String, ComponentType> ejbComponentTypes = getEjbComponentTypes(); + + ModelFactoryExtensionPoint mfep = new DefaultModelFactoryExtensionPoint(); + EJBImplementationFactory eif = mfep.getFactory(EJBImplementationFactory.class); + + for(Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) { + String ejbName = entry.getKey(); + ComponentType componentType = entry.getValue(); + + EJBImplementation impl = eif.createEJBImplementation(); + impl.setEJBLink(ejbModule.getModuleId()+"#"+ejbName); + // Create component + Component component = AssemblyHelper.createComponent(); + String componentName = ejbName; + component.setName(componentName); + component.setImplementation(impl); + + // Add services + for(Service service : componentType.getServices()) { + ComponentService componentService = AssemblyHelper.createComponentService(); + componentService.setService(service); + component.getServices().add(componentService); + } + + // Add references + for(Reference reference : componentType.getReferences()) { + ComponentReference componentReference = AssemblyHelper.createComponentReference(); + componentReference.setReference(reference); + component.getReferences().add(componentReference); + } + + // Add properties + for(Property property : componentType.getProperties()) { + ComponentProperty componentProperty = AssemblyHelper.createComponentProperty(); + componentProperty.setProperty(property); + component.getProperties().add(componentProperty); + } + + // Add component + composite.getComponents().add(component); + + // Add composite services + for(ComponentService service : component.getServices()) { + CompositeService compositeService = AssemblyHelper.createCompositeService(); + compositeService.setInterfaceContract(service.getInterfaceContract()); + compositeService.setPromotedComponent(component); + compositeService.setPromotedService(service); + composite.getServices().add(compositeService); + } + + // Add composite references + for(ComponentReference reference : component.getReferences()) { + CompositeReference compositeReference = AssemblyHelper.createCompositeReference(); + compositeReference.setInterfaceContract(reference.getInterfaceContract()); + compositeReference.getPromotedReferences().add(reference); + composite.getReferences().add(compositeReference); + } + } + return composite; + } + + private ComponentType getEjbComponentType(SessionBean bean, ClassLoader cl) throws ContributionException { + ComponentType componentType = AssemblyHelper.createComponentType(); + + boolean conversational = bean.getSessionType().equals(SessionType.STATEFUL); + if(conversational) { + statefulBeans.add(bean.getEjbName()); + } + + // Process Remote Business interfaces of the SessionBean + for(String intfName : bean.getBusinessRemote()) { + // This code is added to take care of EJB references to STATEFUL beans that are injected + // without a beanname in @EJB annotation + List<String> beansList = intfToBean.get(intfName); + if(beansList == null) { + beansList = new ArrayList<String>(); + intfToBean.put(intfName, beansList); + } + beansList.add(bean.getEjbName()); + + String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".")+1) : intfName; + Service service = AssemblyHelper.createComponentService(); + service.setName(serviceName); + InterfaceContract ic = null; + try { + Class<?> clazz = cl.loadClass(intfName); + ic = AssemblyHelper.createInterfaceContract(clazz); + ic.getInterface().setConversational(conversational); + ic.getInterface().setRemotable(true); + } catch (Exception e) { + throw new ContributionException(e); + } + service.setInterfaceContract(ic); + if(conversational) { + service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT); + } + componentType.getServices().add(service); + } + + // Process Local Business interfaces of the SessionBean + for(String intfName : bean.getBusinessLocal()) { + String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".")+1) : intfName; + Service service = AssemblyHelper.createComponentService(); + service.setName(serviceName); + InterfaceContract ic = null; + try { + Class<?> clazz = cl.loadClass(intfName); + ic = AssemblyHelper.createInterfaceContract(clazz); + ic.getInterface().setConversational(conversational); + } catch (Exception e) { + throw new ContributionException(e); + } + service.setInterfaceContract(ic); + if(conversational) { + service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT); + } + componentType.getServices().add(service); + } + + // Process Remote EJB References + for(Map.Entry<String, EjbRef> entry: bean.getEjbRefMap().entrySet()) { + EjbRef ejbRef = entry.getValue(); + if(ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) { + continue; + } + String referenceName = entry.getKey(); + referenceName = referenceName.replace("/", "_"); + Reference reference = AssemblyHelper.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = null; + try { + Class<?> clazz = cl.loadClass(ejbRef.getInterface()); + ic = AssemblyHelper.createInterfaceContract(clazz); + } catch (Exception e) { + throw new ContributionException(e); + } + reference.setInterfaceContract(ic); + componentType.getReferences().add(reference); + } + + // Process env-entries to compute properties + for(Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) { + EnvEntry envEntry = entry.getValue(); + String type = envEntry.getEnvEntryType(); + if(!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) { + continue; + } + String propertyName = entry.getKey(); + propertyName = propertyName.replace("/", "_"); + String value = envEntry.getEnvEntryValue(); + Property property = AssemblyHelper.createComponentProperty(); + property.setName(propertyName); + property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type)); + property.setValue(value); + componentType.getProperties().add(property); + } + + return componentType; + } + + private ComponentType getEjbComponentType(MessageDrivenBean bean, ClassLoader cl) throws ContributionException { + ComponentType componentType = AssemblyHelper.createComponentType(); + + // Process Remote EJB References + for(Map.Entry<String, EjbRef> entry: bean.getEjbRefMap().entrySet()) { + EjbRef ejbRef = entry.getValue(); + if(ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) { + continue; + } + String referenceName = entry.getKey(); + referenceName = referenceName.replace("/", "_"); + Reference reference = AssemblyHelper.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = null; + try { + Class<?> clazz = cl.loadClass(ejbRef.getInterface()); + ic = AssemblyHelper.createInterfaceContract(clazz); + } catch (Exception e) { + throw new ContributionException(e); + } + reference.setInterfaceContract(ic); + componentType.getReferences().add(reference); + } + + // Process env-entries to compute properties + for(Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) { + EnvEntry envEntry = entry.getValue(); + String type = envEntry.getEnvEntryType(); + if(!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) { + continue; + } + String propertyName = entry.getKey(); + propertyName = propertyName.replace("/", "_"); + String value = envEntry.getEnvEntryValue(); + Property property = AssemblyHelper.createComponentProperty(); + property.setName(propertyName); + property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type)); + property.setValue(value); + componentType.getProperties().add(property); + } + + return componentType; + } +} diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java new file mode 100644 index 0000000000..646067b933 --- /dev/null +++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.contribution.jee; + +import java.io.File; + +import org.apache.openejb.OpenEJBException; +import org.apache.openejb.config.AnnotationDeployer; +import org.apache.openejb.config.AppModule; +import org.apache.openejb.config.DeploymentLoader; +import org.apache.openejb.config.ReadDescriptors; +import org.apache.tuscany.sca.contribution.service.ContributionException; + +/** + * @version $Rev$ $Date$ + */ +public class JavaEEModuleHelper { + + public AppModule getMetadataCompleteModules(String jarFilePath) throws ContributionException { + DeploymentLoader loader = new DeploymentLoader(); + AppModule appModule = null; + try { + appModule = loader.load(new File(jarFilePath)); + } catch (OpenEJBException e) { + throw new ContributionException(e); + } + + // Process deployment descriptor files + ReadDescriptors readDescriptors = new ReadDescriptors(); + try { + readDescriptors.deploy(appModule); + } catch (OpenEJBException e) { + throw new ContributionException(e); + } + + // Process annotations + AnnotationDeployer annDeployer = new AnnotationDeployer(); + try { + annDeployer.deploy(appModule); + } catch (OpenEJBException e) { + throw new ContributionException(e); + } + + return appModule; + } +} diff --git a/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java new file mode 100644 index 0000000000..5f592c6dce --- /dev/null +++ b/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java @@ -0,0 +1,148 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.contribution.jee; + +import java.util.Map; + +import org.apache.openejb.config.WebModule; +import org.apache.openejb.jee.EjbRef; +import org.apache.openejb.jee.EjbReference; +import org.apache.openejb.jee.EnvEntry; +import org.apache.openejb.jee.WebApp; +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.ComponentProperty; +import org.apache.tuscany.sca.assembly.ComponentReference; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.CompositeReference; +import org.apache.tuscany.sca.assembly.Property; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.service.ContributionException; +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementationFactory; +import org.apache.tuscany.sca.interfacedef.InterfaceContract; + +public class WebModuleProcessor { + private WebModule webModule; + private ComponentType componentType; + + public WebModuleProcessor(WebModule module) { + webModule = module; + } + + public ComponentType getWebAppComponentType() throws ContributionException { + if(componentType != null) { + return componentType; + } + componentType = AssemblyHelper.createComponentType(); + + WebApp webApp = webModule.getWebApp(); + ClassLoader classLoader = webModule.getClassLoader(); + + // Process Remote EJB References + for(Map.Entry<String, EjbRef> entry: webApp.getEjbRefMap().entrySet()) { + EjbRef ejbRef = entry.getValue(); + if(ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) { + // Only Remote EJB references need to be considered. + // Skip the current one as it is a remote reference. + continue; + } + String referenceName = entry.getKey(); + referenceName = referenceName.replace("/", "_"); + Reference reference = AssemblyHelper.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = null; + try { + Class<?> clazz = classLoader.loadClass(ejbRef.getInterface()); + ic = AssemblyHelper.createInterfaceContract(clazz); + } catch (Exception e) { + componentType = null; + throw new ContributionException(e); + } + reference.setInterfaceContract(ic); + componentType.getReferences().add(reference); + } + + // Process env-entries to compute properties + for(Map.Entry<String, EnvEntry> entry : webApp.getEnvEntryMap().entrySet()) { + EnvEntry envEntry = entry.getValue(); + String type = envEntry.getEnvEntryType(); + if(!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) { + continue; + } + String propertyName = entry.getKey(); + propertyName = propertyName.replace("/", "_"); + String value = envEntry.getEnvEntryValue(); + Property property = AssemblyHelper.createComponentProperty(); + property.setName(propertyName); + property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type)); + property.setValue(value); + componentType.getProperties().add(property); + } + + return componentType; + } + + public Composite getWebAppComposite() throws ContributionException { + getWebAppComponentType(); + + Composite composite = AssemblyHelper.createComposite(); + + ModelFactoryExtensionPoint mfep = new DefaultModelFactoryExtensionPoint(); + WebImplementationFactory wif = mfep.getFactory(WebImplementationFactory.class); + WebImplementation impl = wif.createWebImplementation(); + impl.setWebURI(webModule.getModuleId()); + + // Create component + Component component = AssemblyHelper.createComponent(); + String componentName = webModule.getModuleId(); + component.setName(componentName); + component.setImplementation(impl); + + // Add references + for(Reference reference : componentType.getReferences()) { + ComponentReference componentReference = AssemblyHelper.createComponentReference(); + componentReference.setReference(reference); + component.getReferences().add(componentReference); + } + + // Add properties + for(Property property : componentType.getProperties()) { + ComponentProperty componentProperty = AssemblyHelper.createComponentProperty(); + componentProperty.setProperty(property); + component.getProperties().add(componentProperty); + } + + // Add component to composite + composite.getComponents().add(component); + + // Add composite references + for(ComponentReference reference : component.getReferences()) { + CompositeReference compositeReference = AssemblyHelper.createCompositeReference(); + compositeReference.setInterfaceContract(reference.getInterfaceContract()); + compositeReference.getPromotedReferences().add(reference); + composite.getReferences().add(compositeReference); + } + + return composite; + } +} diff --git a/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java b/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java new file mode 100644 index 0000000000..5cf76d29d6 --- /dev/null +++ b/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.contribution.jee; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.apache.openejb.config.AppModule; +import org.apache.openejb.config.EjbModule; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Service; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * @version $Rev$ $Date$ + */ +public class EJBModuleProcessorTestCase { + + EjbModule ejbModule; + + @Before + public void setUp() throws Exception { + String jarFilePath = "target/test-classes/ejb-injection-sample.jar"; + JavaEEModuleHelper jmh = new JavaEEModuleHelper(); + AppModule appModule = jmh.getMetadataCompleteModules(jarFilePath); + ejbModule = appModule.getEjbModules().get(0); + } + + @Test + public void testEjbContribution() throws Exception { + EJBModuleProcessor emp = new EJBModuleProcessor(ejbModule); + Map<String, ComponentType> ejbComponentTypes = emp.getEjbComponentTypes(); + Assert.assertEquals(3, ejbComponentTypes.size()); + + Assert.assertTrue(ejbComponentTypes.containsKey("DataStoreImpl")); + Assert.assertTrue(ejbComponentTypes.containsKey("DataStoreStatefulImpl")); + Assert.assertTrue(ejbComponentTypes.containsKey("DataReaderImpl")); + + ComponentType ct = ejbComponentTypes.get("DataStoreImpl"); + Assert.assertEquals(2, ct.getServices().size()); + Set<String> serviceNames = new HashSet<String>(); + for(Service s : ct.getServices()) { + serviceNames.add(s.getName()); + } + + Assert.assertEquals(2, serviceNames.size()); + Assert.assertTrue(serviceNames.contains("DataStoreRemote")); + Assert.assertTrue(serviceNames.contains("DataStoreLocal")); + + Assert.assertEquals(0, ct.getReferences().size()); + } +} diff --git a/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java b/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java new file mode 100644 index 0000000000..f7e8c56899 --- /dev/null +++ b/java/sca/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.contribution.jee; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.openejb.config.AppModule; +import org.apache.openejb.config.WebModule; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Reference; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * @version $Rev$ $Date$ + */ +public class WebModuleProcessorTestCase { + + WebModule webModule; + + @Before + public void setUp() throws Exception { + String jarFilePath = "target/test-classes/ejb-injection-sample.ear"; + JavaEEModuleHelper jmh = new JavaEEModuleHelper(); + AppModule appModule = jmh.getMetadataCompleteModules(jarFilePath); + webModule = appModule.getWebModules().get(0); + } + + @Test + public void testWebAppContribution() throws Exception { + WebModuleProcessor wmp = new WebModuleProcessor(webModule); + + ComponentType ct = wmp.getWebAppComponentType(); + Assert.assertEquals(2, ct.getReferences().size()); + Set<String> referenceNames = new HashSet<String>(); + for(Reference r : ct.getReferences()) { + referenceNames.add(r.getName()); + } + + Assert.assertEquals(2, referenceNames.size()); + Assert.assertTrue(referenceNames.contains("org.myorg.MyServlet_bank")); + Assert.assertTrue(referenceNames.contains("org.myorg.MyServlet_converter")); + + Assert.assertEquals(0, ct.getServices().size()); + + Composite composite = wmp.getWebAppComposite(); + Assert.assertEquals(2, composite.getReferences().size()); + } +} diff --git a/java/sca/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear b/java/sca/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear Binary files differnew file mode 100644 index 0000000000..3efdd206c7 --- /dev/null +++ b/java/sca/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear diff --git a/java/sca/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar b/java/sca/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar Binary files differnew file mode 100644 index 0000000000..4b9e3b79f4 --- /dev/null +++ b/java/sca/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar |