Moving current trunk modules to contrib, before starting the Equinox branch merge

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

29 files changed, 0 insertions, 2664 deletions

diff --git a/java/sca/modules/contribution-java/LICENSE b/java/sca/modules/contribution-java/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca/modules/contribution-java/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca/modules/contribution-java/META-INF/MANIFEST.MF b/java/sca/modules/contribution-java/META-INF/MANIFEST.MF
deleted file mode 100644
index 5ffdfc3b0a..0000000000
--- a/java/sca/modules/contribution-java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.contribution.java;uses:="org.ap

- ache.tuscany.sca.contribution";version="2.0"

-Private-Package: org.apache.tuscany.sca.contribution.java.impl;version

- ="2.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Java Import/Export Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-DynamicImport-Package: org.apache.tuscany.sca.contribution.osgi.impl

-Bundle-Version: 2.0

-Bnd-LastModified: 1225397112984

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Java Import/Export Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0",

- org.apache.tuscany.sca.contribution.java;version="2.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0",

- org.apache.tuscany.sca.core;version="2.0",

- org.apache.tuscany.sca.extensibility;version="2.0",

- org.apache.tuscany.sca.monitor;version="2.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.contribution.java

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca/modules/contribution-java/NOTICE b/java/sca/modules/contribution-java/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/java/sca/modules/contribution-java/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca/modules/contribution-java/pom.xml b/java/sca/modules/contribution-java/pom.xml
deleted file mode 100644
index 5a63f16ee0..0000000000
--- a/java/sca/modules/contribution-java/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution-java</artifactId>
-    <name>Apache Tuscany SCA Java Import/Export Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.4</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.contribution.java</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution.java*</Export-Package>
-                        <DynamicImport-Package>org.apache.tuscany.sca.contribution.osgi.impl</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
deleted file mode 100644
index 886c61c00a..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.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.java;
-
-import org.apache.tuscany.sca.contribution.java.impl.JavaImportExportFactoryImpl;
-
-/**
- * Default Java Import/Export Factory implementation
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultJavaImportExportFactory extends JavaImportExportFactoryImpl implements JavaImportExportFactory {
-}
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
deleted file mode 100644
index 41e93ec148..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
+++ /dev/null
@@ -1,43 +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.java;
-
-import org.apache.tuscany.sca.contribution.Export;
-
-/**
- * Base Java Export model interface
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaExport extends Export {
-    /**
-     * Get java package that identifies the import
-     * 
-     * @return The package name
-     */
-    String getPackage();
-
-    /**
-     * Set java package that identifies the import
-     * 
-     * @param packageName The package name
-     */
-    void setPackage(String packageName);
-}
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
deleted file mode 100644
index d3568f6283..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
+++ /dev/null
@@ -1,58 +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.java;
-
-import org.apache.tuscany.sca.contribution.Import;
-
-/**
- * Base Java Import model interface
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaImport extends Import {
-
-    /**
-     * Get the location used to resolve the definitions for this import
-     * 
-     * @return The import location
-     */
-    String getLocation();
-
-    /**
-     * Set the location used to resolve the definitions for this import
-     * 
-     * @param location The import location
-     */
-    void setLocation(String location);
-
-    /**
-     * Get java package that identifies the import
-     * 
-     * @return The package name
-     */
-    String getPackage();
-
-    /**
-     * Set java package that identifies the import
-     * 
-     * @param packageName The package name
-     */
-    void setPackage(String packageName);
-}
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
deleted file mode 100644
index af2ca9cd57..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
+++ /dev/null
@@ -1,42 +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.java;

-

-/**

- * Base Java Import/Export model factory

- * 

- * @version $Rev$ $Date$

- */

-public interface JavaImportExportFactory {

-

-    /**

-     * Create a java import model object

-     * 

-     * @return The new JavaImport model object

-     */

-    JavaImport createJavaImport();

-    

-    /**

-     * Create a java export model object

-     * 

-     * @return The new JavaExport model object

-     */

-    JavaExport createJavaExport();

-}

diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
deleted file mode 100644
index 61c73bf2f8..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
+++ /dev/null
@@ -1,161 +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.java.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.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.DefaultDelegatingModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * A Model Resolver for ClassReferences.
- *
- * @version $Rev$ $Date$
- */
-public class ClassLoaderModelResolver extends URLClassLoader implements ModelResolver {
-    private Contribution contribution;
-    private Map<String, ModelResolver> importResolvers = new HashMap<String, ModelResolver>();
-    
-    private static ClassLoader parentClassLoader() {
-        ClassLoader parentClassLoader = ServiceDiscovery.getInstance().getServiceDiscoverer().getClass().getClassLoader();
-        return parentClassLoader;
-    }
-    
-    public ClassLoaderModelResolver(final Contribution contribution, ModelFactoryExtensionPoint modelFactories) throws MalformedURLException {
-        super(new URL[] {new URL(contribution.getLocation())}, parentClassLoader());
-        this.contribution = contribution;
-        
-        // Index Java import resolvers by package name
-        Map<String, List<ModelResolver>> resolverMap = new HashMap<String, List<ModelResolver>>();
-        for (Import import_: this.contribution.getImports()) {
-            if (import_ instanceof JavaImport) {
-                JavaImport javaImport = (JavaImport)import_;
-                List<ModelResolver> resolvers = resolverMap.get(javaImport.getPackage());
-                if (resolvers == null) {
-                    resolvers = new ArrayList<ModelResolver>();
-                    resolverMap.put(javaImport.getPackage(), resolvers);
-                }
-                resolvers.add(javaImport.getModelResolver());
-            }
-        }
-        
-        // Create a delegating model resolver for each imported package
-        for (Map.Entry<String, List<ModelResolver>> entry: resolverMap.entrySet()) {
-            importResolvers.put(entry.getKey(), new DefaultDelegatingModelResolver(entry.getValue()));
-        }
-    }
-
-    public void addModel(Object resolved) {
-        throw new IllegalStateException();
-    }
-
-    public Object removeModel(Object resolved) {
-        throw new IllegalStateException();
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        if (!(unresolved instanceof ClassReference)) {
-            return unresolved;
-        }
-        
-        try {
-            
-            // Load the class and return a class reference for it
-            String className = ((ClassReference)unresolved).getClassName();
-            Class<?> clazz = Class.forName(className, true, this);
-            return modelClass.cast(new ClassReference(clazz));
-            
-        } catch (ClassNotFoundException e) {
-            return unresolved;
-        } catch (NoClassDefFoundError e) {
-            return unresolved;
-        }
-    }
-    
-    @Override
-    public URL findResource(String name) {
-        
-        //TODO delegate to the Java import resolvers
-        
-        URL url = super.findResource(name);
-        return url;
-    }
-
-    @Override
-    public Enumeration<URL> findResources(String name) throws IOException {
-        
-        //TODO delegate to the Java import resolvers
-        //Enumeration<URL> importedResources;
-        
-        Enumeration<URL> resources = super.findResources(name);
-        List<URL> allResources = new ArrayList<URL>(); 
-        //for (; importedResources.hasMoreElements(); ) {
-        //    allResources.add(importedResources.nextElement());
-        //}
-        for (; resources.hasMoreElements(); ) {
-            allResources.add(resources.nextElement());
-        }
-        return Collections.enumeration(allResources);
-    }
-    
-    @Override
-    protected Class<?> findClass(String name) throws ClassNotFoundException {
-        
-        // Extract the package name
-        int d = name.lastIndexOf('.');
-        String packageName;
-        if (d != -1) {
-            packageName = name.substring(0, d);
-        } else {
-            packageName = null;
-        }
-        
-        // First try to load the class using the Java import resolvers
-        ModelResolver importResolver = importResolvers.get(packageName);
-        if (importResolver != null) {
-            ClassReference classReference = importResolver.resolveModel(ClassReference.class, new ClassReference(name));
-            if (!classReference.isUnresolved()) {
-                return classReference.getJavaClass();
-            }
-        }
-
-        // Next, try to load the class from the current contribution
-        Class<?> clazz = super.findClass(name);
-        return clazz;
-    }
-    
-}
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
deleted file mode 100644
index 962512a745..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
+++ /dev/null
@@ -1,158 +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.java.impl;

