Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

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

23 files changed, 0 insertions, 1658 deletions

diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java
deleted file mode 100644
index c3cb4e7b90..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java
+++ /dev/null
@@ -1,39 +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.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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java
deleted file mode 100644
index 00f7011111..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java
+++ /dev/null
@@ -1,39 +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.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EjbModuleInfo {
-    URI getUri();
-    void setUri(URI uri);
-    
-    String getModuleName();
-    void setModuleName(String moduleName);
-    
-    ClassLoader getModuleClassloader();
-    void setmoduleClassloader(ClassLoader classLoader);
-
-    Map<String, EjbInfo> getEjbInfos();
-    EjbInfo getEjbInfo(String beanName);
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java
deleted file mode 100644
index 72d594c4d0..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java
+++ /dev/null
@@ -1,70 +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.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("");
-                resolved = (EjbModuleInfo) map.get(uri);
-                if (resolved != null) {
-                    return modelClass.cast(resolved);
-                }
-            }
-        }
-        return unresolved;        
-    }
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java
deleted file mode 100644
index 109a32d62c..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java
+++ /dev/null
@@ -1,33 +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;
-
-/**
- * @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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java
deleted file mode 100644
index 26ce44c07e..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java
+++ /dev/null
@@ -1,29 +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;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class EnvEntryInfo {
-    public String type;
-    public String name;
-    public String value;
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java
deleted file mode 100644
index 107c251ea7..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java
+++ /dev/null
@@ -1,38 +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.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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java
deleted file mode 100644
index e27fa5ae44..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java
+++ /dev/null
@@ -1,70 +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.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("");
-                resolved = (JavaEEApplicationInfo) map.get(uri);
-                if (resolved != null) {
-                    return modelClass.cast(resolved);
-                }
-            }
-        }
-        return unresolved;        
-    }
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java
deleted file mode 100644
index a78448521f..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java
+++ /dev/null
@@ -1,32 +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 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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java
deleted file mode 100644
index ab89ce2bf7..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java
+++ /dev/null
@@ -1,34 +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.URL;
-
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-
-/**
- * Introspect JavaEE modules and applications.
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaEEIntrospector {
-    WebModuleInfo introspectWebArchive(URL artifactURL) throws ContributionReadException;
-    EjbModuleInfo introspectEjbArchive(URL artifactURL) throws ContributionReadException;
-    JavaEEApplicationInfo introspectJeeArchive(URL artifactURL) throws ContributionReadException;
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java
deleted file mode 100644
index 3461b149e4..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java
+++ /dev/null
@@ -1,35 +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 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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java
deleted file mode 100644
index e36aea2790..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java
+++ /dev/null
@@ -1,30 +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;
-
-
-/**
- * @version $Rev$ $Date$
- * 
- * Information on SCA reference tags in JSP pages.
- */
-public class JspReferenceTagInfo {
-    public String name;
-    public Class<?> type;
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
deleted file mode 100644
index 79e9019b11..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
+++ /dev/null
@@ -1,50 +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.util.Collection;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface WebModuleInfo {
-    URI getUri();
-    void setUri(URI uri);
-    
-    String getModuleName();
-    void setModuleName(String moduleName);
-    
-    ClassLoader getModuleClassloader();
-    void setmoduleClassloader(ClassLoader classLoader);
-    
-    Map<String, EjbReferenceInfo> getEjbReferences();
-    Map<String, EnvEntryInfo> getEnvEntries();
-    
-    EjbReferenceInfo getEjbReference(String ejbRefName);
-    EnvEntryInfo getEnvEntry(String envEntryName);
-    
-    Collection<Class<?>> getServletClasses();
-    Collection<Class<?>> getListenerClasses();
-    Collection<Class<?>> getFilterClasses();
-    Collection<Class<?>> getJSFClasses();
-
-    Collection<JspReferenceTagInfo> getJspReferenceTags();
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java
deleted file mode 100644
index 74117a13f0..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java
+++ /dev/null
@@ -1,70 +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.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("");
-                resolved = (WebModuleInfo) map.get(uri);
-                if (resolved != null) {
-                    return modelClass.cast(resolved);
-                }
-            }
-        }
-        return unresolved;        
-    }
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
deleted file mode 100644
index 32425e3299..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
+++ /dev/null
@@ -1,167 +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.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.net.URLStreamHandlerFactory;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-
-import org.apache.tuscany.sca.contribution.PackageType;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
-import org.apache.tuscany.sca.contribution.service.ContributionException;
-import org.eclipse.emf.common.archive.ArchiveURLConnection;
-
-/**
- * Ear Contribution package processor.
- * 
- * @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 {
-            return new URL("archive:" + packageSourceURL.toExternalForm() + "!/" + artifact);
-        }
-    }
-
-    public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException, IOException {
-        if (packageSourceURL == null) {
-            throw new IllegalArgumentException("Invalid null package source URL.");
-        }
-
-        if (inputStream == null) {
-            throw new IllegalArgumentException("Invalid null source inputstream.");
-        }
-
-        // The root is a jar file
-        JarInputStream jar = new JarInputStream(inputStream);
-        try {
-            Set<String> names = new HashSet<String>();
-            while (true) {
-                JarEntry entry = jar.getNextJarEntry();
-                if (entry == null) {
-                    // EOF
-                    break;
-                }
-
-                String name = entry.getName(); 
-                if (!name.startsWith(".")) {
-                    
-                    // Trim trailing /
-                    if (name.endsWith("/")) {
-                        name = name.substring(0, name.length() - 1);
-                    }
-
-                    // Add the entry name
-                    if (!names.contains(name)) {
-                        names.add(name);
-                        
-                        // Add parent folder names to the list too
-                        for (;;) {
-                            int s = name.lastIndexOf('/');
-                            if (s == -1) {
-                                name = "";
-                            } else {
-                                name = name.substring(0, s);
-                            }
-                            if (!names.contains(name)) {
-                                names.add(name);
-                            } else {
-                                break;
-                            }
-                        }
-                    }
-                }
-                if(entry.getName().indexOf("/") == -1 && (entry.getName().toLowerCase().endsWith(".war") || entry.getName().toLowerCase().endsWith(".jar"))) {
-                    // A WAR or an EJB JAR file in the root of the archive.
-                    // Get entries from the nested archive.
-                    ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                    int b;
-                    while((b = jar.read()) != -1) {
-                        bout.write(b);
-                    }
-                    bout.close();
-                    ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-                    
-                    PackageProcessor archiveProcessor = entry.getName().toLowerCase().endsWith(".war") ? new WarContributionProcessor() : new JarContributionProcessor();
-                    List<URI> artifacts = archiveProcessor.getArtifacts(packageSourceURL, bin);
-                    bin.close();
-                    for(URI artifact : artifacts) {
-                        names.add(entry.getName()+"!/"+artifact);
-                    }
-                }
-            }
-            
-            // Return list of URIs
-            List<URI> artifacts = new ArrayList<URI>();
-            for (String name: names) {
-                artifacts.add(URI.create(name));
-            }
-            return artifacts;
-            
-        } finally {
-            jar.close();
-        }
-    }
-
-    public String getPackageType() {
-        return PackageType.EAR;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
deleted file mode 100644
index 36aabefa99..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.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.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 {
-        if (jeeIntrospector != null) {
-            EjbModuleInfo ejbModuleInfo = jeeIntrospector.introspectEjbArchive(artifactURL);
-            if(ejbModuleInfo != null) {
-                ejbModuleInfo.setUri(artifactURI);
-                ejbModuleInfo.setModuleName(new File(artifactURL.getFile()).getName());
-            }
-            return ejbModuleInfo;
-        }
-        return null;
-    }
-
-    public Class<EjbModuleInfo> getModelType() {
-        return EjbModuleInfo.class;
-    }
-
-    public void resolve(EjbModuleInfo arg0, ModelResolver arg1)
-            throws ContributionResolveException {
-    }
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java
deleted file mode 100644
index 830aa81b19..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java
+++ /dev/null
@@ -1,66 +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.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 ClassLoader moduleClassLoader;
-    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;
-    }
-    
-    public ClassLoader getModuleClassloader() {
-        return moduleClassLoader;
-    }
-    
-    public void setmoduleClassloader(ClassLoader classLoader) {
-        this.moduleClassLoader = classLoader;        
-    }    
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java
deleted file mode 100644
index 993605ebe5..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java
+++ /dev/null
@@ -1,68 +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.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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java
deleted file mode 100644
index 53201b5e2b..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java
+++ /dev/null
@@ -1,59 +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.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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
deleted file mode 100644
index 8d8d0f4c35..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
+++ /dev/null
@@ -1,197 +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.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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
deleted file mode 100644
index f02b74bd8d..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
+++ /dev/null
@@ -1,259 +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.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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
deleted file mode 100644
index 17974e831f..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
+++ /dev/null
@@ -1,36 +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.PackageType;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
-
-/**
- * War Contribution package processor.
- * 
- * @version $Rev$ $Date$
- */
-public class WarContributionProcessor extends JarContributionProcessor implements PackageProcessor {
-    @Override
-    public String getPackageType() {
-        return PackageType.WAR;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java
deleted file mode 100644
index 9e9bfb8bc1..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java
+++ /dev/null
@@ -1,59 +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.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;
-
-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.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java b/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
deleted file mode 100644
index ceca698356..0000000000
--- a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
+++ /dev/null
@@ -1,109 +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.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.JspReferenceTagInfo;
-import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;
-
-public class WebModuleInfoImpl implements WebModuleInfo {
-    
-    private URI uri;
-    private String moduleName;
-    private ClassLoader moduleClassLoader;
-    
-    private Collection<Class<?>> servletClasses = new ArrayList<Class<?>>();
-    private Collection<Class<?>> listenerClasses = new ArrayList<Class<?>>();
-    private Collection<Class<?>> filterClasses = new ArrayList<Class<?>>();
-    private Collection<Class<?>> jsfClasses = new ArrayList<Class<?>>();
-    
-    private Collection<JspReferenceTagInfo> jspReferenceTags = new ArrayList<JspReferenceTagInfo>();
-    
-    private Map<String, EjbReferenceInfo> ejbReferences = new HashMap<String, EjbReferenceInfo>();
-    private Map<String, EnvEntryInfo> envEntries = new HashMap<String, EnvEntryInfo>();
-
-    public WebModuleInfoImpl() {
-    }
-    public Collection<Class<?>> getServletClasses() {
-        return servletClasses;
-    }
-
-    public Collection<Class<?>> getListenerClasses() {
-        return listenerClasses;
-    }
-
-    public Collection<Class<?>> getFilterClasses() {
-        return filterClasses;
-    }
-
-    public Collection<Class<?>> getJSFClasses() {
-        return jsfClasses;
-    }
-    
-    public Collection<JspReferenceTagInfo> getJspReferenceTags() {
-        return jspReferenceTags;
-    }
-
-    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;
-    }
-    
-    public ClassLoader getModuleClassloader() {
-        return moduleClassLoader;
-    }
-    
-    public void setmoduleClassloader(ClassLoader classLoader) {
-        this.moduleClassLoader = classLoader;        
-    }
-}