Official Tuscany 2.0.1 Release

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

21 files changed, 0 insertions, 1401 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/LICENSE b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/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/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/META-INF/MANIFEST.MF
deleted file mode 100644
index 26b3f66cd0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.contribution.resource

-SCA-Version: 1.1

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

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bundle-ManifestVersion: 2

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

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

-Import-Package: javax.xml.namespace,

- javax.xml.parsers,

- javax.xml.stream,

- javax.xml.stream.events,

- javax.xml.stream.util,

- javax.xml.transform,

- javax.xml.transform.sax,

- javax.xml.transform.stream,

- javax.xml.validation,

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

- org.apache.tuscany.sca.assembly.impl,

- org.apache.tuscany.sca.assembly.xsd;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.common.java.io;version="2.0.0",

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

- org.apache.tuscany.sca.common.xml.stax;version="2.0.0",

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

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

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

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

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

- org.w3c.dom,

- org.w3c.dom.ls,

- org.xml.sax,

- org.xml.sax.helpers

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

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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/NOTICE b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/pom.xml
deleted file mode 100644
index d5e04d28a6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/pom.xml
+++ /dev/null
@@ -1,45 +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.1</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution-resource</artifactId>
-    <name>Apache Tuscany SCA Resource Import/Export Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
deleted file mode 100644
index 8165b54fec..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.contribution.resource;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.Export;
-
-
-/**
- * The representation of an resource export.
- *
- * @version $Rev$ $Date$
- */
-public interface ResourceExport extends Export {
-	QName TYPE = new QName(SCA11_TUSCANY_NS, "export.resource");
-
-    /**
-     * Get Resource URI that identifies the export.
-     *
-     * @return The exported resource URI
-     */
-    String getURI();
-
-    /**
-     * Set Resource URI that identifies the export.
-     *
-     * @param uri The exported resource URI
-     */
-    void setURI(String uri);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
deleted file mode 100644
index 3bba948c82..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.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.resource;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.Import;
-
-/**
- * The representation of an resource import.
- *
- * @version $Rev$ $Date$
- */
-public interface ResourceImport extends Import {
-	QName TYPE = new QName(SCA11_TUSCANY_NS, "import.resource");
-
-    /**
-     * 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 URI that identifies the resource import
-     *
-     * @return The URI
-     */
-    String getURI();
-
-    /**
-     * Set URI that identifies the resource import
-     *
-     * @param uri The resource URI
-     */
-    void setURI(String uri);
-
-}
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
deleted file mode 100644
index 4119c344ce..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.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.resource;
-
-/**
- * Base Resource import/export model factory
- * 
- * @version $Rev$ $Date$
- */
-public interface ResourceImportExportFactory {
-
-    /**
-     * Create a resource import model object
-     * 
-     * @return The new ResourceImport model object
-     */
-    ResourceImport createResourceImport();
-    
-    /**
-     * Create a resource export model object
-     * 
-     * @return The new ResourceExport model object
-     */
-    ResourceExport createResourceExport();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
deleted file mode 100644
index 3dcdfd3dff..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
+++ /dev/null
@@ -1,88 +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.resource.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-
-/**
- * A Model Resolver for contribution artifacts.
- *
- * @version $Rev$ $Date$
- */
-public class ArtifactModelResolver implements ModelResolver {
-    private Contribution contribution;
-    private Map<String, Artifact> map = new HashMap<String, Artifact>();
-
-    public ArtifactModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) {
-    	this.contribution = contribution;
-    }
-
-    public void addModel(Object resolved,  ProcessorContext context) {
-    	Artifact artifact = (Artifact)resolved;
-    	map.put(artifact.getURI(), artifact);
-    }
-
-    public Object removeModel(Object resolved,  ProcessorContext context) {
-    	return map.remove(((Artifact)resolved).getURI());
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved,  ProcessorContext context) {
-
-    	// Get the artifact URI
-        String uri = ((Artifact)unresolved).getURI();
-        if (uri == null) {
-        	return (T)unresolved;
-        }
-
-        // Lookup the artifact
-        Artifact resolved = (Artifact) map.get(uri);
-        if (resolved != null) {
-            return modelClass.cast(resolved);
-        }
-
-        // If not found, delegate the resolution to the imports (in this case based on the resource imports)
-        for (Import import_ : this.contribution.getImports()) {
-            if (import_ instanceof ResourceImport) {
-            	ResourceImport resourceImport = (ResourceImport)import_;
-            	//check the import location against the computed package name from the componentType URI
-                if ((resourceImport.getURI().equals(uri)) &&
-                    (resourceImport.getModelResolver() != null)){
-                    // Delegate the resolution to the import resolver
-                    resolved = resourceImport.getModelResolver().resolveModel(Artifact.class, (Artifact)unresolved, context);
-                    if (!resolved.isUnresolved()) {
-                        return modelClass.cast(resolved);
-                    }
-                }
-            }
-        }
-
-        return (T)unresolved;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
deleted file mode 100644
index 50ba5bcd6f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.contribution.resource.impl;
-
-import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-
-/**
- * The representation of an export for the contribution
- *
- * @version $Rev$ $Date$
- */
-public class ResourceExportImpl extends ExtensibleImpl implements ResourceExport {
-    /**
-     * The resource URI to be exported
-     */
-    private String uri;
-
-    private ModelResolver modelResolver;
-
-    protected ResourceExportImpl() {
-        super();
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
deleted file mode 100644
index 96ee55ed45..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.contribution.resource.impl;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-
-/**
- * A model resolver for resource exports.
- *
- * @version $Rev$ $Date$
- */
-public class ResourceExportModelResolver implements ModelResolver {
-
-    private ResourceExport export;
-    private ModelResolver resolver;
-
-    public ResourceExportModelResolver(ResourceExport export, ModelResolver resolver) {
-        this.export = export;
-        this.resolver = resolver;
-    }
-
-    public void addModel(Object resolved, ProcessorContext context) {
-        throw new IllegalStateException();
-    }
-
-    public Object removeModel(Object resolved, ProcessorContext context) {
-        throw new IllegalStateException();
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved, ProcessorContext context) {
-
-        // Filter based on the artifact URI
-        Artifact artifact = (Artifact)unresolved;
-        if (export.getURI().equals(artifact.getURI())) {
-
-            // The artifact URI matches the exported URI, delegate to the
-            // contribution's resolver
-            return resolver.resolveModel(modelClass, unresolved, context);
-        } else {
-
-            // The artifact URI is not exported, return the unresolved object
-            return unresolved;
-        }
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
deleted file mode 100644
index 215338c7ce..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
+++ /dev/null
@@ -1,145 +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.resource.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.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-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 Resource export
- *
- * @version $Rev$ $Date$
- */
-public class ResourceExportProcessor implements StAXArtifactProcessor<ResourceExport> {
-
-    private static final String URI = "uri";
-
-    private final ResourceImportExportFactory factory;
-
-    public ResourceExportProcessor(FactoryExtensionPoint modelFactories) {
-        this.factory = modelFactories.getFactory(ResourceImportExportFactory.class);
-    }
-
-
-    /**
-     * Report a error.
-     *
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(Monitor monitor, String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-resource-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-
-    public QName getArtifactType() {
-        return ResourceExport.TYPE;
-    }
-
-    public Class<ResourceExport> getModelType() {
-        return ResourceExport.class;
-    }
-
-    /**
-     * Process <export.resource uri=""/>
-     */
-    public ResourceExport read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException {
-    	ResourceExport resourceExport = this.factory.createResourceExport();
-        QName element = null;
-
-        try {
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-                    case START_ELEMENT:
-                        element = reader.getName();
-
-                        // Read <export.resource>
-                        if (ResourceExport.TYPE.equals(element)) {
-                            String uri = reader.getAttributeValue(null, URI);
-                            if (uri == null) {
-                            	error(context.getMonitor(), "AttributeURIMissing", reader);
-                                //throw new ContributionReadException("Attribute 'uri' is missing");
-                            } else
-                                resourceExport.setURI(uri);
-                        }
-
-                        break;
-                    case XMLStreamConstants.END_ELEMENT:
-                        if (ResourceExport.TYPE.equals(reader.getName())) {
-                            return resourceExport;
-                        }
-                        break;
-                }
-
-                // Read the next element
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error(context.getMonitor(), "XMLStreamException", reader, ex);
-        }
-
-        return resourceExport;
-    }
-
-    public void write(ResourceExport resourceExport, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
-
-        // Write <export.resource>
-        writer.writeStartElement(ResourceExport.TYPE.getNamespaceURI(), ResourceExport.TYPE.getLocalPart());
-
-        if (resourceExport.getURI() != null) {
-            writer.writeAttribute(URI, resourceExport.getURI());
-        }
-
-        writer.writeEndElement();
-    }
-
-    public void resolve(ResourceExport resourceExport, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
-
-        if (resourceExport.getURI() != null)
-            // Initialize the export's model resolver
-            resourceExport.setModelResolver(new ResourceExportModelResolver(resourceExport, resolver));
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
deleted file mode 100644
index 880f5f5786..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.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.resource.impl;
-
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory;
-
-/**
- * Resource Import/Export model factory implementation
- * 
- * @version $Rev$ $Date$
- */
-public class ResourceImportExportFactoryImpl implements ResourceImportExportFactory {
-
-    public ResourceImport createResourceImport() {
-        return new ResourceImportImpl();
-    }
-    
-    public ResourceExport createResourceExport() {
-        return new ResourceExportImpl();
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
deleted file mode 100644
index 6a862a2f04..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
+++ /dev/null
@@ -1,107 +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.resource.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-
-/**
- * The representation of an import for the contribution
- *
- * @version $Rev$ $Date$
- */
-public class ResourceImportImpl extends ExtensibleImpl implements ResourceImport {
-    /**
-     * The resource URI to be imported
-     */
-    private String uri;
-
-    private ModelResolver modelResolver;
-    private List<Contribution> exportContributions;
-
-    /**
-     * Optional location URI pointing to a Contribution that exports the resource
-     */
-    private String location;
-
-    protected ResourceImportImpl() {
-        super();
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-
-    public List<Contribution> getExportContributions() {
-        return exportContributions;
-    }
-
-    public void setExportContributions(List<Contribution> contributions) {
-        this.exportContributions = contributions;
-    }
-
-    /**
-     * Match a ResourceImport to a given ResourceExport based on :
-     *    location is not provided
-     *    import and export resource URI match
-     */
-    public boolean match(Export export) {
-        if (export instanceof ResourceExport) {
-            if (this.getLocation() == null || this.getLocation().length() == 0) {
-                if (this.getURI().equals(((ResourceExport)export).getURI())) {
-                    return true;
-                }
-            }
-
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(uri);
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
deleted file mode 100644
index 7e341f60fd..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
+++ /dev/null
@@ -1,148 +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.resource.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.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-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 Namespace import
- *
- * @version $Rev$ $Date$
- */
-public class ResourceImportProcessor  implements StAXArtifactProcessor<ResourceImport> {
-    private static final String URI = "uri";
-    private static final String LOCATION = "location";
-
-    private final ResourceImportExportFactory factory;
-
-    public ResourceImportProcessor(FactoryExtensionPoint modelFactories) {
-        this.factory = modelFactories.getFactory(ResourceImportExportFactory.class);
-    }
-
-    /**
-     * Report a error.
-     *
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(Monitor monitor, String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-resource-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-
-    public QName getArtifactType() {
-        return ResourceImport.TYPE;
-    }
-
-    public Class<ResourceImport> getModelType() {
-        return ResourceImport.class;
-    }
-
-    /**
-     * Process <import.resource uri="" location=""/>
-     */
-    public ResourceImport read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException {
-    	ResourceImport resourceImport = this.factory.createResourceImport();
-        QName element;
-
-        try {
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-                    case START_ELEMENT:
-                        element = reader.getName();
-
-                        // Read <import>
-                        if (ResourceImport.TYPE.equals(element)) {
-                            String uri = reader.getAttributeValue(null, URI);
-                            if (uri == null) {
-                            	error(context.getMonitor(), "AttributeURIMissing", reader);
-                                //throw new ContributionReadException("Attribute 'uri' is missing");
-                            } else
-                                resourceImport.setURI(uri);
-
-                            String location = reader.getAttributeValue(null, LOCATION);
-                            if (location != null) {
-                                resourceImport.setLocation(location);
-                            }
-                        }
-                        break;
-                    case XMLStreamConstants.END_ELEMENT:
-                        if (ResourceImport.TYPE.equals(reader.getName())) {
-                            return resourceImport;
-                        }
-                        break;
-                }
-
-                // Read the next element
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error(context.getMonitor(), "XMLStreamException", reader, ex);
-        }
-
-        return resourceImport;
-    }
-
-    public void write(ResourceImport resourceImport, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
-
-        // Write <import>
-        writer.writeStartElement(ResourceImport.TYPE.getNamespaceURI(), ResourceImport.TYPE.getLocalPart());
-
-        if (resourceImport.getURI() != null) {
-            writer.writeAttribute(URI, resourceImport.getURI());
-        }
-        if (resourceImport.getLocation() != null) {
-            writer.writeAttribute(LOCATION, resourceImport.getLocation());
-        }
-
-        writer.writeEndElement();
-    }
-
-
-    public void resolve(ResourceImport model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index fba50cd9b4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/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.resource.impl.ResourceImportProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#import.resource,model=org.apache.tuscany.sca.contribution.resource.ResourceImport
-org.apache.tuscany.sca.contribution.resource.impl.ResourceExportProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#export.resource,model=org.apache.tuscany.sca.contribution.resource.ResourceExport
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 08d2b1c338..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/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.resource.impl.ArtifactModelResolver;model=org.apache.tuscany.sca.contribution.Artifact
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
deleted file mode 100644
index d39a5065c2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
+++ /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.resource.impl.ResourceImportExportFactoryImpl

diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
deleted file mode 100644
index f4751db9aa..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/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.resource.impl.ResourceImportExportListener

diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
deleted file mode 100644
index a012c05783..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/main/resources/contribution-resource-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.
-#
-#
-AttributeURIMissing = Attribute ''uri'' is missing
-XMLStreamException = XMLStreamException occured due to : {0}
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
deleted file mode 100644
index 98bd460add..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
+++ /dev/null
@@ -1,102 +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.resource.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test NamespaceExportProcessorTestCase
- *
- * @version $Rev$ $Date$
- */
-public class ResourceExportProcessorTestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>"
-            + "<export.resource xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\" xmlns:ns=\"http://ns\" uri=\"helloworld/HelloWorldService.componentType\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>"
-            + "<export.resource xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\" xmlns:ns=\"http://ns\"/>";
-
-    private static XMLInputFactory inputFactory;
-    private static StAXArtifactProcessor<Object> staxProcessor;
-    private static Monitor monitor;
-    private static ProcessorContext context;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        context = new ProcessorContext(extensionPoints);
-        monitor = context.getMonitor();
-        inputFactory = XMLInputFactory.newInstance();
-
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null);
-    }
-
-    /**
-     * Test loading a valid export element from a contribution metadata stream
-     * @throws Exception
-     */
-    @Test
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        ResourceExport resourceExport = (ResourceExport)staxProcessor.read(reader, context);
-        assertEquals("helloworld/HelloWorldService.componentType", resourceExport.getURI());
-    }
-
-    /**
-     * Test loading an INVALID export element from a contribution metadata stream
-     * @throws Exception
-     */
-    @Test
-    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, context);
-        Problem problem = monitor.getLastProblem();
-        assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
deleted file mode 100644
index 4cff032ba2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
+++ /dev/null
@@ -1,104 +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.resource.impl;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test NamespaceImportProcessorTestCase
- *
- * @version $Rev$ $Date$
- */
-public class ResourceImportProcessorTestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>"
-            + "<import.resource xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\" xmlns:ns=\"http://ns\" uri=\"helloworld/HelloWorldService.componentType\" location=\"sca://contributions/001\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>"
-            + "<import.resource xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
-
-    private static XMLInputFactory inputFactory;
-    private static StAXArtifactProcessor<Object> staxProcessor;
-    private static Monitor monitor;
-    private static ProcessorContext context;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-    	ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        context = new ProcessorContext(extensionPoints);
-        monitor = context.getMonitor();
-        inputFactory = XMLInputFactory.newInstance();
-
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null);
-    }
-
-    /**
-     * Test loading a valid import element from a contribution metadata stream
-     * @throws Exception
-     */
-    @Test
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        ResourceImport namespaceImport = (ResourceImport)staxProcessor.read(reader, context);
-        assertEquals("helloworld/HelloWorldService.componentType", namespaceImport.getURI());
-        assertEquals("sca://contributions/001", namespaceImport.getLocation());
-    }
-
-    /**
-     * Test loading a INVALID import element from a contribution metadata stream
-     * @throws Exception
-     */
-    @Test
-    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, context);
-        Problem problem = monitor.getLastProblem();
-        assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
-    }
-}