-

-import java.lang.ref.WeakReference;

-import java.lang.reflect.Constructor;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-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.ClassReference;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;

-

-/**

- * A Model Resolver for ClassReferences.

- *

- * @version $Rev: 557916 $ $Date: 2007-07-20 01:04:40 -0700 (Fri, 20 Jul 2007) $

- */

-public class ClassReferenceModelResolver implements ModelResolver {

-    private Contribution contribution;

-    private WeakReference<ClassLoader> classLoader;

-    private Map<String, ClassReference> map = new HashMap<String, ClassReference>();

-

-    private ModelResolver osgiResolver;

-

-    public ClassReferenceModelResolver(final Contribution contribution, ModelFactoryExtensionPoint modelFactories) {

-        this.contribution = contribution;

-        if (this.contribution != null) {

-            // Allow privileged access to get ClassLoader. Requires RuntimePermission in security policy.

-            // ClassLoader cl = contribution.getClassLoader();

-            ClassLoader cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {

-                public ClassLoader run() {

-                    return contribution.getClassLoader();

-                }

-            });           

-

-            if (cl == null) {

-                // Allow privileged access to get ClassLoader. Requires RuntimePermission in security policy.

-                //ClassLoader contextClassLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {

-                //    public ClassLoader run() {

-                //        return Thread.currentThread().getContextClassLoader();

-                //    }

-                //});

-                ClassLoader contextClassLoader = ServiceDiscovery.getInstance().getServiceDiscoverer().getClass().getClassLoader();

-                cl = new ContributionClassLoader(contribution, contextClassLoader);

-                contribution.setClassLoader(cl);

-            }

-            this.classLoader = new WeakReference<ClassLoader>(cl);

-        } else {

-            // This path should be used only for unit testing.

-            // Allow privileged access to get ClassLoader. Requires RuntimePermission in security policy.

-            // this.classLoader = new WeakReference<ClassLoader>(this.getClass().getClassLoader());

-            ClassLoader cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {

-                public ClassLoader run() {

-                    return this.getClass().getClassLoader();

-                }

-            });           

-            this.classLoader = new WeakReference<ClassLoader>( cl );

-        }

-

-        try {

-            Class<?> osgiResolverClass =

-                Class.forName("org.apache.tuscany.sca.contribution.osgi.impl.OSGiClassReferenceModelResolver");

-            if (osgiResolverClass != null) {

-                Constructor constructor =

-                    osgiResolverClass.getConstructor(Contribution.class, ModelFactoryExtensionPoint.class);

-                this.osgiResolver = (ModelResolver)constructor.newInstance(contribution, modelFactories);

-            }

-        } catch (Throwable e) {

-            // Ignore error, non-OSGi classloading is used in this case

-        }

-    }

-

-    public void addModel(Object resolved) {

-        ClassReference clazz = (ClassReference)resolved;

-        map.put(clazz.getClassName(), clazz);

-    }

-

-    public Object removeModel(Object resolved) {

-        return map.remove(((ClassReference)resolved).getClassName());

-    }

-

-  

-

-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {

-        if (!(unresolved instanceof ClassReference)) {

-            return unresolved;

-        }

-        Object resolved = map.get(((ClassReference)unresolved).getClassName());

-

-        if (resolved != null) {

-            return modelClass.cast(resolved);

-        }

-

-        //Load a class on demand

-        Class clazz = null;

-        

-        if (osgiResolver != null) {

-            resolved = osgiResolver.resolveModel(modelClass, unresolved);

-            clazz = ((ClassReference)resolved).getJavaClass();

-        }

-        

-        if (clazz == null) {

-            try {

-            	// Search contribution ClassLoader (which has visibility of classes in the contribution

-            	// as well as explicitly imported packages from other contributions)

-                clazz = Class.forName(((ClassReference)unresolved).getClassName(), true, classLoader.get());

-            } catch (ClassNotFoundException e) {

-            } catch (NoClassDefFoundError e) {

-            }

-        }

-

-        if (clazz != null) {

-            //if we load the class            

-            // Store a new ClassReference wrapping the loaded class

-            ClassReference classReference = new ClassReference(clazz);

-            map.put(clazz.getName(), classReference);

-

-            // Return the resolved ClassReference

-            return modelClass.cast(classReference);

-        } else {

-            return unresolved;

-        }

-

-    }

-

-    

-    /***************

-     * Helper methods

-     ***************/

-

-    private String getPackageName(ClassReference clazz) {

-        int pos = clazz.getClassName().lastIndexOf(".");

-        return clazz.getClassName().substring(0, pos);

-    }

-    

-}

diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
deleted file mode 100644
index aa68925376..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
+++ /dev/null
@@ -1,385 +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.java.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.Collection;

-import java.util.Collections;

-import java.util.Enumeration;

-import java.util.HashSet;

-

-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;

-

-

