o JavaEE processors to introspect WAR, JAR and EAR files and create model objects

o JavaEE extensions to create SCA Services, SCA References and SCA Properties from EJB3 business interfaces, Remote EJB3 references and Env Entries.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@755722 13f79535-47bb-0310-9956-ffa450edef68

34 files changed, 1453 insertions, 1152 deletions

diff --git a/branches/sca-java-1.x/modules/contribution-jee/pom.xml b/branches/sca-java-1.x/modules/contribution-jee/pom.xml
index 418cd5055a..dfbb7afbad 100644
--- a/branches/sca-java-1.x/modules/contribution-jee/pom.xml
+++ b/branches/sca-java-1.x/modules/contribution-jee/pom.xml
@@ -59,33 +59,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <!--scope>runtime</scope-->
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-web</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <!--scope>runtime</scope-->
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-jee</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </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>
+            <groupId>org.eclipse.emf</groupId>
+            <artifactId>common</artifactId>
+            <version>2.2.3</version>
         </dependency>
 
         <dependency>
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
deleted file mode 100644
index 547ba52e74..0000000000
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/AssemblyHelper.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 37ae53a38a..0000000000
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * 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/EjbInfo.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java
new file mode 100644
index 0000000000..c3cb4e7b90
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java
@@ -0,0 +1,39 @@
+/*
+ * 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.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EjbInfo {
+    public enum EjbType {SESSION_STATELESS, SESSION_STATEFUL, SESSION_UNKNOWN, MESSAGE_DRIVEN};
+    public String beanName;
+    public Class<?> beanClass;
+    public String mappedName;
+    public EjbType ejbType;
+    public Collection<Class<?>> businessRemote = new ArrayList<Class<?>>();
+    public Collection<Class<?>> businessLocal = new ArrayList<Class<?>>();
+    public Map<String, EjbReferenceInfo> ejbReferences = new HashMap<String, EjbReferenceInfo>();
+    public Map<String, EnvEntryInfo> envEntries = new HashMap<String, EnvEntryInfo>();
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java
new file mode 100644
index 0000000000..bea6412c97
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.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;
+
+import java.net.URI;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface EjbModuleInfo {
+    URI getUri();
+    void setUri(URI uri);
+    
+    String getModuleName();
+    void setModuleName(String moduleName);
+
+    Map<String, EjbInfo> getEjbInfos();
+    EjbInfo getEjbInfo(String beanName);
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java
new file mode 100644
index 0000000000..1cc62fc4e9
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java
@@ -0,0 +1,70 @@
+/*
+ * 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.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * A Model Resolver for EjbModule models.
+ *
+ * @version $Rev$ $Date$
+ */
+public class EjbModuleModelResolver implements ModelResolver {
+
+    private Map<URI, EjbModuleInfo> map = new HashMap<URI, EjbModuleInfo>();
+    private Contribution contribution;
+    
+    public EjbModuleModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
+        this.contribution = contribution;
+    }
+
+    public void addModel(Object resolved) {
+        EjbModuleInfo ejbModule = (EjbModuleInfo)resolved;
+        map.put(ejbModule.getUri(), ejbModule);
+    }
+    
+    public Object removeModel(Object resolved) {
+        return map.remove(((EjbModuleInfo)resolved).getUri());
+    }
+    
+    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+        // Lookup a EjbModuleInfo for the given URI
+        URI uri = ((EjbModuleInfo)unresolved).getUri();
+        if (uri != null) {
+            EjbModuleInfo resolved = (EjbModuleInfo) map.get(uri);
+            if (resolved != null) {
+                return modelClass.cast(resolved);
+            } else {
+                uri = URI.create(contribution.getLocation());
+                resolved = (EjbModuleInfo) map.get(uri);
+                if (resolved != null) {
+                    return modelClass.cast(resolved);
+                }
+            }
+        }
+        return unresolved;        
+    }
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java
new file mode 100644
index 0000000000..109a32d62c
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EjbReferenceInfo {
+    public enum EjbType {STATELESS, STATEFUL, SESSION_UNKNOWN, UNKNOWN};
+    public enum RefType {LOCAL, REMOTE, UNKNOWN};
+    public String referenceName;
+    public EjbType ejbType;
+    public RefType referenceType;
+    public Class<?> businessInterface;
+    public String ejbLink;
+    public String mappedName;
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java
new file mode 100644
index 0000000000..26ce44c07e
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java
@@ -0,0 +1,29 @@
+/*
+ * 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;
+
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EnvEntryInfo {
+    public String type;
+    public String name;
+    public String value;
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java
new file mode 100644
index 0000000000..107c251ea7
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java
@@ -0,0 +1,38 @@
+/*
+ * 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.net.URI;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface JavaEEApplicationInfo {
+    URI getUri();
+    void setUri(URI uri);
+    
+    String getApplicationName();
+    void setApplicationName(String applicationName);
+    
+    Map<String, WebModuleInfo> getWebModuleInfos();
+    WebModuleInfo getWebModuleInfo(String moduleName);
+    Map<String, EjbModuleInfo> getEjbModuleInfos();
+    EjbModuleInfo getEjbModuleInfo(String moduleName);
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java
new file mode 100644
index 0000000000..c1e840788b
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java
@@ -0,0 +1,70 @@
+/*
+ * 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.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * A Model Resolver for JavaEEApplicationInfo models.
+ *
+ * @version $Rev$ $Date$
+ */
+public class JavaEEApplicationModelResolver implements ModelResolver {
+
+    private Map<URI, JavaEEApplicationInfo> map = new HashMap<URI, JavaEEApplicationInfo>();
+    private Contribution contribution;
+    
+    public JavaEEApplicationModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
+        this.contribution = contribution;
+    }
+
+    public void addModel(Object resolved) {
+        JavaEEApplicationInfo jeeApp = (JavaEEApplicationInfo)resolved;
+        map.put(jeeApp.getUri(), jeeApp);
+    }
+    
+    public Object removeModel(Object resolved) {
+        return map.remove(((JavaEEApplicationInfo)resolved).getUri());
+    }
+    
+    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+        // Lookup a JavaEEApplicationInfo for the given URI
+        URI uri = ((JavaEEApplicationInfo)unresolved).getUri();
+        if (uri != null) {
+            JavaEEApplicationInfo resolved = (JavaEEApplicationInfo) map.get(uri);
+            if (resolved != null) {
+                return modelClass.cast(resolved);
+            } else {
+                uri = URI.create(contribution.getLocation());
+                resolved = (JavaEEApplicationInfo) map.get(uri);
+                if (resolved != null) {
+                    return modelClass.cast(resolved);
+                }
+            }
+        }
+        return unresolved;        
+    }
+}
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
deleted file mode 100644
index 2ecabb9a23..0000000000
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessor.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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/JavaEEExtension.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java
new file mode 100644
index 0000000000..a78448521f
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.apache.tuscany.sca.assembly.ComponentType;
+
+/**
+ * Compute componentType with EJB3 business interfaces translating into SCA services.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface JavaEEExtension {
+    ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName);
+    ComponentType createImplementationJeeComponentType(EjbModuleInfo ejbModule);
+    ComponentType createImplementationJeeComponentType(JavaEEApplicationInfo appInfo);
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java
new file mode 100644
index 0000000000..8855674e0b
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java
@@ -0,0 +1,30 @@
+/*
+ * 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.net.URL;
+
+/**
+ * Instrospect JavaEE modules and applications.
+ */
+public interface JavaEEIntrospector {
+    WebModuleInfo introspectWebArchive(URL artifactURL);
+    EjbModuleInfo introspectEjbArchive(URL artifactURL);
+    JavaEEApplicationInfo introspectJeeArchive(URL artifactURL);
+}
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
deleted file mode 100644
index 1187d1ed00..0000000000
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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/JavaEEOptionalExtension.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java
new file mode 100644
index 0000000000..3461b149e4
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java
@@ -0,0 +1,35 @@
+/*
+ * 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 org.apache.tuscany.sca.assembly.ComponentType;
+
+/**
+ * Compute componentType with Remote EJB references translating into SCA references and env-entries translating into
+ * SCA properties.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface JavaEEOptionalExtension {
+    ComponentType createImplementationWebComponentType(WebModuleInfo webModule);
+    ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName);
+    ComponentType createImplementationJeeComponentType(WebModuleInfo webModule);
+    ComponentType createImplementationJeeComponentType(EjbModuleInfo ejbModule);
+    ComponentType createImplementationJeeComponentType(JavaEEApplicationInfo appInfo);
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
new file mode 100644
index 0000000000..2feaf2aac4
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
@@ -0,0 +1,43 @@
+/*
+ * 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.net.URI;
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface WebModuleInfo {
+    URI getUri();
+    void setUri(URI uri);
+    
+    String getModuleName();
+    void setModuleName(String moduleName);
+    
+    Map<String, EjbReferenceInfo> getEjbReferences();
+    Map<String, EnvEntryInfo> getEnvEntries();
+    
+    EjbReferenceInfo getEjbReference(String ejbRefName);
+    EnvEntryInfo getEnvEntry(String envEntryName);
+    
+    Collection<Class<?>> getClassesToScan();
+    //TODO: JSP tags?
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java
new file mode 100644
index 0000000000..3ca3fba4e1
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java
@@ -0,0 +1,70 @@
+/*
+ * 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.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * A Model Resolver for WebModuleInfo models.
+ *
+ * @version $Rev$ $Date$
+ */
+public class WebModuleModelResolver implements ModelResolver {
+
+    private Map<URI, WebModuleInfo> map = new HashMap<URI, WebModuleInfo>();
+    private Contribution contribution;
+    
+    public WebModuleModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
+        this.contribution = contribution;
+    }
+
+    public void addModel(Object resolved) {
+        WebModuleInfo webModule = (WebModuleInfo)resolved;
+        map.put(webModule.getUri(), webModule);
+    }
+    
+    public Object removeModel(Object resolved) {
+        return map.remove(((WebModuleInfo)resolved).getUri());
+    }
+    
+    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+        // Lookup a WebModuleInfo for the given URI
+        URI uri = ((WebModuleInfo)unresolved).getUri();
+        if (uri != null) {
+            WebModuleInfo resolved = (WebModuleInfo) map.get(uri);
+            if (resolved != null) {
+                return modelClass.cast(resolved);
+            } else {
+                uri = URI.create(contribution.getLocation());
+                resolved = (WebModuleInfo) map.get(uri);
+                if (resolved != null) {
+                    return modelClass.cast(resolved);
+                }
+            }
+        }
+        return unresolved;        
+    }
+}
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
deleted file mode 100644
index deb9d9e755..0000000000
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * 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
index 3a80c1dd3b..32425e3299 100644
--- 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
@@ -26,6 +26,9 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.net.URLStreamHandlerFactory;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -37,6 +40,7 @@ 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;
+import org.eclipse.emf.common.archive.ArchiveURLConnection;
 
 /**
  * Ear Contribution package processor.
@@ -44,9 +48,32 @@ import org.apache.tuscany.sca.contribution.service.ContributionException;
  * @version $Rev$ $Date$
  */
 public class EarContributionProcessor implements PackageProcessor {
+    
+    /* Install handler for "archive" */
+    static {
+        URL.setURLStreamHandlerFactory(new URLStreamHandlerFactory() {
+            public URLStreamHandler createURLStreamHandler(String protocol) {
+                if("archive".equalsIgnoreCase(protocol)) {
+                    return new Handler();
+                } else {
+                    return null;
+                }
+            }}
+        );
+    }
+
+    static class Handler extends URLStreamHandler {
+        @Override
+        protected URLConnection openConnection(URL u) throws IOException {
+            return new ArchiveURLConnection(u);
+        }
+    }
 
     public URL getArtifactURL(URL packageSourceURL, URI artifact)
             throws MalformedURLException {
+        if(artifact.toString().equals("")) {
+            return packageSourceURL;
+        }
         if (packageSourceURL.toString().startsWith("archive:")) {
             return new URL(packageSourceURL, artifact.toString());
         } else {
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
new file mode 100644
index 0000000000..ee00451318
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
@@ -0,0 +1,64 @@
+/*
+ * 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.File;
+import java.net.URI;
+import java.net.URL;
+
+import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.monitor.Monitor;
+
+/**
+ * URLArtifactProcessor for EJB jars.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class EjbArchiveProcessor implements URLArtifactProcessor<EjbModuleInfo> {
+    private JavaEEIntrospector jeeIntrospector;
+    
+    public EjbArchiveProcessor(ExtensionPointRegistry registry, Monitor monitor) {
+         jeeIntrospector = registry.getExtensionPoint(JavaEEIntrospector.class);
+    }
+
+    public String getArtifactType() {
+        return ".jar";
+    }
+
+    public EjbModuleInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
+        EjbModuleInfo ejbModuleInfo = jeeIntrospector.introspectEjbArchive(artifactURL);
+        ejbModuleInfo.setUri(artifactURI);
+        ejbModuleInfo.setModuleName(new File(artifactURL.getFile()).getName());
+        return ejbModuleInfo;
+    }
+
+    public Class<EjbModuleInfo> getModelType() {
+        return EjbModuleInfo.class;
+    }
+
+    public void resolve(EjbModuleInfo arg0, ModelResolver arg1)
+            throws ContributionResolveException {
+    }
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java
new file mode 100644
index 0000000000..22d0dec187
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.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.impl;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.jee.EjbInfo;
+import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
+
+public class EjbModuleInfoImpl implements EjbModuleInfo {
+
+    private URI uri;
+    private String moduleName;
+    private Map<String, EjbInfo> ejbInfos = new HashMap<String, EjbInfo>();
+    
+    public EjbInfo getEjbInfo(String beanName) {
+        return ejbInfos.get(beanName);
+    }
+
+    public Map<String, EjbInfo> getEjbInfos() {
+        return ejbInfos;
+    }
+
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
+
+    public URI getUri() {
+        return uri;
+    }
+
+    public void setUri(URI uri) {
+        this.uri = uri;
+    }
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java
new file mode 100644
index 0000000000..993605ebe5
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java
@@ -0,0 +1,68 @@
+/*
+ * 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.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
+
+public class JavaEEApplicationInfoImpl implements JavaEEApplicationInfo {
+    
+    private URI uri;
+    private String applicationName;
+    private Map<String, EjbModuleInfo> ejbModuleInfos = new HashMap<String, EjbModuleInfo>();
+    private Map<String, WebModuleInfo> webModuleInfos = new HashMap<String, WebModuleInfo>();
+    
+
+    public String getApplicationName() {
+        return applicationName;
+    }
+    
+    public void setApplicationName(String applicationName) {
+        this.applicationName = applicationName;
+    }
+
+    public EjbModuleInfo getEjbModuleInfo(String moduleName) {
+        return ejbModuleInfos.get(moduleName);
+    }
+
+    public Map<String, EjbModuleInfo> getEjbModuleInfos() {
+        return ejbModuleInfos;
+    }
+
+    public WebModuleInfo getWebModuleInfo(String moduleName) {
+        return webModuleInfos.get(moduleName);
+    }
+
+    public Map<String, WebModuleInfo> getWebModuleInfos() {
+        return webModuleInfos;
+    }
+
+    public URI getUri() {
+        return uri;
+    }
+
+    public void setUri(URI uri) {
+        this.uri = uri;
+    }
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java
new file mode 100644
index 0000000000..65b820c280
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java
@@ -0,0 +1,41 @@
+package org.apache.tuscany.sca.contribution.jee.impl;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URL;
+
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.monitor.Monitor;
+
+public class JavaEEArchiveProcessor implements URLArtifactProcessor<JavaEEApplicationInfo> {
+    private JavaEEIntrospector jeeIntrospector;
+    
+    public JavaEEArchiveProcessor(ExtensionPointRegistry registry, Monitor monitor) {
+         jeeIntrospector = registry.getExtensionPoint(JavaEEIntrospector.class);
+    }
+
+    public String getArtifactType() {
+        return ".ear";
+    }
+
+    public JavaEEApplicationInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
+        JavaEEApplicationInfo jeeAppInfo = jeeIntrospector.introspectJeeArchive(artifactURL);
+        jeeAppInfo.setUri(artifactURI);
+        jeeAppInfo.setApplicationName(new File(artifactURL.getFile()).getName());
+        return jeeAppInfo;
+    }
+
+    public Class<JavaEEApplicationInfo> getModelType() {
+        return JavaEEApplicationInfo.class;
+    }
+
+    public void resolve(JavaEEApplicationInfo arg0, ModelResolver arg1)
+            throws ContributionResolveException {
+    }
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
new file mode 100644
index 0000000000..8d8d0f4c35
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
@@ -0,0 +1,197 @@
+/*
+ * 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.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.jee.EjbInfo;
+import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEExtension;
+import org.apache.tuscany.sca.contribution.jee.EjbInfo.EjbType;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+
+public class JavaEEExtensionImpl implements JavaEEExtension {
+    
+    private AssemblyFactory assemblyFactory;
+    private JavaInterfaceFactory javaInterfaceFactory;
+    private PolicyFactory policyFactory;
+    private Intent EJB_INTENT;
+    
+    public JavaEEExtensionImpl(ModelFactoryExtensionPoint modelFactories) {
+        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
+        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
+        
+        EJB_INTENT = policyFactory.createIntent();
+        EJB_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "ejb"));
+    }
+    
+    public ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName) {
+        ComponentType componentType = assemblyFactory.createComponentType();
+        EjbInfo ejbInfo = ejbModule.getEjbInfo(ejbName);
+        if(ejbInfo == null) {
+            return null;
+        }
+        if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) {
+            for(Class<?> intf : ejbInfo.businessRemote) {
+                Service service = assemblyFactory.createComponentService();
+                String intfName = intf.getName();
+                String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
+                service.setName(serviceName);
+                InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+                try {
+                    ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
+                } catch (InvalidInterfaceException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                service.setInterfaceContract(ic);
+                componentType.getServices().add(service);
+            }
+
+            for(Class<?> intf : ejbInfo.businessLocal) {
+                Service service = assemblyFactory.createComponentService();
+                String intfName = intf.getName();
+                String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
+                service.setName(serviceName);
+                InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+                try {
+                    ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
+                } catch (InvalidInterfaceException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                service.setInterfaceContract(ic);
+                service.getRequiredIntents().add(EJB_INTENT);
+                
+                componentType.getServices().add(service);
+            }
+        }
+        return componentType;
+    }
+    
+    public ComponentType createImplementationJeeComponentType(EjbModuleInfo ejbModule) {
+        ComponentType componentType = assemblyFactory.createComponentType();
+        
+        for(Map.Entry<String, EjbInfo> entry : ejbModule.getEjbInfos().entrySet()) {
+            EjbInfo ejbInfo = entry.getValue();
+            if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) {
+                for(Class<?> intf : ejbInfo.businessRemote) {
+                    Service service = assemblyFactory.createComponentService();
+                    String intfName = intf.getName();
+                    String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
+                    serviceName = ejbInfo.beanName+"_"+serviceName;
+                    service.setName(serviceName);
+                    InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+                    try {
+                        ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
+                    } catch (InvalidInterfaceException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    service.setInterfaceContract(ic);
+                    componentType.getServices().add(service);
+                }
+
+                for(Class<?> intf : ejbInfo.businessLocal) {
+                    Service service = assemblyFactory.createComponentService();
+                    String intfName = intf.getName();
+                    String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
+                    serviceName = ejbInfo.beanName+"_"+serviceName;
+                    service.setName(serviceName);
+                    InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+                    try {
+                        ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
+                    } catch (InvalidInterfaceException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    service.setInterfaceContract(ic);
+                    service.getRequiredIntents().add(EJB_INTENT);
+                    
+                    componentType.getServices().add(service);
+                }
+            }
+        }
+        
+        return componentType;
+    }
+
+    public ComponentType createImplementationJeeComponentType(JavaEEApplicationInfo appInfo) {
+        ComponentType componentType = assemblyFactory.createComponentType();
+        
+        for(Map.Entry<String, EjbModuleInfo> entry0 : appInfo.getEjbModuleInfos().entrySet()) {
+            EjbModuleInfo ejbModule = entry0.getValue();
+            
+            for(Map.Entry<String, EjbInfo> entry : ejbModule.getEjbInfos().entrySet()) {
+                EjbInfo ejbInfo = entry.getValue();
+                if(ejbInfo.ejbType.compareTo(EjbType.MESSAGE_DRIVEN) != 0) {
+                    for(Class<?> intf : ejbInfo.businessRemote) {
+                        Service service = assemblyFactory.createComponentService();
+                        String intfName = intf.getName();
+                        String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
+                        serviceName = ejbInfo.mappedName+"_"+serviceName;
+                        service.setName(serviceName);
+                        InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+                        try {
+                            ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
+                        } catch (InvalidInterfaceException e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+                        service.setInterfaceContract(ic);
+                        componentType.getServices().add(service);
+                    }
+
+                    for(Class<?> intf : ejbInfo.businessLocal) {
+                        Service service = assemblyFactory.createComponentService();
+                        String intfName = intf.getName();
+                        String serviceName = intfName.lastIndexOf(".") != -1 ? intfName.substring(intfName.lastIndexOf(".") + 1) : intfName;
+                        serviceName = ejbInfo.mappedName+"_"+serviceName;
+                        service.setName(serviceName);
+                        InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+                        try {
+                            ic.setInterface(javaInterfaceFactory.createJavaInterface(intf));
+                        } catch (InvalidInterfaceException e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+                        service.setInterfaceContract(ic);
+                        service.getRequiredIntents().add(EJB_INTENT);
+                        
+                        componentType.getServices().add(service);
+                    }
+                }
+            }
+        }
+        
+        return componentType;
+    }
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
new file mode 100644
index 0000000000..f02b74bd8d
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
@@ -0,0 +1,259 @@
+/*
+ * 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.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Multiplicity;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.jee.EjbInfo;
+import org.apache.tuscany.sca.contribution.jee.EjbModuleInfo;
+import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo;
+import org.apache.tuscany.sca.contribution.jee.EnvEntryInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;
+import org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension;
+import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+
+public class JavaEEOptionalExtensionImpl implements JavaEEOptionalExtension {
+    
+    private AssemblyFactory assemblyFactory;
+    private JavaInterfaceFactory javaInterfaceFactory;
+    private PolicyFactory policyFactory;
+    private Intent EJB_INTENT;
+    
+    public static final Map<String, QName> ALLOWED_ENV_ENTRY_TYPES;
+    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"));
+    }
+
+    public JavaEEOptionalExtensionImpl(ModelFactoryExtensionPoint modelFactories) {
+        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
+        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
+        
+        EJB_INTENT = policyFactory.createIntent();
+        EJB_INTENT.setName(new QName("http://www.osoa.org/xmlns/sca/1.0", "ejb"));
+    }
+    
+    public ComponentType createImplementationWebComponentType(WebModuleInfo webModule) {
+        ComponentType componentType = assemblyFactory.createComponentType();
+        
+        // Process Remote EJB References
+        for(Map.Entry<String, EjbReferenceInfo> entry : webModule.getEjbReferences().entrySet()) {
+            EjbReferenceInfo ejbRef = entry.getValue();
+            String referenceName = entry.getKey();
+            referenceName = referenceName.replace("/", "_");
+            Reference reference = assemblyFactory.createComponentReference();
+            reference.setName(referenceName);
+            InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+            try {
+                ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
+            } catch (InvalidInterfaceException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            reference.setInterfaceContract(ic);
+            reference.getRequiredIntents().add(EJB_INTENT);
+            reference.setMultiplicity(Multiplicity.ZERO_ONE);
+            componentType.getReferences().add(reference);
+        }
+        
+        // Process env-entries to compute properties
+        for (Map.Entry<String, EnvEntryInfo> entry : webModule.getEnvEntries().entrySet()) {
+            EnvEntryInfo envEntry = entry.getValue();
+            String type = envEntry.type;
+            if (!ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+                continue;
+            }
+            String propertyName = envEntry.name;
+            propertyName = propertyName.replace("/", "_");
+            String value = envEntry.value;
+            Property property = assemblyFactory.createComponentProperty();
+            property.setName(propertyName);
+            property.setXSDType(ALLOWED_ENV_ENTRY_TYPES.get(type));
+            property.setValue(value);
+            componentType.getProperties().add(property);
+        }
+        
+        return componentType;
+    }
+    public ComponentType createImplementationEjbComponentType(EjbModuleInfo ejbModule, String ejbName) {
+        ComponentType componentType = assemblyFactory.createComponentType();
+        EjbInfo ejbInfo = ejbModule.getEjbInfo(ejbName);
+        if(ejbInfo == null) {
+            return null;
+        }
+
+        // Process Remote EJB References
+        for(Map.Entry<String, EjbReferenceInfo> entry : ejbInfo.ejbReferences.entrySet()) {
+            EjbReferenceInfo ejbRef = entry.getValue();
+            String referenceName = entry.getKey();
+            referenceName = referenceName.replace("/", "_");
+            Reference reference = assemblyFactory.createComponentReference();
+            reference.setName(referenceName);
+            InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+            try {
+                ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
+            } catch (InvalidInterfaceException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            reference.setInterfaceContract(ic);
+            reference.getRequiredIntents().add(EJB_INTENT);
+            reference.setMultiplicity(Multiplicity.ZERO_ONE);
+            componentType.getReferences().add(reference);
+        }
+        
+        // Process env-entries to compute properties
+        for (Map.Entry<String, EnvEntryInfo> entry : ejbInfo.envEntries.entrySet()) {
+            EnvEntryInfo envEntry = entry.getValue();
+            String type = envEntry.type;
+            if (!ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+                continue;
+            }
+            String propertyName = envEntry.name;
+            propertyName = propertyName.replace("/", "_");
+            String value = envEntry.value;
+            Property property = assemblyFactory.createComponentProperty();
+            property.setName(propertyName);
+            property.setXSDType(ALLOWED_ENV_ENTRY_TYPES.get(type));
+            property.setValue(value);
+            componentType.getProperties().add(property);
+        }
+        return componentType;
+    }
+    
+    public ComponentType createImplementationJeeComponentType(WebModuleInfo webModule) {
+        ComponentType componentType = assemblyFactory.createComponentType();
+        
+        // Process Remote EJB References
+        for(Map.Entry<String, EjbReferenceInfo> entry : webModule.getEjbReferences().entrySet()) {
+            EjbReferenceInfo ejbRef = entry.getValue();
+            String referenceName = entry.getKey();
+            referenceName = referenceName.replace("/", "_");
+            Reference reference = assemblyFactory.createComponentReference();
+            reference.setName(referenceName);
+            InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+            try {
+                ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
+            } catch (InvalidInterfaceException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            reference.setInterfaceContract(ic);
+            reference.getRequiredIntents().add(EJB_INTENT);
+            reference.setMultiplicity(Multiplicity.ZERO_ONE);
+            componentType.getReferences().add(reference);
+        }
+        
+        return componentType;
+    }
+
+    public ComponentType createImplementationJeeComponentType(EjbModuleInfo ejbModule) {
+        ComponentType componentType = assemblyFactory.createComponentType();
+        
+        for(Map.Entry<String, EjbInfo> entry : ejbModule.getEjbInfos().entrySet()) {
+            EjbInfo ejbInfo = entry.getValue();
+            // Process Remote EJB References
+            for(Map.Entry<String, EjbReferenceInfo> entry1 : ejbInfo.ejbReferences.entrySet()) {
+                EjbReferenceInfo ejbRef = entry1.getValue();
+                String referenceName = ejbRef.referenceName;
+                referenceName = referenceName.replace("/", "_");
+                referenceName = ejbInfo.beanName + "_" + referenceName;
+                Reference reference = assemblyFactory.createComponentReference();
+                reference.setName(referenceName);
+                InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+                try {
+                    ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
+                } catch (InvalidInterfaceException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                reference.setInterfaceContract(ic);
+                reference.getRequiredIntents().add(EJB_INTENT);
+                reference.setMultiplicity(Multiplicity.ZERO_ONE);
+                componentType.getReferences().add(reference);
+            }
+        }
+        
+        return componentType;
+    }
+
+    public ComponentType createImplementationJeeComponentType(JavaEEApplicationInfo appInfo) {
+        ComponentType componentType = assemblyFactory.createComponentType();
+        
+        for(Map.Entry<String, EjbModuleInfo> entry0 : appInfo.getEjbModuleInfos().entrySet()) {
+            EjbModuleInfo ejbModule = entry0.getValue();
+            
+            for(Map.Entry<String, EjbInfo> entry : ejbModule.getEjbInfos().entrySet()) {
+                EjbInfo ejbInfo = entry.getValue();
+                // Process Remote EJB References
+                for(Map.Entry<String, EjbReferenceInfo> entry1 : ejbInfo.ejbReferences.entrySet()) {
+                    EjbReferenceInfo ejbRef = entry1.getValue();
+                    String referenceName = ejbRef.referenceName;
+                    referenceName = referenceName.replace("/", "_");
+                    referenceName = ejbInfo.beanName + "_" + referenceName;
+                    Reference reference = assemblyFactory.createComponentReference();
+                    reference.setName(referenceName);
+                    InterfaceContract ic = javaInterfaceFactory.createJavaInterfaceContract();
+                    try {
+                        ic.setInterface(javaInterfaceFactory.createJavaInterface(ejbRef.businessInterface));
+                    } catch (InvalidInterfaceException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    reference.setInterfaceContract(ic);
+                    reference.getRequiredIntents().add(EJB_INTENT);
+                    reference.setMultiplicity(Multiplicity.ZERO_ONE);
+                    componentType.getReferences().add(reference);
+                }
+            }
+        }
+        
+        return componentType;
+    }
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java
new file mode 100644
index 0000000000..8eff7e772e
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java
@@ -0,0 +1,59 @@
+package org.apache.tuscany.sca.contribution.jee.impl;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URL;
+
+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;
+import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.monitor.Monitor;
+
+/*
+ * 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.    
+ */
+public class WebArchiveProcessor implements URLArtifactProcessor<WebModuleInfo> {
+    private JavaEEIntrospector jeeIntrospector;
+    
+    public WebArchiveProcessor(ExtensionPointRegistry registry, Monitor monitor) {
+         jeeIntrospector = registry.getExtensionPoint(JavaEEIntrospector.class);
+    }
+
+    public String getArtifactType() {
+        return ".war";
+    }
+
+    public WebModuleInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
+        WebModuleInfo webModuleInfo = jeeIntrospector.introspectWebArchive(artifactURL);
+        webModuleInfo.setUri(artifactURI);
+        webModuleInfo.setModuleName(new File(artifactURL.getFile()).getName());
+        return webModuleInfo;
+    }
+
+    public Class<WebModuleInfo> getModelType() {
+        return WebModuleInfo.class;
+    }
+
+    public void resolve(WebModuleInfo arg0, ModelResolver arg1)
+            throws ContributionResolveException {
+    }
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
new file mode 100644
index 0000000000..353ac7b5c5
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
@@ -0,0 +1,76 @@
+/*
+ * 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.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo;
+import org.apache.tuscany.sca.contribution.jee.EnvEntryInfo;
+import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
+
+public class WebModuleInfoImpl implements WebModuleInfo {
+    
+    private URI uri;
+    private String moduleName;
+    private Collection<Class<?>> classesToScan = new ArrayList<Class<?>>();
+    private Map<String, EjbReferenceInfo> ejbReferences = new HashMap<String, EjbReferenceInfo>();
+    private Map<String, EnvEntryInfo> envEntries = new HashMap<String, EnvEntryInfo>();
+
+    public WebModuleInfoImpl() {
+    }
+    public Collection<Class<?>> getClassesToScan() {
+        return classesToScan;
+    }
+
+    public EjbReferenceInfo getEjbReference(String ejbRefName) {
+        return ejbReferences.get(ejbRefName);
+    }
+
+    public Map<String, EjbReferenceInfo> getEjbReferences() {
+        return ejbReferences;
+    }
+
+    public Map<String, EnvEntryInfo> getEnvEntries() {
+        return envEntries;
+    }
+
+    public EnvEntryInfo getEnvEntry(String envEntryName) {
+        return envEntries.get(envEntryName);
+    }
+
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
+    
+    public URI getUri() {
+        return uri;
+    }
+    
+    public void setUri(URI uri) {
+        this.uri = uri;
+    }
+}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension
new file mode 100644
index 0000000000..c79600bca6
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension
@@ -0,0 +1,18 @@
+# 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.JavaEEExtensionImpl
\ No newline at end of file
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension
new file mode 100644
index 0000000000..5ce036e6b0
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension
@@ -0,0 +1,18 @@
+# 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.JavaEEOptionalExtensionImpl
\ No newline at end of file
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
new file mode 100644
index 0000000000..71575b5ddd
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
@@ -0,0 +1,21 @@
+# 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. 
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.contribution.jee.impl.WebArchiveProcessor;type=.war,model=org.apache.tuscany.sca.contribution.jee.WebModuleInfo
+org.apache.tuscany.sca.contribution.jee.impl.EjbArchiveProcessor;type=.jar,model=org.apache.tuscany.sca.contribution.jee.EjbModuleInfo
+org.apache.tuscany.sca.contribution.jee.impl.JavaEEArchiveProcessor;type=.ear,model=org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo
\ No newline at end of file
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
new file mode 100644
index 0000000000..8aae799e5b
--- /dev/null
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
@@ -0,0 +1,20 @@
+# 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.WebModuleModelResolver;model=org.apache.tuscany.sca.contribution.jee.WebModuleInfo

+org.apache.tuscany.sca.contribution.jee.EjbModuleModelResolver;model=org.apache.tuscany.sca.contribution.jee.EjbModuleInfo

+org.apache.tuscany.sca.contribution.jee.JavaEEApplicationModelResolver;model=org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo
\ No newline at end of file
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
deleted file mode 100644
index b062187afb..0000000000
--- a/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessorTestCase.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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/JavaEEApplicationProcessorTestCase.java b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java
deleted file mode 100644
index 85b5e87e7f..0000000000
--- a/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationProcessorTestCase.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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/WebModuleProcessorTestCase.java b/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java
deleted file mode 100644
index 030fdc3d19..0000000000
--- a/branches/sca-java-1.x/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessorTestCase.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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());
-    }
-}