Correct tag name

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

7 files changed, 0 insertions, 1113 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JEEDefinitionsProvider.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JEEDefinitionsProvider.java
deleted file mode 100644
index 262875c49a..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JEEDefinitionsProvider.java
+++ /dev/null
@@ -1,73 +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.net.URI;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
-
-/**
- * Provider for Policy Intents and PolicySet definitions related to security
- * 
- * @version $Rev$ $Date$
- */
-public class JEEDefinitionsProvider implements SCADefinitionsProvider {
-    private static final String definitionsFile = "org/apache/tuscany/sca/contribution/jee/definitions.xml";
-    
-    URLArtifactProcessor urlArtifactProcessor = null;
-
-    public JEEDefinitionsProvider(ExtensionPointRegistry registry) {
-        URLArtifactProcessorExtensionPoint documentProcessors =
-            registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
-    }
-
-    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
-        SCADefinitions scaDefns = null;
-        try {
-            // Allow privileged access to load resource. Requires
-            // RuntimePermssion in security policy.
-            URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
-                public URL run() {
-                    return getClass().getClassLoader().getResource(definitionsFile);
-                }
-            });
-
-            URI uri = new URI(definitionsFile);
-
-            scaDefns = (SCADefinitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
-
-            return scaDefns;
-
-        } catch (Exception e) {
-            throw new SCADefinitionsProviderException(e);
-        }
-    }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
deleted file mode 100644
index a903f6dbc0..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
+++ /dev/null
@@ -1,123 +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.EjbModule;
-import org.apache.openejb.config.ReadDescriptors;
-import org.apache.openejb.config.WebModule;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaEEModuleHelper {
-
-    public AppModule getMetadataCompleteModules(String jarFilePath) throws ContributionReadException {
-        DeploymentLoader loader = new DeploymentLoader();
-        AppModule appModule = null;
-        try {
-            appModule = loader.load(new File(jarFilePath));
-        } catch (OpenEJBException e) {
-            throw new ContributionReadException(e);
-        }
-
-        // Set the Thread context class loader as the module's class loader and all the Web and EJB modules
-        // inside. Otherwise, SCA annotations could not be processed
-        // TODO: Eliminate the use of reflection for setting the class loader
-        java.lang.reflect.Field field = null;
-        try {
-            field = appModule.getClass().getDeclaredField("classLoader");
-        } catch (SecurityException e) {
-            throw new ContributionReadException(e);
-        } catch (NoSuchFieldException e) {
-            throw new ContributionReadException(e);
-        }
-        field.setAccessible(true);
-        try{
-            field.set(appModule, Thread.currentThread().getContextClassLoader());
-        } catch (IllegalArgumentException e) {
-            throw new ContributionReadException(e);
-        } catch (IllegalAccessException e) {
-            throw new ContributionReadException(e);
-        }
-        
-        for(EjbModule ejbModule:appModule.getEjbModules()) {
-            java.lang.reflect.Field field1 = null;
-            try {
-                field1 = ejbModule.getClass().getDeclaredField("classLoader");
-            } catch (SecurityException e) {
-                throw new ContributionReadException(e);
-            } catch (NoSuchFieldException e) {
-                throw new ContributionReadException(e);
-            }
-            field1.setAccessible(true);
-            try {
-                field1.set(ejbModule, Thread.currentThread().getContextClassLoader());
-            } catch (IllegalArgumentException e) {
-                throw new ContributionReadException(e);
-            } catch (IllegalAccessException e) {
-                throw new ContributionReadException(e);
-            }
-        }
-
-        for(WebModule webModule:appModule.getWebModules()) {
-            java.lang.reflect.Field field1 = null;
-            try {
-                field1 = webModule.getClass().getDeclaredField("classLoader");
-            } catch (SecurityException e) {
-                throw new ContributionReadException(e);
-            } catch (NoSuchFieldException e) {
-                throw new ContributionReadException(e);
-            }
-            field1.setAccessible(true);
-            try {
-                field1.set(webModule, Thread.currentThread().getContextClassLoader());
-            } catch (IllegalArgumentException e) {
-                throw new ContributionReadException(e);
-            } catch (IllegalAccessException e) {
-                throw new ContributionReadException(e);
-            }
-        }
-
-        // Process deployment descriptor files
-        ReadDescriptors readDescriptors = new ReadDescriptors();
-        try {
-            readDescriptors.deploy(appModule);
-        } catch (OpenEJBException e) {
-            throw new ContributionReadException(e);
-        }
-
-        // Process annotations
-        AnnotationDeployer annDeployer = new AnnotationDeployer();
-        try {
-            annDeployer.deploy(appModule);
-        } catch (OpenEJBException e) {
-            throw new ContributionReadException(e);
-        }
-
-        return appModule;
-    }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoader.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoader.java
deleted file mode 100644
index 87cdaa2cf3..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoader.java
+++ /dev/null
@@ -1,201 +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.impl;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-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 EARContributionClassLoader extends URLClassLoader {
-    
-    private Contribution contribution;
-    private List<EjbModuleInfo> ejbModules = new ArrayList<EjbModuleInfo>();
-    
-    /**
-     * Constructor for contribution ClassLoader 
-     * 
-     * @param contribution
-     * @param parent
-     * @throws MalformedURLException
-     */
-    public EARContributionClassLoader(Contribution contribution, final ClassLoader parent) {
-        super(new URL[0], parent);
-        
-        this.contribution = contribution;
-        
-        // get the classloaders for any EAR archive that is a contribution
-        for (Artifact artifact : contribution.getArtifacts()){
-            if (artifact.getModel() instanceof JavaEEApplicationInfo){
-                JavaEEApplicationInfo jeeAppInfo = (JavaEEApplicationInfo)artifact.getModel();
-                // TODO - won't these all have the same classloader?
-                ejbModules.addAll(jeeAppInfo.getEjbModuleInfos().values());
-            }
-        }
-             
-    }
-    
-    /* (non-Javadoc)
-     * @see java.net.URLClassLoader#findClass(java.lang.String)
-     * 
-     * Search path for class:
-     *     This contribution
-     *     Imported contributions
-     */
-    @Override   
-    protected Class<?> findClass(String className) throws ClassNotFoundException {
-               
-        Class<?> clazz = null;
-        ClassNotFoundException cne = null;
-                
-        // TODO - Won't these classloaders all be the same?
-        for (EjbModuleInfo ejbModuleInfo : ejbModules){
-            try {
-                clazz = ejbModuleInfo.getModuleClassloader().loadClass(className);
-            } catch (ClassNotFoundException e) {
-                cne = e;
-            }
-            
-            if (clazz != null){
-                break;
-            }
-        }        
-        
-        if (clazz == null){
-            throw cne;
-        }
-             
-        return clazz;
-    }
-
-    
-    /* (non-Javadoc)
-     * @see java.lang.ClassLoader#loadClass(java.lang.String, boolean)
-     * 
-     * Search path for class:
-     *     Parent ClassLoader
-     *     This contribution
-     *     Imported contributions
-     *     
-     */
-    @Override
-    protected synchronized Class<?> loadClass(String className, boolean resolveClass) 
-        throws ClassNotFoundException {
-       
-        Class<?> clazz = null;
-        try {
-            
-            if (this.getParent() != null)
-                clazz = this.getParent().loadClass(className);
-            
-        } catch (ClassNotFoundException e) {
-        }
-
-        if (clazz == null)
-            clazz = findClass(className);
-
-
-        if (resolveClass)
-            this.resolveClass(clazz);
-        return clazz;
-        
-    }
-
-
-   
-    /* (non-Javadoc)
-     * @see java.lang.ClassLoader#getResource(java.lang.String)
-     * 
-     * Find a resource. 
-     * Search path for resource:
-     *     Parent ClassLoader
-     *     This contribution
-     */
-    @Override
-    public URL getResource(String resName) {
- 
-        URL resource  = null;
-        
-        if (this.getParent() != null) {
-            resource  = this.getParent().getResource(resName);
-        }        
-        if (resource == null) {
-// TODO Which classloader?            
-//           resource  = webModuleInfo.getModuleClassloader().getResource(resName);
-        }
-        
-        return resource;
-    }
-
-    
-    /* (non-Javadoc)
-     * @see java.lang.ClassLoader#getResources(java.lang.String)
-     * 
-     * Return list of resources from this contribution, resources
-     * imported through imported contributions and resources from parent 
-     * ClassLoader.
-     */
-    @Override
-    public Enumeration<URL> getResources(String resName) throws IOException {
-       
-        HashSet<URL> resourceSet = new HashSet<URL>();
-  
-// TODO - which classloader
-//        addEnumerationToCollection(resourceSet, webModuleInfo.getModuleClassloader().getResources(resName));
-        addEnumerationToCollection(resourceSet, super.getResources(resName));
-        
-        return Collections.enumeration(resourceSet);
-    }
-       
-    /*
-     * Add an enumeration to a Collection
-     */
-    private <T extends Object> void addEnumerationToCollection(Collection<T> collection, Enumeration<T> enumeration) {
-        
-        while (enumeration.hasMoreElements())
-            collection.add(enumeration.nextElement());
-    }
-    
-    
-    @Override
-    public String toString() {
-        return "SCA JEE ClassLoader, parent ClassLoader: " + getParent();
-    }
-    
-    
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoaderProvider.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoaderProvider.java
deleted file mode 100644
index 5ea7dc55f7..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoaderProvider.java
+++ /dev/null
@@ -1,49 +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.impl;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.PackageType;
-import org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider;
-import org.apache.tuscany.sca.contribution.java.impl.ContributionClassLoader;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-
-/**
- * The default implementation of the ContributionClassLoaderProvider
- */
-public class EARContributionClassLoaderProvider implements ContributionClassLoaderProvider {
-
-    public EARContributionClassLoaderProvider() {
-        super();
-    }
-    
-    public String getContributionType() {
-        return PackageType.EAR;
-    }
-
-    public ClassLoader getClassLoader(Contribution contribution, ClassLoader parent) {
-        // TODO - This is not quite right at the CCL will load up the nested jars
-        //        also. However we do need to pick up the import processing so 
-        //        need a bit of a refactor
-        ContributionClassLoader ccl = new ContributionClassLoader(contribution, parent);
-        return new EARContributionClassLoader(contribution, ccl);
-    }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java
deleted file mode 100644
index c0830cbb2c..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java
+++ /dev/null
@@ -1,427 +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.impl;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Map;
-
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.EjbModule;
-import org.apache.openejb.config.UnknownModuleTypeException;
-import org.apache.openejb.config.UnsupportedModuleTypeException;
-import org.apache.openejb.config.WebModule;
-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.Filter;
-import org.apache.openejb.jee.InjectionTarget;
-import org.apache.openejb.jee.Listener;
-import org.apache.openejb.jee.MessageDrivenBean;
-import org.apache.openejb.jee.Servlet;
-import org.apache.openejb.jee.SessionBean;
-import org.apache.openejb.jee.SessionType;
-import org.apache.openejb.jee.WebApp;
-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.JavaEEIntrospector;
-import org.apache.tuscany.sca.contribution.jee.JavaEEModuleHelper;
-import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
-import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo.EjbType;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.util.IOHelper;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaEEIntrospectorImpl implements JavaEEIntrospector {
-
-    public WebModuleInfo introspectWebArchive(URL artifactURL) throws ContributionReadException {
-        // Create a temporary file since openejb extracts the archive to process
-        InputStream inp = null;
-        File tempFile = null;
-        try {
-            URLConnection connection = artifactURL.openConnection();
-            connection.setUseCaches(false);
-            inp = connection.getInputStream();
-            tempFile = File.createTempFile("temp", ".war");
-            FileOutputStream fout = new FileOutputStream(tempFile);
-            IOHelper.copy(inp, fout);
-            fout.close();
-            inp.close();
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        }
-
-        JavaEEModuleHelper jmh = new JavaEEModuleHelper();
-        WebModule wm = jmh.getMetadataCompleteModules(tempFile.getAbsolutePath()).getWebModules().get(0);
-        if(!tempFile.delete()) {
-            tempFile.deleteOnExit();
-        }
-        return createWebModuleInfo(wm);
-    }
-
-    private WebModuleInfo createWebModuleInfo(WebModule webModule) {
-        WebModuleInfo wmInfo = new WebModuleInfoImpl();
-
-        WebApp webApp = webModule.getWebApp();
-        ClassLoader classLoader = webModule.getClassLoader();
-        wmInfo.setmoduleClassloader(classLoader);
-
-        // 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;
-            }
-
-            try {
-                wmInfo.getEjbReferences().put(ejbRef.getEjbRefName(), createEjbReferenceInfo(ejbRef, classLoader));
-            } catch (ClassNotFoundException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-
-        // Process env-entries to compute properties
-        for (Map.Entry<String, EnvEntry> entry : webApp.getEnvEntryMap().entrySet()) {
-            EnvEntry envEntry = entry.getValue();
-            wmInfo.getEnvEntries().put(envEntry.getEnvEntryName(), createEnvEntryInfo(envEntry));
-        }
-
-        // Process Servlets
-        for(Servlet servlet: webApp.getServlet()) {
-            try {
-                wmInfo.getServletClasses().add(classLoader.loadClass(servlet.getServletClass()));
-            } catch (ClassNotFoundException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-
-        // Process Filters
-        for(Filter filter: webApp.getFilter()) {
-            try {
-                wmInfo.getFilterClasses().add(classLoader.loadClass(filter.getFilterClass()));
-            } catch (ClassNotFoundException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-
-        // Process Listeners
-        for(Listener listener: webApp.getListener()) {
-            try {
-                wmInfo.getListenerClasses().add(classLoader.loadClass(listener.getListenerClass()));
-            } catch (ClassNotFoundException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-
-        // TODO: Process JSF Managed beans
-
-        // TODO: Process JSP pages
-
-        return wmInfo;
-    }
-
-    private org.apache.tuscany.sca.contribution.jee.EnvEntryInfo createEnvEntryInfo(EnvEntry envEntry) {
-        org.apache.tuscany.sca.contribution.jee.EnvEntryInfo envEntryInfo = new org.apache.tuscany.sca.contribution.jee.EnvEntryInfo();
-        envEntryInfo.name = envEntry.getEnvEntryName();
-        envEntryInfo.type = envEntry.getEnvEntryType();
-        envEntryInfo.value = envEntry.getEnvEntryValue();
-
-        return envEntryInfo;
-    }
-
-    private org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo createEjbReferenceInfo(EjbRef ejbRef, ClassLoader classLoader) throws ClassNotFoundException {
-        org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo ejbReferenceInfo = new org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo();
-
-        ejbReferenceInfo.referenceName = ejbRef.getEjbRefName();
-        ejbReferenceInfo.referenceType = ejbRef.getRefType().compareTo(EjbReference.Type.REMOTE) == 0 ? org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo.RefType.REMOTE : ejbRef.getRefType().compareTo(EjbReference.Type.LOCAL) == 0 ? org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo.RefType.LOCAL : org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo.RefType.UNKNOWN;
-        ejbReferenceInfo.businessInterface = classLoader.loadClass(ejbRef.getInterface());
-
-        ejbReferenceInfo.ejbType = EjbType.UNKNOWN;
-        if(ejbRef.getEjbRefType() != null) {
-            if(ejbRef.getEjbRefType().compareTo(EjbRefType.SESSION) == 0) {
-                ejbReferenceInfo.ejbType = EjbType.SESSION_UNKNOWN;
-            }
-        }
-
-        ejbReferenceInfo.ejbLink = ejbRef.getEjbLink();
-        ejbReferenceInfo.mappedName = ejbRef.getMappedName();
-        if(ejbRef.getInjectionTarget().size() > 0) {
-            InjectionTarget it = ejbRef.getInjectionTarget().iterator().next();
-            ejbReferenceInfo.injectionTarget.targetClass = it.getInjectionTargetClass();
-            ejbReferenceInfo.injectionTarget.targetName = it.getInjectionTargetName();
-        }
-
-        return ejbReferenceInfo;
-    }
-
-    public EjbModuleInfo introspectEjbArchive(URL artifactURL) throws ContributionReadException {
-        // Create a temporary file since openejb extracts the archive to process
-        InputStream inp = null;
-        File tempFile = null;
-        try {
-            URLConnection connection = artifactURL.openConnection();
-            connection.setUseCaches(false);
-            inp = connection.getInputStream();
-            tempFile = File.createTempFile("temp", ".jar");
-            FileOutputStream fout = new FileOutputStream(tempFile);
-            IOHelper.copy(inp, fout);
-            fout.close();
-            inp.close();
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        }
-
-        JavaEEModuleHelper jmh = new JavaEEModuleHelper();
-        EjbModule em;
-        try {
-            em = jmh.getMetadataCompleteModules(tempFile.getAbsolutePath()).getEjbModules().get(0);
-        } catch(ContributionReadException e) {
-            if((e.getCause() instanceof UnknownModuleTypeException) ||
-                (e.getCause() instanceof UnsupportedModuleTypeException)) {
-                // Not an EJB jar
-                return null;
-            } else {
-                throw e;
-            }
-        } finally {
-            if(!tempFile.delete()) {
-                tempFile.deleteOnExit();
-            }
-        }
-        return createEjbModuleInfo(em);
-    }
-
-    private EjbModuleInfo createEjbModuleInfo(EjbModule ejbModule) {
-        EjbModuleInfo ejbModuleInfo = new EjbModuleInfoImpl();
-
-        EjbJar ejbJar = ejbModule.getEjbJar();
-        if (!ejbJar.getVersion().startsWith("3")) {
-            // Not an EJB3 module
-            // TODO: should throw an exception
-            return null;
-        }
-
-        ClassLoader classLoader = ejbModule.getClassLoader();
-        ejbModuleInfo.setmoduleClassloader(classLoader);
-        Map<String, EnterpriseBean> beansMap = ejbJar.getEnterpriseBeansByEjbName();
-        for (Map.Entry<String, EnterpriseBean> entry : beansMap.entrySet()) {
-            EnterpriseBean bean = entry.getValue();
-            EjbInfo ejbInfo = null;
-            if (bean instanceof SessionBean) {
-                SessionBean sbean = (SessionBean)bean;
-                ejbInfo = createEjbInfo(sbean, classLoader);
-            } else if (bean instanceof MessageDrivenBean) {
-                MessageDrivenBean mdbean = (MessageDrivenBean)bean;
-                ejbInfo = createEjbInfo(mdbean, classLoader);
-            } else {
-                continue;
-            }
-            if (ejbInfo != null) {
-                // Bean is an EJB3 bean
-                ejbModuleInfo.getEjbInfos().put(bean.getEjbName(), ejbInfo);
-            }
-        }
-
-        return ejbModuleInfo;
-    }
-
-    private EjbInfo createEjbInfo(MessageDrivenBean bean, ClassLoader classLoader) {
-        try {
-            if(javax.ejb.MessageDrivenBean.class.isAssignableFrom(classLoader.loadClass(bean.getEjbClass()))) {
-                // Not an EJB3 bean
-                return null;
-            }
-        } catch (ClassNotFoundException ignored) {
-            // Should not happen
-        }
-        EjbInfo ejbInfo = new EjbInfo();
-
-        ejbInfo.beanName = bean.getEjbName();
-
-        try {
-            ejbInfo.beanClass = classLoader.loadClass(bean.getEjbClass());
-        } catch (ClassNotFoundException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-        ejbInfo.ejbType = org.apache.tuscany.sca.contribution.jee.EjbInfo.EjbType.MESSAGE_DRIVEN;
-
-        ejbInfo.mappedName = bean.getMappedName();
-
-        processReferencesEnvEntries(bean, classLoader, ejbInfo);
-
-        return ejbInfo;
-    }
-
-    private EjbInfo createEjbInfo(SessionBean bean, ClassLoader classLoader) {
-        if(bean.getBusinessRemote().size() == 0 && bean.getBusinessLocal().size() == 0) {
-            // Not an EJB3 Session bean
-            return null;
-        }
-        EjbInfo ejbInfo = new EjbInfo();
-
-        ejbInfo.beanName = bean.getEjbName();
-
-        try {
-            ejbInfo.beanClass = classLoader.loadClass(bean.getEjbClass());
-        } catch (ClassNotFoundException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-        ejbInfo.ejbType = bean.getSessionType().equals(SessionType.STATEFUL) ? org.apache.tuscany.sca.contribution.jee.EjbInfo.EjbType.SESSION_STATEFUL : bean.getSessionType().equals(SessionType.STATELESS) ? org.apache.tuscany.sca.contribution.jee.EjbInfo.EjbType.SESSION_STATELESS : org.apache.tuscany.sca.contribution.jee.EjbInfo.EjbType.SESSION_UNKNOWN;
-
-        ejbInfo.mappedName = bean.getMappedName();
-        //FIXME: Is it ok to use beanName when mapped name is null?
-        if(ejbInfo.mappedName == null) {
-            ejbInfo.mappedName = ejbInfo.beanName;
-        }
-
-        // Process Remote Business interfaces of the SessionBean
-        for (String intfName : bean.getBusinessRemote()) {
-            try {
-                ejbInfo.businessRemote.add(classLoader.loadClass(intfName));
-            } catch (ClassNotFoundException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-
-        // Process Local Business interfaces of the SessionBean
-        for (String intfName : bean.getBusinessLocal()) {
-            try {
-                ejbInfo.businessLocal.add(classLoader.loadClass(intfName));
-            } catch (ClassNotFoundException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-
-        processReferencesEnvEntries(bean, classLoader, ejbInfo);
-
-        return ejbInfo;
-    }
-
-    private void processReferencesEnvEntries(EnterpriseBean bean, ClassLoader classLoader, EjbInfo ejbInfo) {
-        // 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;
-            }
-
-            try {
-                ejbInfo.ejbReferences.put(ejbRef.getEjbRefName(), createEjbReferenceInfo(ejbRef, classLoader));
-            } catch (ClassNotFoundException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-
-        // Process env-entries
-        for (Map.Entry<String, EnvEntry> entry : bean.getEnvEntryMap().entrySet()) {
-            EnvEntry envEntry = entry.getValue();
-
-            ejbInfo.envEntries.put(envEntry.getEnvEntryName(), createEnvEntryInfo(envEntry));
-        }
-    }
-
-    public JavaEEApplicationInfo introspectJeeArchive(URL artifactURL) throws ContributionReadException {
-        // Create a temporary file since openejb extracts the archive to process
-        InputStream inp = null;
-        File tempFile = null;
-        try {
-            URLConnection connection = artifactURL.openConnection();
-            connection.setUseCaches(false);
-            inp = connection.getInputStream();
-            tempFile = File.createTempFile("temp", ".ear");
-            FileOutputStream fout = new FileOutputStream(tempFile);
-            IOHelper.copy(inp, fout);
-            fout.close();
-            inp.close();
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        }
-
-        JavaEEModuleHelper jmh = new JavaEEModuleHelper();
-        AppModule appModule = jmh.getMetadataCompleteModules(tempFile.getAbsolutePath());
-        if(!tempFile.delete()) {
-            tempFile.deleteOnExit();
-        }
-        return createJavaEEApplicationInfo(appModule);
-    }
-
-    private org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo createJavaEEApplicationInfo(AppModule appModule) {
-        JavaEEApplicationInfo appInfo = new JavaEEApplicationInfoImpl();
-        for(EjbModule em : appModule.getEjbModules()){
-            EjbModuleInfo ejbModuleInfo = createEjbModuleInfo(em);
-            ejbModuleInfo.setModuleName(em.getModuleId());
-            appInfo.getEjbModuleInfos().put(em.getModuleId(), ejbModuleInfo);
-        }
-
-        for(WebModule wm : appModule.getWebModules()) {
-            WebModuleInfo webModuleInfo = createWebModuleInfo(wm);
-            webModuleInfo.setModuleName(wm.getModuleId());
-            appInfo.getWebModuleInfos().put(wm.getModuleId(), webModuleInfo);
-        }
-
-        return appInfo;
-    }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoader.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoader.java
deleted file mode 100644
index 4047371583..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoader.java
+++ /dev/null
@@ -1,191 +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.impl;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-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 WARContributionClassLoader extends URLClassLoader {
-    
-    private Contribution contribution;
-    private WebModuleInfo webModuleInfo = null;
-    
-    /**
-     * Constructor for contribution ClassLoader 
-     * 
-     * @param contribution
-     * @param parent
-     * @throws MalformedURLException
-     */
-    public WARContributionClassLoader(Contribution contribution, final ClassLoader parent) {
-        super(new URL[0], parent);
-        
-        this.contribution = contribution;
-        
-        // get the classloaders for any WAR archive that is a contribution
-        // TODO extend to case where JEE archive is outside the contribution
-        for (Artifact artifact : contribution.getArtifacts()){
-            if (artifact.getModel() instanceof WebModuleInfo){
-                webModuleInfo = (WebModuleInfo)artifact.getModel();
-                break;
-            } 
-        }
-             
-    }
-    
-    /* (non-Javadoc)
-     * @see java.net.URLClassLoader#findClass(java.lang.String)
-     * 
-     * Search path for class:
-     *     This contribution
-     *     Imported contributions
-     */
-    @Override   
-    protected Class<?> findClass(String className) throws ClassNotFoundException {
-               
-        Class<?> clazz = null;
-        ClassNotFoundException cne = null;
-        
-        try {
-            clazz = webModuleInfo.getModuleClassloader().loadClass(className);
-        } catch (ClassNotFoundException e) {
-            cne = e;
-        }               
-        
-        if (clazz == null){
-            throw cne;
-        }
-             
-        return clazz;
-    }
-
-    
-    /* (non-Javadoc)
-     * @see java.lang.ClassLoader#loadClass(java.lang.String, boolean)
-     * 
-     * Search path for class:
-     *     Parent ClassLoader
-     *     This contribution
-     *     Imported contributions
-     *     
-     */
-    @Override
-    protected synchronized Class<?> loadClass(String className, boolean resolveClass) 
-        throws ClassNotFoundException {
-       
-        Class<?> clazz = null;
-        try {
-            
-            if (this.getParent() != null)
-                clazz = this.getParent().loadClass(className);
-            
-        } catch (ClassNotFoundException e) {
-        }
-
-        if (clazz == null)
-            clazz = findClass(className);
-
-
-        if (resolveClass)
-            this.resolveClass(clazz);
-        return clazz;
-        
-    }
-   
-    
-    /* (non-Javadoc)
-     * @see java.lang.ClassLoader#getResource(java.lang.String)
-     * 
-     * Find a resource. 
-     * Search path for resource:
-     *     Parent ClassLoader
-     *     This contribution
-     */
-    @Override
-    public URL getResource(String resName) {
- 
-        URL resource  = null;
-        
-        if (this.getParent() != null) {
-            resource  = this.getParent().getResource(resName);
-        }        
-        if (resource == null)
-            resource  = webModuleInfo.getModuleClassloader().getResource(resName);
-        
-        return resource;
-    }
-
-    
-    /* (non-Javadoc)
-     * @see java.lang.ClassLoader#getResources(java.lang.String)
-     * 
-     * Return list of resources from this contribution, resources
-     * imported through imported contributions and resources from parent 
-     * ClassLoader.
-     */
-    @Override
-    public Enumeration<URL> getResources(String resName) throws IOException {
-       
-        HashSet<URL> resourceSet = new HashSet<URL>();
-        
-        addEnumerationToCollection(resourceSet, webModuleInfo.getModuleClassloader().getResources(resName));
-        addEnumerationToCollection(resourceSet, super.getResources(resName));
-        
-        return Collections.enumeration(resourceSet);
-    }
-    
-    
-    /*
-     * Add an enumeration to a Collection
-     */
-    private <T extends Object> void addEnumerationToCollection(Collection<T> collection, Enumeration<T> enumeration) {
-        
-        while (enumeration.hasMoreElements())
-            collection.add(enumeration.nextElement());
-    }
-    
-    
-    @Override
-    public String toString() {
-        return "SCA WAR ClassLoader, parent ClassLoader: " + getParent();
-    }
-    
-    
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoaderProvider.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoaderProvider.java
deleted file mode 100644
index d2af85a7d5..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoaderProvider.java
+++ /dev/null
@@ -1,49 +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.impl;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.PackageType;
-import org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider;
-import org.apache.tuscany.sca.contribution.java.impl.ContributionClassLoader;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-
-/**
- * The default implementation of the ContributionClassLoaderProvider
- */
-public class WARContributionClassLoaderProvider implements ContributionClassLoaderProvider {
-
-    public WARContributionClassLoaderProvider() {
-        super();
-    }
-    
-    public String getContributionType() {
-        return PackageType.WAR;
-    }
-
-    public ClassLoader getClassLoader(Contribution contribution, ClassLoader parent) {
-        // TODO - This is not quite right at the CCL will load up the nested jars
-        //        also. However we do need to pick up the import processing so 
-        //        need a bit of a refactor
-        ContributionClassLoader ccl = new ContributionClassLoader(contribution, parent);
-        return new WARContributionClassLoader(contribution, ccl);
-    }
-
-}