-public class ContributionClassLoader extends URLClassLoader {

-// public class ContributionClassLoader  {

-    

-    private Contribution contribution;

-    // private b urlClassLoader;

-    

-    /**

-     * Constructor for contribution ClassLoader 

-     * 

-     * @param contribution

-     * @param parent

-     * @throws MalformedURLException

-     */

-    public ContributionClassLoader(Contribution contribution, final ClassLoader parent) {

-        super(new URL[0], parent);

-        // Note that privileged use of getContextClassLoader have been promoted to callers.

-        // super(new URL[0], parent == null?Thread.currentThread().getContextClassLoader(): null);

-        this.contribution = contribution;

-        if (contribution.getLocation() != null) {

-            try {

-                this.addURL(new URL(contribution.getLocation()));

-            } catch (MalformedURLException e) {

-                throw new RuntimeException(e);

-            }

-        }

-    }

-

-    /*

-     * Return the ClassLoader corresponding to a contribution providing an export

-     * Create a new ClassLoader for the contribution if one does not exist

-     */

-    private ClassLoader getExportClassLoader(Contribution exportingContribution) {

-    	ClassLoader cl = exportingContribution.getClassLoader();

-        if (!(cl instanceof ContributionClassLoader)) {

-            if (cl == null) {

-                cl = getParent();

-            }

-

-            cl = new ContributionClassLoader(exportingContribution, cl);

-            exportingContribution.setClassLoader(cl);

-        }

-        return cl;

-    }

-    

-    /* (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;

-        try {

-            clazz = findClassFromContribution(className);

-        } catch (ClassNotFoundException e) {

-                

-            for (Import import_ : this.contribution.getImports()) {

-                if (classNameMatchesImport(className, import_)) {

-                    // Delegate the resolution to the imported contribution

-                    for (Contribution exportingContribution : ((JavaImportModelResolver)import_.getModelResolver()).getExportContributions()) {

-                                    

-                        ClassLoader exportClassLoader = getExportClassLoader(exportingContribution);

-                        if (exportClassLoader instanceof ContributionClassLoader) {

-                            

-                            for (Export export : exportingContribution.getExports()) {

-                                try {

-                                    if (import_.match(export)) {

-                                        clazz = ((ContributionClassLoader)exportClassLoader).findClassFromContribution(className);

-                                        break;

-                                    }

-                                } catch (ClassNotFoundException e1) { 

-                                    continue;

-                                }

-                                    

-                            }

-                            if (clazz != null)  break;

-                        }

-                    }

-                    if (clazz != null) break;

-                }

-            }

-

-            if (clazz == null) throw e;

-        }

-        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.net.URLClassLoader#findResource(java.lang.String)

-     */

-    @Override

-    public URL findResource(String name) {

-        

-        URL url = findResourceFromContribution(name);

-        

-        if (url == null) {

-            for (Import import_ : this.contribution.getImports()) {

-                if (resourceNameMatchesImport(name, import_)) {

-                    // Delegate the resolution to the imported contribution

-                    for (Contribution exportingContribution : ((JavaImportModelResolver)import_.getModelResolver()).getExportContributions()) {

-                                

-                        ClassLoader exportClassLoader = getExportClassLoader(exportingContribution);

-                        if (exportClassLoader instanceof ContributionClassLoader) {

-

-                            for (Export export : exportingContribution.getExports()) {

-                                if (import_.match(export)) {

-                                    url = ((ContributionClassLoader)exportClassLoader).findResourceFromContribution(name);

-                                    if (url != null) break;

-                                }

-                            }

-                            if (url != null)  break;

-                        }

-                    }

-                    if (url != null) break;

-                }

-            }

-

-        }

-        return url;

-    }

-

-

-    /* (non-Javadoc)

-     * @see java.net.URLClassLoader#findResources(java.lang.String)

-     */

-    @Override

-    public Enumeration<URL> findResources(String name) throws IOException {

-              

-        return Collections.enumeration(findResourceSet(name));

-    }

-    

-    

-

-    

-    /* (non-Javadoc)

-     * @see java.lang.ClassLoader#getResource(java.lang.String)

-     * 

-     * Find a resource. 

-     * Search path for resource:

-     *     Parent ClassLoader

-     *     This contribution

-     *     Imported contributions

-     */

-    @Override

-    public URL getResource(String resName) {

- 

-        URL resource  = null;

-        

-        if (this.getParent() != null) {

-            resource  = this.getParent().getResource(resName);

-        }        

-        if (resource == null)

-            resource  = findResource(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 = findResourceSet(resName);

-        addEnumerationToCollection(resourceSet, super.getResources(resName));

-        

-        return Collections.enumeration(resourceSet);

-    }

-    

-

-    /*

-     * Find set of resources

-     */

-    private HashSet<URL> findResourceSet(String name) throws IOException {

-        

-        HashSet<URL> resources = new HashSet<URL>();

-

-        addEnumerationToCollection(resources, super.findResources(name));

-        

-        for (Import import_ : this.contribution.getImports()) {

-            if (!(import_ instanceof JavaImport)) {

-                continue;

-            }

-            if (resourceNameMatchesImport(name, import_)) {

-                // Delegate the resolution to the imported contribution

-                for (Contribution exportingContribution : ((JavaImportModelResolver)import_.getModelResolver()).getExportContributions()) {

-                                

-                    ClassLoader exportClassLoader = getExportClassLoader(exportingContribution);

-                    if (exportClassLoader instanceof ContributionClassLoader) {

-

-                        for (Export export : exportingContribution.getExports()) {

-                            if (import_.match(export)) {

-                                addEnumerationToCollection(resources,

-                                        ((ContributionClassLoader)exportClassLoader).findResources(name));

-                            }

-                        }

-                    }

-                }

-            }

-         }

-

-        return resources;

-    }

-

-

-    /*

-     * Find class from contribution. If class has already been loaded, return loaded class.

-     */

-    private Class<?> findClassFromContribution(String className) throws ClassNotFoundException {

-        

-        Class<?> clazz = findLoadedClass(className);

-        if (clazz == null)

-            clazz =  super.findClass(className);

-        return clazz;

-       

-    }

-    

-    /*

-     * Find resource from contribution.

-     */

-    private URL findResourceFromContribution(String name) {

-        

-        return super.findResource(name);

-    }

-    

-    /**

-     * Check if a class name matches an import statement.

-     * Class matches if the package name used in <import.java/> matches

-     * 

-     * @param name    Name of class 

-     * @param import_ SCA contribution import

-     * @return true if this is a matching import

-     */

-    private boolean classNameMatchesImport(String name, Import import_) {

-        

-        if (import_ instanceof JavaImport && name != null && name.lastIndexOf('.') > 0) {

-            JavaImport javaImport = (JavaImport) import_;

-                

-            String packageName = name.substring(0, name.lastIndexOf('.'));

-            if (javaImport.getPackage().endsWith(".*")) {

-                String prefix = javaImport.getPackage().substring(0, javaImport.getPackage().length() -1);

-                 if (packageName.startsWith(prefix)) {

-                    return true;

-                }

-            } else {

-                return packageName.equals(javaImport.getPackage());

-            }

-        }

-        

-        return false;

-    }

-    

-    /**

-     * Check if a resource name matches an import statement.

-     * Resource matches if package/namespace match the directory of resource.

-     * 

-     * @param name    Name of resource

-     * @param import_ SCA contribution import

-     * @return true if this is a matching import

-     */

-    private boolean resourceNameMatchesImport(String name, Import import_) {

-        

-       

-        if (name == null || name.lastIndexOf('/') <= 0)

-            return false;

-        else if (import_ instanceof JavaImport) {

-            JavaImport javaImport = (JavaImport) import_;

-            

-            if (javaImport.getPackage().endsWith(".*")) {

-                String packageName = name.substring(0, name.lastIndexOf('/')).replace('/', '.');

-                String prefix = javaImport.getPackage().substring(0, javaImport.getPackage().length() -1);

-                if (packageName.startsWith(prefix)) {

-                    return true;

-                }

-            } else {

-                // 'name' is a resource : contains "/" as separators

-                // Get package name from resource name

-                String packageName = name.substring(0, name.lastIndexOf('/'));

-                 return packageName.equals(javaImport.getPackage().replaceAll("\\.", "/"));

-            }

-        } 

-        return false;

-    }

-    

-    /*

-     * 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 Contribution ClassLoader location: " + contribution.getLocation() + " parent ClassLoader: " + getParent();

-    }

-    

-    

-}

diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
deleted file mode 100644
index f35f35ac4c..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ /dev/null
@@ -1,58 +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.java.impl;
-
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * Implementation of a Java Import model
- * 
- * @version $Rev$ $Date$
- */
-public class JavaExportImpl implements JavaExport {
-    private ModelResolver modelResolver;
-
-    /**
-     * Java package being exported
-     */
-    private String packageName;
-
-    public JavaExportImpl() {
-        super();
-    }
-
-    public String getPackage() {
-        return this.packageName;
-    }
-
-    public void setPackage(String packageName) {
-        this.packageName = packageName;
-    }
-
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-
-}
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
deleted file mode 100644
index 8d5412f6d7..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
+++ /dev/null
@@ -1,76 +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.java.impl;
-
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A model resolver for Java exports.
- *
- * @version $Rev$ $Date$
- */
-public class JavaExportModelResolver implements ModelResolver {
-
-    private JavaExport export;
-    private ModelResolver resolver;
-    
-    public JavaExportModelResolver(JavaExport export, ModelResolver resolver) {
-        this.export = export;
-        this.resolver = resolver;
-    }
-    
-    public void addModel(Object resolved) {
-        throw new IllegalStateException();
-    }
-
-    public Object removeModel(Object resolved) {
-        throw new IllegalStateException();
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        if (!(unresolved instanceof ClassReference)) {
-            return unresolved;
-        }
-        
-        // Filter package name
-        ClassReference classReference = (ClassReference)unresolved;
-        String className = classReference.getClassName();
-        int d = className.lastIndexOf('.');
-        String packageName;
-        if (d != -1) {
-            packageName = className.substring(0, d);
-        } else {
-            packageName = "";
-        }
-        if (export.getPackage().equals(packageName)) {
-            
-            // Package matches the exported package, delegate to the
-            // contribution's resolver
-            return resolver.resolveModel(modelClass, unresolved);
-        } else {
-            
-            // Package is not exported, return the unresolved object 
-            return unresolved;
-        }
-    }
-
-}
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
deleted file mode 100644
index d7c3817b68..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.contribution.java.impl;
-
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-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.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Artifact processor for Java Export
- * 
- * @version $Rev$ $Date$
- */
-public class JavaExportProcessor implements StAXArtifactProcessor<JavaExport> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    
-    private static final QName EXPORT_JAVA = new QName(SCA10_NS, "export.java");
-    
-    private static final String PACKAGE = "package";
-    
-    private final JavaImportExportFactory factory;
-    private final Monitor monitor;
-    
-    public JavaExportProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super();
-        this.factory = modelFactories.getFactory(JavaImportExportFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-     
-     /**
-      * Report a exception.
-      * 
-      * @param problems
-      * @param message
-      * @param model
-      */
-     private void error(String message, Object model, Exception ex) {
-         if (monitor != null) {
-             Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, ex);
-             monitor.problem(problem);
-         }
-     }
-
-    public QName getArtifactType() {
-        return EXPORT_JAVA;
-    }
-    
-    public Class<JavaExport> getModelType() {
-        return JavaExport.class;
-    }
-    
-    /**
-     * Process <export package=""/>
-     */
-    public JavaExport read(XMLStreamReader reader) throws ContributionReadException {
-        JavaExport javaExport = this.factory.createJavaExport();
-        QName element = null;
-        
-        try {
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-                    case START_ELEMENT:
-                        element = reader.getName();
-                        
-                        // Read <export.java>
-                        if (EXPORT_JAVA.equals(element)) {
-                            String packageName = reader.getAttributeValue(null, PACKAGE);
-                            if (packageName == null) {
-                            	error("AttributePackageMissing", reader);
-                                //throw new ContributionReadException("Attribute 'package' is missing");
-                            } else                        
-                                javaExport.setPackage(packageName);
-                        }
-                        break;
-                    case XMLStreamConstants.END_ELEMENT:
-                        if (EXPORT_JAVA.equals(reader.getName())) {
-                            return javaExport;
-                        }
-                        break;        
-                }
-                
-                //Read the next element
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error("XMLStreamException", reader, ex);
-        }
-        
-        return javaExport;
-    }
-
-    public void write(JavaExport javaExport, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <export.java>
-        writer.writeStartElement(EXPORT_JAVA.getNamespaceURI(), EXPORT_JAVA.getLocalPart());
-        
-        if (javaExport.getPackage() != null) {
-            writer.writeAttribute(PACKAGE, javaExport.getPackage());
-        }
-        
-        writer.writeEndElement();
-    }
-
-    public void resolve(JavaExport javaExport, ModelResolver resolver) throws ContributionResolveException {
-        
-        if (javaExport.getPackage() != null)
-            // Initialize the export resolver
-            javaExport.setModelResolver(new JavaExportModelResolver(javaExport, resolver));
-    }
-}
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
deleted file mode 100644
index e5dc397f4e..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
+++ /dev/null
@@ -1,41 +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.java.impl;

