diff options
Diffstat (limited to 'branches/sca-java-1.x/modules/contribution-jee/src')
16 files changed, 1434 insertions, 0 deletions
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java new file mode 100644 index 0000000000..547ba52e74 --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java @@ -0,0 +1,163 @@ +/* + * 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 AssemblyFactory af; + private JavaInterfaceFactory jif; + + public static final Map<String, QName> ALLOWED_ENV_ENTRY_TYPES; + public static final Intent CONVERSATIONAL_INTENT; + public static final Intent EJB_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")); + + EJB_INTENT = dpf.createIntent(); + EJB_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "ejb")); + } + + public AssemblyHelper() { + super(); + af = new DefaultAssemblyFactory(); + jif = new DefaultJavaInterfaceFactory(); + } + + public AssemblyHelper(AssemblyFactory af, JavaInterfaceFactory jif) { + super(); + this.af = af; + this.jif = jif; + } + + public JavaInterfaceContract createInterfaceContract(Class<?> clazz) throws InvalidInterfaceException { + JavaInterface ji = jif.createJavaInterface(clazz); + JavaInterfaceContract jic = jif.createJavaInterfaceContract(); + jic.setInterface(ji); + + return jic; + } + + public ComponentService createComponentService() { + return af.createComponentService(); + } + + public ComponentReference createComponentReference() { + return af.createComponentReference(); + } + + public ComponentProperty createComponentProperty() { + return af.createComponentProperty(); + } + + public ComponentType createComponentType() { + return af.createComponentType(); + } + + public 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 Composite createComposite() { + return af.createComposite(); + } + + public Component createComponent() { + return af.createComponent(); + } + + public CompositeReference createCompositeReference() { + return af.createCompositeReference(); + } + + public CompositeService createCompositeService() { + return af.createCompositeService(); + } +} diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java new file mode 100644 index 0000000000..37ae53a38a --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java @@ -0,0 +1,406 @@ +/* + * 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.EjbRefType; +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 AssemblyHelper helper; + private Map<String, List<String>> intfToBean = new HashMap<String, List<String>>(); + private List<String> statefulBeans = new ArrayList<String>(); + + public EJBModuleProcessor(EjbModule ejbModule, AssemblyHelper helper) { + super(); + this.ejbModule = ejbModule; + this.helper = helper; + } + + public EJBModuleProcessor(EjbModule ejbModule) { + this.ejbModule = ejbModule; + this.helper = new AssemblyHelper(); + } + + 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; + } + if (ct != null) { + // Bean is an EJB3 bean + 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 = helper.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 = helper.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 = helper.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 = helper.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 = helper.createComponent(); + String componentName = ejbName; + component.setName(componentName); + component.setImplementation(impl); + + // Add services + for (Service service : componentType.getServices()) { + ComponentService componentService = helper.createComponentService(); + componentService.setService(service); + componentService.setInterfaceContract(service.getInterfaceContract()); + component.getServices().add(componentService); + } + + // Add references + for (Reference reference : componentType.getReferences()) { + ComponentReference componentReference = helper.createComponentReference(); + componentReference.setReference(reference); + componentReference.setInterfaceContract(reference.getInterfaceContract()); + componentReference.getRequiredIntents().addAll(reference.getRequiredIntents()); + component.getReferences().add(componentReference); + } + + // Add properties + for (Property property : componentType.getProperties()) { + ComponentProperty componentProperty = helper.createComponentProperty(); + componentProperty.setProperty(property); + component.getProperties().add(componentProperty); + } + + // Add component + composite.getComponents().add(component); + + // Add composite services + for (ComponentService service : component.getServices()) { + CompositeService compositeService = helper.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 = helper.createCompositeReference(); + compositeReference.setInterfaceContract(reference.getInterfaceContract()); + compositeReference.getRequiredIntents().addAll(reference.getRequiredIntents()); + compositeReference.getPromotedReferences().add(reference); + composite.getReferences().add(compositeReference); + } + } + return composite; + } + + private ComponentType getEjbComponentType(SessionBean bean, ClassLoader cl) throws ContributionException { + if(bean.getBusinessRemote().size() == 0 && bean.getBusinessLocal().size() == 0) { + // Not an EJB3 Session bean + return null; + } + ComponentType componentType = helper.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 = helper.createComponentService(); + service.setName(serviceName); + InterfaceContract ic = null; + try { + Class<?> clazz = cl.loadClass(intfName); + ic = helper.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 = helper.createComponentService(); + service.setName(serviceName); + InterfaceContract ic = null; + try { + Class<?> clazz = cl.loadClass(intfName); + ic = helper.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.getHome() != null) { + // References to only EJB3 beans need to be considered. + // Skip the current on as it is not a reference to an EJB3 bean. + continue; + } + if (ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) { + // Only Remote EJB references need to be considered. + // Skip the current one as it is not a remote reference. + continue; + } + //FIXME: ejbRef.getEjbRefType() is null sometimes. Need a different way to figure the type. + if(ejbRef.getEjbRefType() != null && ejbRef.getEjbRefType().compareTo(EjbRefType.SESSION) != 0) { + // Only references to Session beans need to be considered. + // Skip the current one as it is not a Session bean. + continue; + } + String referenceName = entry.getKey(); + referenceName = referenceName.replace("/", "_"); + Reference reference = helper.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = null; + try { + Class<?> clazz = cl.loadClass(ejbRef.getInterface()); + ic = helper.createInterfaceContract(clazz); + } catch (Exception e) { + throw new ContributionException(e); + } + reference.setInterfaceContract(ic); + reference.getRequiredIntents().add(AssemblyHelper.EJB_INTENT); + 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 = helper.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 { + try { + if(javax.ejb.MessageDrivenBean.class.isAssignableFrom(cl.loadClass(bean.getEjbClass()))) { + // Not an EJB3 bean + return null; + } + } catch (ClassNotFoundException ignored) { + // Should not happen + } + ComponentType componentType = helper.createComponentType(); + + // Process Remote EJB References + for (Map.Entry<String, EjbRef> entry : bean.getEjbRefMap().entrySet()) { + EjbRef ejbRef = entry.getValue(); + if(ejbRef.getHome() != null) { + // References to only EJB3 beans need to be considered. + // Skip the current on as it is not a reference to an EJB3 bean. + continue; + } + if (ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) { + // Only Remote EJB references need to be considered. + // Skip the current one as it is not a remote reference. + continue; + } + //FIXME: ejbRef.getEjbRefType() is null sometimes. Need a different way to figure the type. + if(ejbRef.getEjbRefType() != null && ejbRef.getEjbRefType().compareTo(EjbRefType.SESSION) != 0) { + // Only references to Session beans need to be considered. + // Skip the current one as it is not a Session bean. + continue; + } + String referenceName = entry.getKey(); + referenceName = referenceName.replace("/", "_"); + Reference reference = helper.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = null; + try { + Class<?> clazz = cl.loadClass(ejbRef.getInterface()); + ic = helper.createInterfaceContract(clazz); + } catch (Exception e) { + throw new ContributionException(e); + } + reference.setInterfaceContract(ic); + reference.getRequiredIntents().add(AssemblyHelper.EJB_INTENT); + 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 = helper.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/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java new file mode 100644 index 0000000000..2ecabb9a23 --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java @@ -0,0 +1,96 @@ +/* + * 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.AppModule; +import org.apache.openejb.config.EjbModule; +import org.apache.openejb.jee.EnterpriseBean; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.contribution.service.ContributionException; + +/** + * @version $Rev$ $Date$ + */ +public class JavaEEApplicationProcessor { + private AppModule appModule; + private ComponentType componentType; + private AssemblyHelper helper; + + public JavaEEApplicationProcessor(AppModule appModule, AssemblyHelper helper) { + super(); + this.appModule = appModule; + this.helper = helper; + } + + public JavaEEApplicationProcessor(AppModule module) { + appModule = module; + helper = new AssemblyHelper(); + } + + public ComponentType getJavaEEAppComponentType() throws ContributionException { + if (componentType != null) { + return componentType; + } + componentType = helper.createComponentType(); + + // Process all EJB modules + for(EjbModule ejbModule : appModule.getEjbModules()) { + EJBModuleProcessor emp = new EJBModuleProcessor(ejbModule, helper); + Map<String, ComponentType> ejbComponentTypes = emp.getEjbComponentTypes(); + for(Map.Entry<String, ComponentType> entry : ejbComponentTypes.entrySet()) { + String beanName = entry.getKey(); + ComponentType ct = entry.getValue(); + EnterpriseBean bean = ejbModule.getEjbJar().getEnterpriseBeansByEjbName().get(beanName); + String mappedName = bean.getMappedName() != null ? bean.getMappedName() : beanName; + + String mappedName2 = mappedName.replace("/", "_"); + // Add all services from the bean + for(Service service : ct.getServices()) { + Service service2 = helper.createComponentService(); + String serviceName = mappedName2 + "_"+service.getName(); + service2.setName(serviceName); + service2.setInterfaceContract(service.getInterfaceContract()); + componentType.getServices().add(service2); + } + + String beanName2 = beanName.replace("/", "_"); + // Add all references + for(Reference reference : ct.getReferences()) { + Reference reference2 = helper.createComponentReference(); + String referenceName = beanName2+"_"+reference.getName(); + reference2.setName(referenceName); + reference2.setInterfaceContract(reference.getInterfaceContract()); + reference2.getRequiredIntents().addAll(reference.getRequiredIntents()); + componentType.getReferences().add(reference2); + } + } + emp.getEjbAppComponentType(); + } + + // Process web modules (?) + // FIXME: SCA JEE Spec 1.0 - Sec 7.1.3 says nothing about web modules + + return componentType; + } +} diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java new file mode 100644 index 0000000000..1187d1ed00 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java new file mode 100644 index 0000000000..deb9d9e755 --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java @@ -0,0 +1,172 @@ +/* + * 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.EjbRefType; +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; + private AssemblyHelper helper; + + public WebModuleProcessor(WebModule webModule, AssemblyHelper helper) { + super(); + this.webModule = webModule; + this.helper = helper; + } + + public WebModuleProcessor(WebModule module) { + webModule = module; + helper = new AssemblyHelper(); + } + + public ComponentType getWebAppComponentType() throws ContributionException { + if (componentType != null) { + return componentType; + } + componentType = helper.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.getHome() != null) { + // References to only EJB3 beans need to be considered. + // Skip the current on as it is not a reference to an EJB3 bean. + continue; + } + if (ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) != 0) { + // Only Remote EJB references need to be considered. + // Skip the current one as it is not a remote reference. + continue; + } + //FIXME: ejbRef.getEjbRefType() is null sometimes. Need a different way to figure the type. + if(ejbRef.getEjbRefType() != null && ejbRef.getEjbRefType().compareTo(EjbRefType.SESSION) != 0) { + // Only references to Session beans need to be considered. + // Skip the current one as it is not a Session bean. + continue; + } + String referenceName = entry.getKey(); + referenceName = referenceName.replace("/", "_"); + Reference reference = helper.createComponentReference(); + reference.setName(referenceName); + InterfaceContract ic = null; + try { + Class<?> clazz = classLoader.loadClass(ejbRef.getInterface()); + ic = helper.createInterfaceContract(clazz); + } catch (Exception e) { + componentType = null; + throw new ContributionException(e); + } + reference.setInterfaceContract(ic); + reference.getRequiredIntents().add(AssemblyHelper.EJB_INTENT); + 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 = helper.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 = helper.createComposite(); + + ModelFactoryExtensionPoint mfep = new DefaultModelFactoryExtensionPoint(); + WebImplementationFactory wif = mfep.getFactory(WebImplementationFactory.class); + WebImplementation impl = wif.createWebImplementation(); + impl.setWebURI(webModule.getModuleId()); + + // Create component + Component component = helper.createComponent(); + String componentName = webModule.getModuleId(); + component.setName(componentName); + component.setImplementation(impl); + + // Add references + for (Reference reference : componentType.getReferences()) { + ComponentReference componentReference = helper.createComponentReference(); + componentReference.setReference(reference); + componentReference.setInterfaceContract(reference.getInterfaceContract()); + componentReference.getRequiredIntents().addAll(reference.getRequiredIntents()); + component.getReferences().add(componentReference); + } + + // Add properties + for (Property property : componentType.getProperties()) { + ComponentProperty componentProperty = helper.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 = helper.createCompositeReference(); + compositeReference.setInterfaceContract(reference.getInterfaceContract()); + compositeReference.getRequiredIntents().addAll(reference.getRequiredIntents()); + compositeReference.getPromotedReferences().add(reference); + composite.getReferences().add(compositeReference); + } + + return composite; + } +} diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java new file mode 100644 index 0000000000..3a80c1dd3b --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java @@ -0,0 +1,140 @@ +/* + * 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.impl; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; + +import org.apache.tuscany.sca.contribution.PackageType; +import org.apache.tuscany.sca.contribution.processor.PackageProcessor; +import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor; +import org.apache.tuscany.sca.contribution.service.ContributionException; + +/** + * Ear Contribution package processor. + * + * @version $Rev$ $Date$ + */ +public class EarContributionProcessor implements PackageProcessor { + + public URL getArtifactURL(URL packageSourceURL, URI artifact) + throws MalformedURLException { + if (packageSourceURL.toString().startsWith("archive:")) { + return new URL(packageSourceURL, artifact.toString()); + } else { + return new URL("archive:" + packageSourceURL.toExternalForm() + "!/" + artifact); + } + } + + public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException, IOException { + if (packageSourceURL == null) { + throw new IllegalArgumentException("Invalid null package source URL."); + } + + if (inputStream == null) { + throw new IllegalArgumentException("Invalid null source inputstream."); + } + + // The root is a jar file + JarInputStream jar = new JarInputStream(inputStream); + try { + Set<String> names = new HashSet<String>(); + while (true) { + JarEntry entry = jar.getNextJarEntry(); + if (entry == null) { + // EOF + break; + } + + String name = entry.getName(); + if (!name.startsWith(".")) { + + // Trim trailing / + if (name.endsWith("/")) { + name = name.substring(0, name.length() - 1); + } + + // Add the entry name + if (!names.contains(name)) { + names.add(name); + + // Add parent folder names to the list too + for (;;) { + int s = name.lastIndexOf('/'); + if (s == -1) { + name = ""; + } else { + name = name.substring(0, s); + } + if (!names.contains(name)) { + names.add(name); + } else { + break; + } + } + } + } + if(entry.getName().indexOf("/") == -1 && (entry.getName().toLowerCase().endsWith(".war") || entry.getName().toLowerCase().endsWith(".jar"))) { + // A WAR or an EJB JAR file in the root of the archive. + // Get entries from the nested archive. + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + int b; + while((b = jar.read()) != -1) { + bout.write(b); + } + bout.close(); + ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); + + PackageProcessor archiveProcessor = entry.getName().toLowerCase().endsWith(".war") ? new WarContributionProcessor() : new JarContributionProcessor(); + List<URI> artifacts = archiveProcessor.getArtifacts(packageSourceURL, bin); + bin.close(); + for(URI artifact : artifacts) { + names.add(entry.getName()+"!/"+artifact); + } + } + } + + // Return list of URIs + List<URI> artifacts = new ArrayList<URI>(); + for (String name: names) { + artifacts.add(URI.create(name)); + } + return artifacts; + + } finally { + jar.close(); + } + } + + public String getPackageType() { + return PackageType.EAR; + } +} diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java new file mode 100644 index 0000000000..17974e831f --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java @@ -0,0 +1,36 @@ +/* + * 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.impl; + +import org.apache.tuscany.sca.contribution.PackageType; +import org.apache.tuscany.sca.contribution.processor.PackageProcessor; +import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor; + +/** + * War Contribution package processor. + * + * @version $Rev$ $Date$ + */ +public class WarContributionProcessor extends JarContributionProcessor implements PackageProcessor { + @Override + public String getPackageType() { + return PackageType.WAR; + } +} diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor new file mode 100644 index 0000000000..88c69658f6 --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor @@ -0,0 +1,19 @@ +# 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. + +org.apache.tuscany.sca.contribution.jee.impl.EarContributionProcessor;type=application/ear +org.apache.tuscany.sca.contribution.jee.impl.WarContributionProcessor;type=application/war diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java new file mode 100644 index 0000000000..b062187afb --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java new file mode 100644 index 0000000000..9495df70b7 --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java @@ -0,0 +1,57 @@ +/* + * 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.InputStream; +import java.net.URI; +import java.net.URL; +import java.util.List; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.contribution.jee.impl.EarContributionProcessor; +import org.apache.tuscany.sca.contribution.service.util.IOHelper; +import org.junit.Test; + +/** + * Ear Contribution package processor test case. + * Verifies proper handling of EAR contributions. + * + * @version $Rev$ $Date$ + */ +public class EarContributionProcessorTestCase { + private static final String EAR_CONTRIBUTION = "/ejb-injection-sample.ear"; + + @Test + public void testProcessPackageArtifacts() throws Exception { + EarContributionProcessor earProcessor = new EarContributionProcessor(); + + URL earURL = getClass().getResource(EAR_CONTRIBUTION); + InputStream earStream = earURL.openStream(); + List<URI> artifacts = null; + try { + artifacts = earProcessor.getArtifacts(earURL, earStream); + } finally { + IOHelper.closeQuietly(earStream); + } + + Assert.assertNotNull(artifacts); + } +} diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java new file mode 100644 index 0000000000..85b5e87e7f --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java @@ -0,0 +1,84 @@ +/* + * 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.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * @version $Rev$ $Date$ + */ +public class JavaEEApplicationProcessorTestCase { + + AppModule appModule; + + @Before + public void setUp() throws Exception { + String jarFilePath = "target/test-classes/ejb-injection-sample.ear"; + JavaEEModuleHelper jmh = new JavaEEModuleHelper(); + appModule = jmh.getMetadataCompleteModules(jarFilePath); + } + + @Test + public void testJavaEEAppContribution() throws Exception { + JavaEEApplicationProcessor jap = new JavaEEApplicationProcessor(appModule); + + ComponentType ct = jap.getJavaEEAppComponentType(); + + // Check the services + Assert.assertEquals(6, ct.getServices().size()); + + Set<String> expectedServiceNames = new HashSet<String>(); + expectedServiceNames.add("BankBean_Bank"); + expectedServiceNames.add("ConverterBean_Converter"); + expectedServiceNames.add("ConverterBean_ConverterLocal"); + expectedServiceNames.add("Converter2Bean_ConverterLocal"); + expectedServiceNames.add("InvoiceBean_Invoice"); + expectedServiceNames.add("PurchaseOrderBean_PurchaseOrder"); + + Set<String> serviceNames = new HashSet<String>(); + for(Service service : ct.getServices()) { + serviceNames.add(service.getName()); + } + + Assert.assertEquals(expectedServiceNames, serviceNames); + + // Check the references + Assert.assertEquals(1, ct.getReferences().size()); + + Set<String> expectedReferenceNames = new HashSet<String>(); + expectedReferenceNames.add("BankBean_simple.BankBean_converter"); + + Set<String> referenceNames = new HashSet<String>(); + for (Reference r : ct.getReferences()) { + referenceNames.add(r.getName()); + } + + Assert.assertEquals(expectedReferenceNames, referenceNames); + } +} diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java new file mode 100644 index 0000000000..e315c417b9 --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java @@ -0,0 +1,57 @@ +/* + * 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.InputStream; +import java.net.URI; +import java.net.URL; +import java.util.List; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.contribution.jee.impl.WarContributionProcessor; +import org.apache.tuscany.sca.contribution.service.util.IOHelper; +import org.junit.Test; + +/** + * War Contribution package processor test case. + * Verifies proper handling of WAR contributions. + * + * @version $Rev$ $Date$ + */ +public class WarContributionProcessorTestCase { + private static final String WAR_CONTRIBUTION = "/sample-web-app.war"; + + @Test + public void testProcessPackageArtifacts() throws Exception { + WarContributionProcessor warProcessor = new WarContributionProcessor(); + + URL warURL = getClass().getResource(WAR_CONTRIBUTION); + InputStream warStream = warURL.openStream(); + List<URI> artifacts = null; + try { + artifacts = warProcessor.getArtifacts(warURL, warStream); + } finally { + IOHelper.closeQuietly(warStream); + } + + Assert.assertNotNull(artifacts); + } +} diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java new file mode 100644 index 0000000000..030fdc3d19 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear b/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear Binary files differnew file mode 100644 index 0000000000..3efdd206c7 --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar b/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar Binary files differnew file mode 100644 index 0000000000..4b9e3b79f4 --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/sample-web-app.war b/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/sample-web-app.war Binary files differnew file mode 100644 index 0000000000..681b203fab --- /dev/null +++ b/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/sample-web-app.war |