-

-import org.apache.tuscany.sca.contribution.java.JavaExport;

-import org.apache.tuscany.sca.contribution.java.JavaImport;

-import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;

-

-/**

- * Java Import/Export Factory implementation

- * 

- * @version $Rev$ $Date$

- */

-public class JavaImportExportFactoryImpl implements JavaImportExportFactory {

-

-    public JavaImport createJavaImport() {

-        return new JavaImportImpl();

-    }

-    

-    public JavaExport createJavaExport() {

-        return new JavaExportImpl();

-    }

-

-}

diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
deleted file mode 100644
index 47cdc9767b..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
+++ /dev/null
@@ -1,157 +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.java.impl;

-

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.apache.tuscany.sca.contribution.Artifact;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.ContributionFactory;

-import org.apache.tuscany.sca.contribution.Export;

-import org.apache.tuscany.sca.contribution.Import;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.java.JavaExport;

-import org.apache.tuscany.sca.contribution.java.JavaImport;

-import org.apache.tuscany.sca.contribution.resolver.DefaultImportAllModelResolver;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionListener;

-import org.apache.tuscany.sca.contribution.service.ContributionRepository;

-

-/**

- * Java Import/Export contribution listener

- * The listener would process all import/export from a given contribution 

- * and initialize the model resolvers properly

- * 

- * @version $Rev$ $Date$

- */

-public class JavaImportExportListener implements ContributionListener {

-    

-    private ContributionFactory contributionFactory;

-    

-    /**

-     * Constructs a new JavaImportExportListener

-     */

-    public JavaImportExportListener(ModelFactoryExtensionPoint modelFactories) {

-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);

-    }

-    

-    /**

-     * Initialize the import/export model resolvers

-     * Export model resolvers are same as Contribution model resolver

-     * Import model resolvers are matched to a specific contribution if a location URI is specified, 

-     *    otherwise it try to resolve against all the other contributions

-     * Also set the exporting contributions used by contribution ClassLoaders to 

-     * match import/export for class loading.

-     */

-    public void contributionAdded(ContributionRepository repository, Contribution contribution) {

-        

-        // If the contribution does not contain sca-contribution.xml metadata

-        // (for example it's an existing JAR developed before SCA existed)

-        // export all its Java packages

-        ModelResolver modelResolver = contribution.getModelResolver();

-        

-        // Look for META-INF/sca-contribution.xml

-        Artifact artifact = contributionFactory.createArtifact();

-        artifact.setURI(Contribution.SCA_CONTRIBUTION_META);

-        artifact = modelResolver.resolveModel(Artifact.class, artifact);

-        if (artifact.getLocation() == null) {

-

-            // Look for META-INF/sca-contribution-generated.xml

-            artifact.setURI(Contribution.SCA_CONTRIBUTION_GENERATED_META);

-            artifact = modelResolver.resolveModel(Artifact.class, artifact);

-            if (artifact.getLocation() == null) {

-                

-                // No contribution metadata file was found, default to export all the

-                // Java packages found in the contribution

-                Set<String> packages = new HashSet<String>();

-                for (Artifact a: contribution.getArtifacts()) {

-                    String uri = a.getURI();

-                    if (uri.endsWith(".class")) {

-                        uri = uri.substring(0, uri.length() - 6);

-                        int d = uri.lastIndexOf('/');

-                        if (d != -1) {

-                            packages.add(uri.substring(0, d).replace('/', '.'));

-                        }

-                    }

-                }

-                

-                // Add Java export model objects for all the packages we found

-                for (String pkg: packages) {

-                    JavaExport export = new JavaExportImpl();

-                    export.setPackage(pkg);

-                    contribution.getExports().add(export);

-                }

-            }

-        }

-        

-        // Initialize the contribution exports

-        for (Export export: contribution.getExports()) {

-            export.setModelResolver(contribution.getModelResolver());

-        }

-        

-        // Initialize the contribution imports

-        for (Import import_: contribution.getImports()) {

-            boolean initialized = false;

-            

-            if(import_ instanceof JavaImport) {

-                JavaImport javaImport = (JavaImport) import_;

-                

-                //Find a matching contribution

-                if(javaImport.getLocation() != null) {

-                    Contribution targetContribution = repository.getContribution(javaImport.getLocation());

-                    if (targetContribution != null) {

-                    

-                        // Find a matching contribution export

-                        for (Export export: targetContribution.getExports()) {

-                            if (export instanceof JavaExport) {

-                                JavaExport javaExport = (JavaExport)export;

-                                if (javaImport.getPackage().equals(javaExport.getPackage())) {

-                                    List<Contribution> exportingContributions = new ArrayList<Contribution>();

-                                    exportingContributions.add(targetContribution);

-                                    javaImport.setModelResolver(new JavaImportModelResolver(exportingContributions, javaExport.getModelResolver()));

-                                    initialized = true;

-                                    break;

-                                }

-                            }

-                        }

-                    }                    

-                }

-

-                //if no location was specified, try to resolve with any contribution

-                if (!initialized) {

-                    //Use a resolver that will consider all contributions

-                    import_.setModelResolver(new JavaImportModelResolver(repository.getContributions(), new DefaultImportAllModelResolver(import_, repository.getContributions())));

-                }

-            }

-        }

-    }

-

-    public void contributionRemoved(ContributionRepository repository, Contribution contribution) {

-

-    }

-

-    public void contributionUpdated(ContributionRepository repository, Contribution oldContribution, Contribution contribution) {

-

-    }

-

-}

diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
deleted file mode 100644
index cc18d5f798..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ /dev/null
@@ -1,110 +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.java.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * Implementation of a Java Import model
- * 
- * @version $Rev$ $Date$
- */
-public class JavaImportImpl implements JavaImport {
-    private ModelResolver modelResolver;
-    private List<Contribution> contributions;
-    /**
-     * Java package name being imported
-     */
-    private String packageName;
-    /**
-     * Contribution URI where the artifact is imported from
-     */
-    private String location;
-    
-    public JavaImportImpl() {
-        super();
-    }
-
-    public String getLocation() {
-        return this.location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getPackage() {
-        return this.packageName;
-    }
-
-    public void setPackage(String packageName) {
-        this.packageName = packageName;
-    }
-
-    public ModelResolver getModelResolver() {
-        return this.modelResolver;
-    }
-
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-    public List<Contribution> getExportContributions() {
-        return contributions;
-    }
-
-    public void setExportContributions(List<Contribution> contributions) {
-        this.contributions = contributions;
-    }
-
-    /**
-     * Match a JavaImport to a given JavaExport based on :
-     *    location is not provided
-     *    import and export packages match
-     */
-    public boolean match(Export export) {
-        if(export instanceof JavaExport) {
-            JavaExport javaExport = (JavaExport)export;
-            String exportedPackage = javaExport.getPackage();
-            if (packageName.equals(exportedPackage)) {
-                return true;
-            } else {
-                if (packageName.endsWith(".*")) {
-                    String prefix = packageName.substring(0, packageName.length() - 1);
-                    if (exportedPackage.startsWith(prefix)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        
-        return false;
-    }
-    
-    @Override
-    public String toString() {
-        return String.valueOf(packageName);
-    }
-}
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
deleted file mode 100644
index 484eddd222..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
+++ /dev/null
@@ -1,62 +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.java.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A JavaImport specific model resolver. This model resolver is temporary
- * and provides the ContributionClassLoader with the list of exporting
- * contributions that it currently needs.
- * 
- * FIXME Remove this class after the ContributionClassLoader is simplified
- * and cleaned up.
- *
- * @version $Rev$ $Date$
- */
-public class JavaImportModelResolver implements ModelResolver {
-
-    private ModelResolver modelResolver;
-    private List<Contribution> contributions;
-    
-    public JavaImportModelResolver(List<Contribution> contributions, ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-        this.contributions = contributions;
-    }
-
-    public List<Contribution> getExportContributions() {
-        return contributions;
-    }
-    
-    public void addModel(Object resolved) {
-        modelResolver.addModel(resolved);
-    }
-
-    public Object removeModel(Object resolved) {
-        return modelResolver.removeModel(resolved);
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        return modelResolver.resolveModel(modelClass, unresolved);
-    }
-}
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
deleted file mode 100644
index 7812c25c1c..0000000000
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ /dev/null
@@ -1,168 +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.java.impl;
-
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-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.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Artifact Processor for Java Imports
- * 
- * @version $Rev$ $Date$
- */
-public class JavaImportProcessor  implements StAXArtifactProcessor<JavaImport> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    
-    private static final QName IMPORT_JAVA = new QName(SCA10_NS, "import.java");
-
-    private static final String PACKAGE = "package";
-    private static final String LOCATION = "location";
-    
-    private final JavaImportExportFactory factory;
-    private final Monitor monitor;
-    
-    public JavaImportProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super();
-        this.factory = modelFactories.getFactory(JavaImportExportFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-     
-     /**
-      * Report a exception.
-      * 
-      * @param problems
-      * @param message
-      * @param model
-      */
-     private void error(String message, Object model, Exception ex) {
-         if (monitor != null) {
-             Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, ex);
-             monitor.problem(problem);
-         }
-     }
-    
-    public QName getArtifactType() {
-        return IMPORT_JAVA;
-    }
-    
-    public Class<JavaImport> getModelType() {
-        return JavaImport.class;
-    }
-
-    /**
-     * Process <import.java package="" location=""/>
-     */
-    public JavaImport read(XMLStreamReader reader) throws ContributionReadException {
-        JavaImport javaImport = this.factory.createJavaImport();
-        QName element = null;
-        
-        try {
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-                    case START_ELEMENT:
-                        element = reader.getName();
-    
-                        // Read <import.java>
-                        if (IMPORT_JAVA.equals(element)) {
-                            String packageName = reader.getAttributeValue(null, PACKAGE);
-                            if (packageName == null) {
-                            	error("AttributePackageMissing", reader);
-                                //throw new ContributionReadException("Attribute 'package' is missing");
-                            } else
-                            	javaImport.setPackage(packageName);
-                            
-                            String location = reader.getAttributeValue(null, LOCATION);                        
-                            javaImport.setLocation(location);
-                        }
-                        break;
-                    case XMLStreamConstants.END_ELEMENT:
-                        if (IMPORT_JAVA.equals(reader.getName())) {
-                            return javaImport;
-                        }
-                        break;        
-                }
-                
-                // Read the next element
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error("XMLStreamException", reader, ex);
-        }
-        
-        return javaImport;
-    }
-
-    public void write(JavaImport javaImport, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <import.java>
-        writer.writeStartElement(IMPORT_JAVA.getNamespaceURI(), IMPORT_JAVA.getLocalPart());
-        
-        if (javaImport.getPackage() != null) {
-            writer.writeAttribute(PACKAGE, javaImport.getPackage());
-        }
-        if (javaImport.getLocation() != null) {
-            writer.writeAttribute(LOCATION, javaImport.getLocation());
-        }
-        
-        writer.writeEndElement();
-    }
-
-
-    public void resolve(JavaImport model, ModelResolver resolver) throws ContributionResolveException {
-        
-    }
-}
diff --git a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
deleted file mode 100644
index a293330a57..0000000000
--- a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.java.impl.JavaImportExportFactoryImpl

diff --git a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index ac1fa9aade..0000000000
--- a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-org.apache.tuscany.sca.contribution.java.impl.JavaImportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
-org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#export.java,model=org.apache.tuscany.sca.contribution.java.JavaExport
diff --git a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index c69eb40636..0000000000
--- a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.java.impl.ClassReferenceModelResolver;model=org.apache.tuscany.sca.contribution.resolver.ClassReference

diff --git a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
deleted file mode 100644
index 7debb3d3c6..0000000000
--- a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.java.impl.JavaImportExportListener

diff --git a/java/sca/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties b/java/sca/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
deleted file mode 100644
index 09fc3e9fff..0000000000
--- a/java/sca/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-AttributePackageMissing = Attribute 'package' is missing
-XMLStreamException = XMLStreamException occured due to : {0}
-
diff --git a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java b/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
deleted file mode 100644
index 1405ad4bd5..0000000000
--- a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.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.java.impl;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.resolver.ClassReference;

-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;

-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-

-/**

- * Test ClassReferenceArtifactResolver.

- *

- * @version $Rev: 560435 $ $Date: 2007-07-27 18:26:55 -0700 (Fri, 27 Jul 2007) $

- */

-public class ClassReferenceArtifactResolverTestCase extends TestCase {

-    private ExtensibleModelResolver resolver;

-    

-    @Override

-    protected void setUp() throws Exception {

-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        

-        ModelResolverExtensionPoint resolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);

-        resolvers.addResolver(ClassReference.class, ClassReferenceModelResolver.class);

-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);

-        resolver = new ExtensibleModelResolver(null, resolvers, modelFactories);

-    }

-    

-    /**

-     * Test ClassReference resolution

-     * 

-     */

-    public void testResolveClass() {

-        ClassReference ref = new ClassReference(getClass().getName());

-        ClassReference clazz = resolver.resolveModel(ClassReference.class, ref);

-        assertFalse(clazz.isUnresolved());

-        assertTrue(clazz.getJavaClass() == getClass());

-    }

-    

-    /**

-     * Test ClassReference resolution of inexistent class

-     *

-     */

-    public void testUnresolvedClass() {

-        ClassReference ref = new ClassReference("NonExistentClass");

-        ClassReference clazz = resolver.resolveModel(ClassReference.class, ref);

-        assertTrue(clazz.isUnresolved());

-        assertTrue(clazz.getJavaClass() == null);

-    }

-}

diff --git a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
deleted file mode 100644
index 3ae161642d..0000000000
--- a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
+++ /dev/null
@@ -1,262 +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.java.impl;

-

-import java.io.File;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.util.ArrayList;

-

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.ContributionFactory;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.java.JavaExport;

-import org.apache.tuscany.sca.contribution.java.JavaImport;

-import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;

-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-

-/**

- * Test ContributionClassLoader.

- *

- */

-public class ContributionClassLoaderTestCase  {

-    

-    private ContributionFactory contributionFactory;

-    private JavaImportExportFactory javaImportExportFactory;

-    

-    @Before

-    public void setUp() throws Exception {

-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);

-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);

-        javaImportExportFactory = modelFactories.getFactory(JavaImportExportFactory.class);

-    }

-    

-    private Contribution createContribution(String fileName) throws MalformedURLException {

-        Contribution contrib = contributionFactory.createContribution();

-        File contribDir = new File(fileName);        

-        contrib.setLocation(contribDir.toURI().toURL().toString());

-        ClassLoader contextClassLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {

-            public ClassLoader run() {

-                return Thread.currentThread().getContextClassLoader();

-            }

-        });           

-        contrib.setClassLoader(new ContributionClassLoader(contrib, contextClassLoader));

-        return contrib;

-    }

-    

-   

-    @Test

-    public void testClassLoadingFromContribution() throws ClassNotFoundException, MalformedURLException {

-        

-        Contribution contribA = createContribution("target/test-classes");

-        Contribution contribB = createContribution("target");

-        Contribution contribC = createContribution("target/test-classes/deployables/sample-calculator.jar");

-        

-        // Class present in contribution, also in parent. Class is loaded from parent

-        Class<?> testClassA = contribA.getClassLoader().loadClass(this.getClass().getName());        

-        Assert.assertNotNull(testClassA);

-        Assert.assertSame(this.getClass(), testClassA);

-        

-        // Class not present in contribution, but present in parent ClassLoader

-        Class<?> testClassB = contribB.getClassLoader().loadClass(this.getClass().getName());

-        Assert.assertNotNull(testClassB);

-        Assert.assertSame(this.getClass(), testClassB);

-        

-        // Class present in contribution, but not in parent

-        Class<?> testClassC = contribC.getClassLoader().loadClass("calculator.AddService");        

-        Assert.assertNotNull(testClassC);

-        

-        // Class not present in contribution or in parent

-        try {

-            contribA.getClassLoader().loadClass("NonExistent");

-            

-            Assert.assertTrue("ClassNotFoundException not thrown as expected", false);

-            

-        } catch (ClassNotFoundException e) {

-        }

-        

-        

-        

-    }

-    

-    @Test

-    public void testResourceLoadingFromContribution() throws ClassNotFoundException, MalformedURLException {

-        

-        Contribution contribA = createContribution("target/test-classes");

-        Contribution contribB = createContribution("target");

-        Contribution contribC = createContribution("target/test-classes/deployables/sample-calculator.jar");

-        

-        // Resource present in contribution, and in parent

-        URL resA = contribA.getClassLoader().getResource("deployables/sample-calculator.jar");

-        Assert.assertNotNull(resA);

-        

-        // Resource not present in contribution, but present in parent ClassLoader

-        URL resB = contribB.getClassLoader().getResource("deployables/sample-calculator.jar");

-        Assert.assertNotNull(resB);

-        

-        // Resource present in contribution, but not in parent

-        URL resC = contribC.getClassLoader().getResource("calculator/AddService.class");

-        Assert.assertNotNull(resC);        

-        

-        // Load Java class as resource from parent

-        String classResName = this.getClass().getName().replaceAll("\\.", "/") + ".class";

-        URL classResA = contribA.getClassLoader().getResource(classResName);

-        Assert.assertNotNull(classResA);

-               

-        // Non-existent resource

-        URL res = contribA.getClassLoader().getResource("deployables/NonExistent");

-        Assert.assertNull(res);

-        

-    }

-    

-    private static String getPackageName(Class<?> cls) {

-        String name = cls.getName();

-        int index = name.lastIndexOf('.');

-        return index == -1 ? "" : name.substring(0, index);

-    }

-

-    @Test

-    public void testClassLoadingFromImportedContribution() throws ClassNotFoundException, MalformedURLException {

-        

-        Contribution contribA = createContribution("target/test-classes");

-        Contribution contribB = createContribution("target");

-        Contribution contribC = createContribution("target/test-classes/deployables/sample-calculator.jar");

-        ArrayList<Contribution> exportContribList = new ArrayList<Contribution>();

-        exportContribList.add(contribA);

-        exportContribList.add(contribC);

-        

-        JavaImport import_ = javaImportExportFactory.createJavaImport();

-        import_.setPackage(getPackageName(getClass()));

-        import_.setModelResolver(new JavaImportModelResolver(exportContribList, null));

-        contribB.getImports().add(import_);

-        import_ = javaImportExportFactory.createJavaImport();

-        import_.setPackage("calculator");

-        import_.setModelResolver(new JavaImportModelResolver(exportContribList, null));

-        contribB.getImports().add(import_);

-        

-        JavaExport export = javaImportExportFactory.createJavaExport();

-        export.setPackage(getPackageName(getClass()));

-        contribA.getExports().add(export);

-        export = javaImportExportFactory.createJavaExport();

-        export.setPackage("calculator");

-        contribC.getExports().add(export);        

-        

-        // Load class from parent, class is also present in imported contribution. Class should

-        // be loaded from parent

-        Class<?> testClassB = contribB.getClassLoader().loadClass(this.getClass().getName());        

-        Assert.assertNotNull(testClassB);

-        Assert.assertSame(this.getClass(), testClassB);

-        

-        // Load class from parent, class is also present in parent. Class should be loaded

-        // from parent.

-        Class<?> testClassA = contribA.getClassLoader().loadClass(this.getClass().getName());        

-        Assert.assertNotNull(testClassA);

-        Assert.assertSame(this.getClass(), testClassA);

-        

-        // Imported class should be the same as the one loaded by the exporting contribution

-        Assert.assertSame(testClassA, testClassB);

-        

-        // Load class from imported contribution, class is not present in parent

-        Class<?> testClassB1 = contribB.getClassLoader().loadClass("calculator.AddService");

-        Assert.assertNotNull(testClassB1);

-        

-        // Imported class should be the same as the one loaded by the exporting contribution

-        Class<?> testClassC = contribC.getClassLoader().loadClass("calculator.AddService");

-        Assert.assertNotNull(testClassC);        

-        Assert.assertSame(testClassC, testClassB1);

-        

-

-        // Try to load class from package which is not explicitly imported - should throw ClassNotFoundException

-        try {

-            contribA.getClassLoader().loadClass("calculator.AddService");

-            

-            Assert.assertTrue("ClassNotFoundException not thrown as expected", false);

-            

-        } catch (ClassNotFoundException e) {

-        }

-        

-        // Try to load non-existent class from imported package - should throw ClassNotFoundException

-        try {

-            contribB.getClassLoader().loadClass(getPackageName(getClass()) + ".NonExistentClass");

-            

-            Assert.assertTrue("ClassNotFoundException not thrown as expected", false);

-            

-        } catch (ClassNotFoundException e) {

-        }

-        

-    }

-

-    @Test

-    public void testResourceLoadingFromImportedContribution() throws ClassNotFoundException, MalformedURLException {

-        

-        Contribution contribA = createContribution("target/test-classes");

-        Contribution contribB = createContribution("target");

-        Contribution contribC = createContribution("target/test-classes/deployables/sample-calculator.jar");

-        

-        ArrayList<Contribution> exportContribList = new ArrayList<Contribution>();

-        exportContribList.add(contribA);

-        exportContribList.add(contribC);

-        

-        JavaImport import_ = javaImportExportFactory.createJavaImport();

-        import_.setPackage(getPackageName(getClass()));

-        import_.setModelResolver(new JavaImportModelResolver(exportContribList, null));

-        contribB.getImports().add(import_);

-        JavaImport import1_ = javaImportExportFactory.createJavaImport();

-        import1_.setPackage("calculator");

-        import1_.setModelResolver(new JavaImportModelResolver(exportContribList, null));

-        contribB.getImports().add(import1_);

-        

-        JavaExport export = javaImportExportFactory.createJavaExport();

-        export.setPackage(getPackageName(getClass()));

-        contribA.getExports().add(export);

-        JavaExport export1 = javaImportExportFactory.createJavaExport();

-        export1.setPackage("calculator");

-        contribC.getExports().add(export1);

-

-        

-        // Load resource from parent

-        URL resB = contribB.getClassLoader().getResource("deployables/sample-calculator.jar"); 

-        Assert.assertNotNull(resB);

-        

-        // Load Java class as resource from imported contribution with JavaImport

-        String classResName = this.getClass().getName().replaceAll("\\.", "/") + ".class";               

-        URL classResB = contribB.getClassLoader().getResource(classResName);

-        Assert.assertNotNull(classResB);

-        

-        // Load Java class as resource from imported contribution with JavaImport

-        URL classResB1 = contribB.getClassLoader().getResource("calculator/AddService.class");

-        Assert.assertNotNull(classResB1);

-        

-        // Try to load resource not explicitly imported by contribution

-        URL classResA1 = contribA.getClassLoader().getResource("calculator/AddService.class");

-        Assert.assertNull(classResA1);

-        

-        

-    }

-

-}

diff --git a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
deleted file mode 100644
index 0ec5bfba39..0000000000
--- a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ /dev/null
@@ -1,103 +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.java.impl;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * Test JavaExportProcessorTestCase
- * 
- * @version $Rev$ $Date$
- */
-public class JavaExportProcessorTestCase extends TestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export.java  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export.java  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"/>";
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        if (monitorFactory != null) {
-        	monitor = monitorFactory.createMonitor();
-        	utilities.addUtility(monitorFactory);
-        }
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-    }
-
-    /**
-     * Test loading a valid export element from a contribution metadata stream
-     * @throws Exception
-     */
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        JavaExport javaExport = (JavaExport)staxProcessor.read(reader);
-        assertEquals("org.apache.tuscany.sca.contribution.java", javaExport.getPackage());
-    }
-
-    /**
-     * Test loading an INVALID export element from a contribution metadata stream
-     * @throws Exception
-     */
-    public void testLoadInvalid() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(INVALID_XML));
-        /*try {
-            staxProcessor.read(reader);
-            fail("readerException should have been thrown");
-        } catch (ContributionReadException e) {
-            assertTrue(true);
-        }*/
-        staxProcessor.read(reader);
-        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributePackageMissing", problem.getMessageId());
-    }    
-}
diff --git a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
deleted file mode 100644
index 9e43b744cf..0000000000
--- a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ /dev/null
@@ -1,105 +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.java.impl;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * Test JavaImportProcessorTestCase
- * 
- * @version $Rev$ $Date$
- */
-public class JavaImportProcessorTestCase extends TestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import.java  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\" location=\"sca://contributions/001\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import.java  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        if (monitorFactory != null) {
-        	monitor = monitorFactory.createMonitor();
-        	utilities.addUtility(monitorFactory);
-        }
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-    }
-
-    /**
-     * Test loading a valid import element from a contribution metadata stream
-     * @throws Exception
-     */
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        JavaImport javaImport = (JavaImport)staxProcessor.read(reader);
-        
-        assertEquals("org.apache.tuscany.sca.contribution.java", javaImport.getPackage());
-        assertEquals("sca://contributions/001", javaImport.getLocation());
-    }
-
-    /**
-     * Test loading a INVALID import element from a contribution metadata stream
-     * @throws Exception
-     */
-    public void testLoadInvalid() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(INVALID_XML));
-        /*try {
-            staxProcessor.read(reader);
-            fail("readerException should have been thrown");
-        } catch (ContributionReadException e) {
-            assertTrue(true);
-        }*/
-        staxProcessor.read(reader);
-        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributePackageMissing", problem.getMessageId());
-    }    
-}
diff --git a/java/sca/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar b/java/sca/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/java/sca/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
+++ /dev/null