Correct tag name

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

17 files changed, 0 insertions, 2510 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/LICENSE b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/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-1.x/tags/1.6.1-TUSCANY-3909/node-impl/NOTICE b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/NOTICE
deleted file mode 100644
index ad2ba40961..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/pom.xml b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/pom.xml
deleted file mode 100644
index fa7dec8bf3..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/pom.xml
+++ /dev/null
@@ -1,154 +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>1.6</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-node-impl</artifactId>
-    <name>Apache Tuscany SCA Node Implementation</name>
-
-    <dependencies>
- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.6</version>
-        </dependency>
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.6</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.6</version>
-        </dependency>          
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.6</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.6</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6</version>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.6</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.6</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.6</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.6</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.6</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>1.6</version>
-            <scope>runtime</scope>
-        </dependency> 
-               
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6</version>
-            <scope>test</scope>
-        </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.node.impl</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.node.impl*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
deleted file mode 100644
index 419900c5ac..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
+++ /dev/null
@@ -1,57 +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.node.impl;
-
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-
-/**
- * Default implementation of an SCA node factory.
- * 
- * @version $Rev$ $Date$
- * @deprecated
- */
-@Deprecated
-public class Node2FactoryImpl extends SCANode2Factory {
-    public Node2FactoryImpl() {
-    }
-    
-    @Override
-    public SCANode2 createSCANodeFromClassLoader(String compositeURI, ClassLoader classLoader) {
-        return new Node2Impl(classLoader, compositeURI);
-    }
-
-    @Override
-    public SCANode2 createSCANodeFromURL(String configurationURI) {
-        return new Node2Impl(configurationURI);
-    }
-    
-    @Override
-    public SCANode2 createSCANode(String compositeURI, SCAContribution... contributions) {
-        return new Node2Impl(compositeURI, contributions);
-    }
-
-    @Override
-    public SCANode2 createSCANode(String compositeURI, String compositeContent, SCAContribution... contributions) {
-        return new Node2Impl(compositeURI, compositeContent, contributions);
-    }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
deleted file mode 100644
index bc2f10fb7e..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.node.impl;
-
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-
-/**
- * Node2 Impl
- */
-public class Node2Impl extends NodeImpl implements SCANode2 {
-
-    /**
-     * @param configurationURI
-     */
-    public Node2Impl(String configurationURI) {
-        super(configurationURI);
-        // TODO Auto-generated constructor stub
-    }
-
-    /**
-     * @param classLoader
-     * @param compositeURI
-     */
-    public Node2Impl(ClassLoader classLoader, String compositeURI) {
-        super(classLoader, compositeURI);
-    }
-
-    /**
-     * @param compositeURI
-     * @param contributions
-     */
-    public Node2Impl(String compositeURI, SCAContribution[] contributions) {
-        super(compositeURI, contributions);
-    }
-
-    /**
-     * @param compositeURI
-     * @param compositeContent
-     * @param contributions
-     */
-    public Node2Impl(String compositeURI, String compositeContent, SCAContribution[] contributions) {
-        super(compositeURI, compositeContent, contributions);
-    }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
deleted file mode 100644
index 7dd7da7f4f..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ /dev/null
@@ -1,60 +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.node.impl;
-
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * Default implementation of an SCA node factory.
- * 
- * @version $Rev$ $Date$
- */
-public class NodeFactoryImpl extends SCANodeFactory {
-    public NodeFactoryImpl() {
-    }
-    
-    @Override
-    public SCANode createSCANodeFromClassLoader(String compositeURI, ClassLoader classLoader) {
-        return new NodeImpl(classLoader, compositeURI);
-    }
-
-    @Override
-    public SCANode createSCANodeFromURL(String configurationURI) {
-        return new NodeImpl(configurationURI);
-    }
-    
-    @Override
-    public SCANode createSCANode(String compositeURI, SCAContribution... contributions) {
-        return new NodeImpl(compositeURI, contributions);
-    }
-
-    @Override
-    public SCANode createSCANode(String compositeURI, String compositeContent, SCAContribution... contributions) {
-        return new NodeImpl(compositeURI, compositeContent, contributions);
-    }
-
-    @Override
-    public SCANode createSCANode() {
-        return new NodeImpl();
-    }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
deleted file mode 100644
index 4a93993560..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ /dev/null
@@ -1,897 +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.node.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;
-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.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.service.util.FileHelper;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.MonitorRuntimeException;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * A local representation of the SCADomain running on a single node
- * 
- * @version $Rev$ $Date$
- */
-public class NodeImpl implements SCANode, SCAClient {
-
-    private static final Logger logger = Logger.getLogger(NodeImpl.class.getName());
-
-    // The node configuration name, used for logging
-    private String configurationName;
-
-    // The Tuscany runtime that does the hard work
-    private RuntimeBootStrapper runtime;
-    private CompositeActivator compositeActivator;
-    private XMLInputFactory inputFactory;
-    private ModelFactoryExtensionPoint modelFactories;
-    private StAXArtifactProcessorExtensionPoint artifactProcessors;
-    private URLArtifactProcessorExtensionPoint documentProcessors;
-    private Monitor monitor;
-
-    private List<Contribution> contributions;
-    // The composite loaded into this node
-    private Composite composite;
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param configurationURI the URI of the node configuration information.
-     */
-    NodeImpl(String configurationURI) {
-        configurationName = configurationURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            initRuntime();
-
-            // Read the node configuration feed
-            StAXArtifactProcessor<ConfiguredNodeImplementation> configurationProcessor =
-                artifactProcessors.getProcessor(ConfiguredNodeImplementation.class);
-            URL configurationURL = new URL(configurationURI);
-            InputStream is = configurationURL.openStream();
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-            reader.nextTag();
-            ConfiguredNodeImplementation configuration = configurationProcessor.read(reader);
-            is.close();
-
-            // Resolve contribution URLs
-            for (Contribution contribution : configuration.getContributions()) {
-                URL contributionURL = new URL(configurationURL, contribution.getLocation());
-                contribution.setLocation(contributionURL.toString());
-            }
-
-            // Resolve composite URL
-            URL compositeURL = new URL(configurationURL, configuration.getComposite().getURI());
-            configuration.getComposite().setURI(compositeURL.toString());
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (ServiceRuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /**
-     * Construct a node by discovering the node configuration on the classpath
-     * @param classLoader
-     * @param compositeURI
-     */
-    NodeImpl() {
-        configurationName = "default";
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            initRuntime();
-
-            ConfiguredNodeImplementation config = findNodeConfiguration(null, null);
-            configureNode(config);
-        } catch (ServiceRuntimeException e) {
-            throw e;
-        } catch (Throwable e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /**
-     * Construct a node by discovering the node configuration (composite+contrbutions) on the classpath
-     * @param classLoader
-     * @param compositeURI
-     */
-    NodeImpl(ClassLoader classLoader, String compositeURI) {
-        configurationName = compositeURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        if (compositeURI != null) {
-            //URI uri = URI.create(compositeURI);
-            URI uri;
-            try {
-                uri = new URI(null, compositeURI, null);
-            } catch (URISyntaxException e) {
-                throw new IllegalArgumentException("Invalid Composite URI: " + compositeURI, e);
-            }
-            
-            if (uri.isAbsolute()) {
-                throw new IllegalArgumentException("Composite URI must be a resource name: " + compositeURI);
-            }
-        }
-        try {
-            // Initialize the runtime
-            initRuntime();
-
-            ConfiguredNodeImplementation config = findNodeConfiguration(compositeURI, classLoader);
-            configureNode(config);
-        } catch (ServiceRuntimeException e) {
-            throw e;
-        } catch (Throwable e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /**
-     * Discover the contribution on the classpath
-     * @param compositeURI
-     * @param classLoader
-     * @return A configured node implementation
-     * @throws Exception
-     */
-    private ConfiguredNodeImplementation findNodeConfiguration(final String compositeURI, ClassLoader classLoader)
-        throws Exception {
-        NodeImplementationFactory nodeImplementationFactory =
-            modelFactories.getFactory(NodeImplementationFactory.class);
-        ConfiguredNodeImplementation config = nodeImplementationFactory.createConfiguredNodeImplementation();
-
-        // Default to thread context classloader
-        if (classLoader == null) {
-            classLoader = Thread.currentThread().getContextClassLoader();
-        }
-        String contributionArtifactPath = compositeURI;
-        URL contributionArtifactURL = null;
-        if (compositeURI != null) {
-            contributionArtifactURL = getResource(classLoader, compositeURI);
-            if (contributionArtifactURL == null) {
-                throw new IllegalArgumentException("Composite not found: " + contributionArtifactPath);
-            }
-            // Set to relative URI to avoid duplicate loading
-            Composite composite = createComposite(compositeURI);
-            config.setComposite(composite);
-        } else {
-            // No composite is specified, tring to search the SCA metadata files
-            contributionArtifactPath = Contribution.SCA_CONTRIBUTION_META;
-            contributionArtifactURL = getResource(classLoader, Contribution.SCA_CONTRIBUTION_META);
-
-            if (contributionArtifactURL == null) {
-                contributionArtifactPath = Contribution.SCA_CONTRIBUTION_GENERATED_META;
-                contributionArtifactURL = getResource(classLoader, Contribution.SCA_CONTRIBUTION_GENERATED_META);
-            }
-            if (contributionArtifactURL == null) {
-                contributionArtifactPath = Contribution.SCA_CONTRIBUTION_DEPLOYABLES;
-                contributionArtifactURL = getResource(classLoader, Contribution.SCA_CONTRIBUTION_DEPLOYABLES);
-            }
-            
-            // No contribution can be discovered
-            if (contributionArtifactURL == null) {
-                throw new IllegalArgumentException("No default contribution can be discovered on the classpath");
-            }
-            
-            // No composite will be created, all deployable composites will be used later
-        }
-
-        Contribution c = getContribution(contributionArtifactURL, contributionArtifactPath);
-        config.getContributions().add(c);
-
-        return config;
-    }
-
-    private Contribution getContribution(URL contributionArtifactURL, String contributionArtifactPath) {
-        URL contributionURL = getContributionURL(contributionArtifactURL, contributionArtifactPath);
-
-        ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-
-        SCAContribution contribution = new SCAContribution(contributionURL.toString(), contributionURL.toString());
-        Contribution c = createContribution(contributionFactory, contribution);
-        return c;
-    }
-
-    public static URL getContributionURL(URL contributionArtifactURL, String contributionArtifactPath) {
-        URL contributionURL = null;
-        // "jar:file://....../something.jar!/a/b/c/app.composite"
-        try {
-            String url = contributionArtifactURL.toExternalForm();
-            String protocol = contributionArtifactURL.getProtocol();
-            String escapedContributionArtifactPath = new URI(null, contributionArtifactPath, null).toASCIIString();
-            
-            if ("file".equals(protocol)) {
-                // directory contribution
-                if (url.endsWith(escapedContributionArtifactPath)) {
-                    final String location = url.substring(0, url.lastIndexOf(escapedContributionArtifactPath));
-                    // workaround from evil URL/URI form Maven
-                    // contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-                    // Allow privileged access to open URL stream. Add FilePermission to added to
-                    // security policy file.
-                    try {
-                        contributionURL = AccessController.doPrivileged(new PrivilegedExceptionAction<URL>() {
-                            public URL run() throws IOException {
-                                return FileHelper.toFile(new URL(location)).toURI().toURL();
-                            }
-                        });
-                    } catch (PrivilegedActionException e) {
-                        throw (MalformedURLException)e.getException();
-                    }
-                }
-
-            } else if ("jar".equals(protocol)) {
-                // jar contribution
-                String location = url.substring(4, url.lastIndexOf("!/"));
-                // workaround for evil URL/URI from Maven
-                contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-
-            } else if ("wsjar".equals(protocol)) {
-                // See https://issues.apache.org/jira/browse/TUSCANY-2219
-                // wsjar contribution 
-                String location = url.substring(6, url.lastIndexOf("!/"));
-                // workaround for evil url/uri from maven 
-                contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-
-            } else if ("zip".equals(protocol)) {
-                // See https://issues.apache.org/jira/browse/TUSCANY-2598
-                // zip contribution, remove the zip prefix and pad with file:
-                String location = "file:"+url.substring(4, url.lastIndexOf("!/"));
-                contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-                
-            } else if (protocol != null && (protocol.equals("bundle") || protocol.equals("bundleresource"))) {
-                contributionURL =
-                    new URL(contributionArtifactURL.getProtocol(), contributionArtifactURL.getHost(),
-                            contributionArtifactURL.getPort(), "/");
-            }
-        } catch (MalformedURLException mfe) {
-            throw new IllegalArgumentException(mfe);
-        } catch (URISyntaxException use) {
-            throw new IllegalArgumentException(use);
-        }
-        return contributionURL;
-    }
-
-    private static URL getResource(final ClassLoader classLoader, final String compositeURI) {
-        return AccessController.doPrivileged(new PrivilegedAction<URL>() {
-            public URL run() {
-                return classLoader.getResource(compositeURI);
-            }
-        });
-    }
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param compositeURI
-     * @param contributions
-     */
-    NodeImpl(String compositeURI, SCAContribution[] contributions) {
-        configurationName = compositeURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            initRuntime();
-
-            URI uri = compositeURI == null ? null : URI.create(compositeURI);
-            ConfiguredNodeImplementation configuration = null;
-            if (contributions == null || contributions.length == 0) {
-                if (uri != null && uri.getScheme() != null) {
-                    throw new IllegalArgumentException("No SCA contributions are provided");
-                }
-                configuration = findNodeConfiguration(compositeURI, null);
-            } else {
-
-                // Create a node configuration
-                NodeImplementationFactory nodeImplementationFactory =
-                    modelFactories.getFactory(NodeImplementationFactory.class);
-                configuration = nodeImplementationFactory.createConfiguredNodeImplementation();
-
-                Composite composite = compositeURI == null ? null : createComposite(compositeURI);
-                configuration.setComposite(composite);
-  
-
-                // Create contribution models
-                ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-                for (SCAContribution c : contributions) {
-                    Contribution contribution = createContribution(contributionFactory, c);
-                    configuration.getContributions().add(contribution);
-                }
-            }
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (ServiceRuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    private Composite createComposite(String compositeURI) {
-        // Create composite model
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        Composite composite = assemblyFactory.createComposite();
-        composite.setURI(compositeURI);
-        composite.setUnresolved(true);
-        return composite;
-    }
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param compositeURI
-     * @param compositeContent
-     * @param contributions
-     */
-    NodeImpl(String compositeURI, String compositeContent, SCAContribution[] contributions) {
-        configurationName = compositeURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            initRuntime();
-
-            ConfiguredNodeImplementation configuration = null;
-            if (contributions == null || contributions.length == 0) {
-                configuration = findNodeConfiguration(compositeURI, null);
-            } else {
-                // Create a node configuration
-                NodeImplementationFactory nodeImplementationFactory =
-                    modelFactories.getFactory(NodeImplementationFactory.class);
-                configuration = nodeImplementationFactory.createConfiguredNodeImplementation();
-
-                // Read the composite model
-                StAXArtifactProcessor<Composite> compositeProcessor = artifactProcessors.getProcessor(Composite.class);
-                // URL compositeURL = new URL(compositeURI);
-                logger.log(Level.INFO, "Loading composite: " + compositeURI);
-
-                CompositeDocumentProcessor compositeDocProcessor =
-                    (CompositeDocumentProcessor)documentProcessors.getProcessor(Composite.class);
-                composite =
-                    compositeDocProcessor.read(URI.create(compositeURI), new ByteArrayInputStream(compositeContent
-                        .getBytes("UTF-8")));
-
-                analyzeProblems();
-
-                configuration.setComposite(composite);
-
-                // Create contribution models
-                ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-                for (SCAContribution c : contributions) {
-                    Contribution contribution = createContribution(contributionFactory, c);
-                    configuration.getContributions().add(contribution);
-                }
-            }
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (ServiceRuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    private static Contribution createContribution(ContributionFactory contributionFactory, SCAContribution c) {
-        Contribution contribution = contributionFactory.createContribution();
-        contribution.setURI(c.getURI());
-        contribution.setLocation(c.getLocation());
-        contribution.setUnresolved(true);
-        return contribution;
-    }
-
-    /**
-     * Initialize the Tuscany runtime.
-     * 
-     * @throws Exception
-     */
-    private void initRuntime() throws Exception {
-
-        // Create a node runtime
-        runtime = new RuntimeBootStrapper(Thread.currentThread().getContextClassLoader());
-        runtime.start();
-
-        // Get the various factories we need
-        ExtensionPointRegistry registry = runtime.getExtensionPointRegistry();
-        modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-
-        // Create the required artifact processors
-        artifactProcessors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
-        documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-
-        // Save the composite activator
-        compositeActivator = runtime.getCompositeActivator();
-
-        // save the monitor
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();
-    }
-
-    /**
-     * Escape the space in URL string
-     * @param uri
-     * @return
-     */
-    private static URI createURI(String uri) {
-        if (uri.indexOf(' ') != -1) {
-            uri = uri.replace(" ", "%20");
-        }
-        return URI.create(uri);
-    }
-
-    private void configureNode(ConfiguredNodeImplementation configuration) throws Exception {
-
-        // Find if any contribution JARs already available locally on the classpath
-        Map<String, URL> localContributions = localContributions();
-
-        // Load the specified contributions
-        ContributionService contributionService = runtime.getContributionService();
-        contributions = new ArrayList<Contribution>();
-        for (Contribution contribution : configuration.getContributions()) {
-            URI uri = createURI(contribution.getLocation());
-            if (uri.getScheme() == null) {
-                uri = new File(contribution.getLocation()).toURI();
-            }
-            URL contributionURL = uri.toURL();
-
-            // Extract contribution file name
-            String file = contributionURL.getPath();
-            int i = file.lastIndexOf('/');
-            if (i != -1 && i < file.length() - 1) {
-                file = file.substring(i + 1);
-
-                // If we find the local contribution file on the classpath, use it in
-                // place of the original contribution URL
-                URL localContributionURL = localContributions.get(file);
-                if (localContributionURL != null) {
-                    contributionURL = localContributionURL;
-                }
-            }
-
-            // Load the contribution
-            logger.log(Level.INFO, "Loading contribution: " + contributionURL);
-            contributions.add(contributionService.contribute(contribution.getURI(), contributionURL, false));
-            analyzeProblems();
-        }
-
-        composite = configuration.getComposite();
-        
-        if(composite != null && composite.isUnresolved()) {
-            ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-            Artifact compositeFile = contributionFactory.createArtifact();
-            compositeFile.setUnresolved(true);
-            compositeFile.setURI(composite.getURI());
-            for (Contribution c : contributions) {
-                ModelResolver resolver = c.getModelResolver();
-                Artifact resolved = resolver.resolveModel(Artifact.class, compositeFile);
-                if (resolved != null && resolved.isUnresolved() == false) {
-                    composite = (Composite) resolved.getModel();
-                    break;
-                }
-            }
-        }
-
-        // FIXME: This is a hack to get a list of deployable composites. By design, the deployment composite should
-        // has been configured
-        if (composite == null) {
-            List<Composite> deployables = new ArrayList<Composite>();
-            for (Contribution c : contributions) {
-                deployables.addAll(c.getDeployables());
-            }
-            aggregate(deployables);
-            configuration.setComposite(composite);
-        }
-
-        Contribution contribution = null;
-        if (composite.getName() == null) {
-            // Load the specified composite
-            URL compositeURL;
-
-            URI uri = createURI(configuration.getComposite().getURI());
-            if (uri.getScheme() == null) {
-
-                // If the composite URI is a relative URI, try to resolve it within the contributions
-                contribution = contribution(contributions, uri.toString());
-                if (contribution == null) {
-                    throw new IllegalArgumentException("Composite is not found in contributions: " + uri);
-                }
-                compositeURL = new URL(location(contribution, uri.toString()));
-
-            } else {
-
-                // If the composite URI is an absolute URI, use it as is
-                compositeURL = uri.toURL();
-            }
-
-            URLArtifactProcessor<Composite> compositeDocProcessor = documentProcessors.getProcessor(Composite.class);
-            // Read the composite
-            logger.log(Level.INFO, "Loading composite: " + compositeURL);
-            // InputStream is = compositeURL.openStream();
-            // XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-            try {
-                composite = compositeDocProcessor.read(null, uri, compositeURL);
-            } catch (ContributionReadException e) {
-                // ignore - errors will be detected by analyzeProblems() call below
-            }
-            // reader.close();
-
-            analyzeProblems();
-
-        }
-        // And resolve the composite within the scope of the last contribution
-        if (contribution == null && contributions.size() != 0) {
-            contribution = contributions.get(contributions.size() - 1);
-        }
-
-        // Resolve the given composite within the scope of the selected contribution
-        if (contribution != null) {
-            StAXArtifactProcessor<Composite> compositeProcessor = artifactProcessors.getProcessor(Composite.class);
-            compositeProcessor.resolve(composite, contribution.getModelResolver());
-            analyzeProblems();
-        }
-        // Create a top level composite to host our composite
-        // This is temporary to make the activator happy
-        AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
-        Composite tempComposite = assemblyFactory.createComposite();
-        tempComposite.setName(new QName("http://tuscany.apache.org/xmlns/sca/1.0", "temp"));
-        tempComposite.setURI("http://tuscany.apache.org/xmlns/sca/1.0");
-
-        // Include the node composite in the top-level composite 
-        tempComposite.getIncludes().add(composite);
-
-        // set the top level composite on the composite activator as 
-        // logic in callable reference resolution relies on this being 
-        // available
-        compositeActivator.setDomainComposite(tempComposite);
-
-        // Build the composite
-        runtime.buildComposite(composite);
-
-        analyzeProblems();
-    }
-
-    /**
-     * Create a deployment composite that includes a list of deployable composites
-     * @param composites
-     */
-    private void aggregate(List<Composite> composites) {
-        if (composites.size() == 0) {
-            throw new IllegalArgumentException("No deployable composite is declared");
-        } else if (composites.size() == 1) {
-            composite = composites.get(0);
-        } else {
-            // Include all composites
-            AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
-            Composite aggregated = assemblyFactory.createComposite();
-            aggregated.setName(new QName("http://tuscany.apache.org/xmlns/sca/1.0", "aggregated"));
-            aggregated.setURI("http://tuscany.apache.org/xmlns/sca/1.0/aggregated");
-            aggregated.getIncludes().addAll(composites);
-            composite = aggregated;
-        }
-    }
-
-    /**
-     * Returns the artifact representing the given composite.
-     * 
-     * @param contribution
-     * @param compositeURI
-     * @return
-     */
-    private String location(Contribution contribution, String uri) {
-        if (uri != null && uri.startsWith("/")) {
-            uri = uri.substring(1);
-        }
-        ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        Artifact compositeFile = contributionFactory.createArtifact();
-        compositeFile.setUnresolved(true);
-        compositeFile.setURI(uri);
-        ModelResolver resolver = contribution.getModelResolver();
-        Artifact resolved = resolver.resolveModel(Artifact.class, compositeFile);
-        if (resolved != null && !resolved.isUnresolved()) {
-            return resolved.getLocation();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the contribution containing the given composite.
-     * 
-     * @param contributions
-     * @param compositeURI
-     * @return
-     */
-    private Contribution contribution(List<Contribution> contributions, String compositeURI) {
-        if (compositeURI != null && compositeURI.startsWith("/")) {
-            compositeURI = compositeURI.substring(1);
-        }
-        ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        Artifact compositeFile = contributionFactory.createArtifact();
-        compositeFile.setUnresolved(true);
-        compositeFile.setURI(compositeURI);
-        for (Contribution c : contributions) {
-            ModelResolver resolver = c.getModelResolver();
-            Artifact resolved = resolver.resolveModel(Artifact.class, compositeFile);
-            if (resolved != null && !resolved.isUnresolved()) {
-                return c;
-            }
-        }
-        return null;
-    }
-
-    private void analyzeProblems() throws Exception {
-
-        for (Problem problem : monitor.getProblems()) {
-            if ((problem.getSeverity() == Severity.ERROR) && (!problem.getMessageId().equals("SchemaError"))) {
-                if (problem.getCause() != null) {
-                    throw new ServiceRuntimeException(new MonitorRuntimeException(problem.getCause()));
-                } else {
-                    throw new ServiceRuntimeException(new MonitorRuntimeException(problem.toString()));
-                }
-            }
-        }
-    }
-
-    public void start() {
-        logger.log(Level.INFO, "Starting node: " + configurationName);
-
-        try {
-
-            // Activate the composite
-            compositeActivator.activate(composite);
-
-            // Start the composite
-            compositeActivator.start(composite);
-
-        } catch (ActivationException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public void stop() {
-        logger.log(Level.INFO, "Stopping node: " + configurationName);
-
-        try {
-
-            // Stop the composite
-            compositeActivator.stop(composite);
-
-            // Deactivate the composite
-            compositeActivator.deactivate(composite);
-
-            runtime.stop();
-        } catch (ActivationException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        return (R)runtime.getProxyFactory().cast(target);
-    }
-
-    public <B> B getService(Class<B> businessInterface, String serviceName) {
-
-        ServiceReference<B> serviceReference = getServiceReference(businessInterface, serviceName);
-        if (serviceReference == null) {
-            throw new ServiceRuntimeException("Service not found: " + serviceName);
-        }
-        return serviceReference.getService();
-    }
-
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String name) {
-
-        // Extract the component name
-        String componentName;
-        String serviceName;
-        int i = name.indexOf('/');
-        if (i != -1) {
-            componentName = name.substring(0, i);
-            serviceName = name.substring(i + 1);
-
-        } else {
-            componentName = name;
-            serviceName = null;
-        }
-
-        // Lookup the component 
-        Component component = null;
-
-        for (Component compositeComponent : composite.getComponents()) {
-            if (compositeComponent.getName().equals(componentName)) {
-                component = compositeComponent;
-                break;
-            }
-        }
-
-        if (component == null) {
-            throw new ServiceRuntimeException("The service " + name + " has not been contributed to the domain");
-        }
-        RuntimeComponentContext componentContext = null;
-
-        // If the component is a composite, then we need to find the
-        // non-composite component that provides the requested service
-        if (component.getImplementation() instanceof Composite) {
-            for (ComponentService componentService : component.getServices()) {
-                if (serviceName == null || serviceName.equals(componentService.getName())) {
-                    CompositeService compositeService = (CompositeService)componentService.getService();
-                    if (compositeService != null) {
-                        if (serviceName != null) {
-                            serviceName = "$promoted$" + component.getName() + "$slash$" + serviceName;
-                        }
-                        componentContext =
-                            ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext();
-                        
-                        if (componentContext == null){
-                        	// there is a break in the promotion chain so just let and exception 
-                        	// be thrown
-                        	break;
-                        }
-                        return componentContext.createSelfReference(businessInterface, compositeService
-                            .getPromotedService());
-                    }
-                    break;
-                }
-            }
-            // No matching service found
-            throw new ServiceRuntimeException("Composite service not found: " + name);
-        } else {
-            componentContext = ((RuntimeComponent)component).getComponentContext();
-            if (serviceName != null) {
-                return componentContext.createSelfReference(businessInterface, serviceName);
-            } else {
-                return componentContext.createSelfReference(businessInterface);
-            }
-        }
-    }
-
-    /**
-     * Returns the extension point registry used by this node.
-     * 
-     * @return
-     */
-    public ExtensionPointRegistry getExtensionPointRegistry() {
-        return runtime.getExtensionPointRegistry();
-    }
-
-    /**
-     * Returns the composite being run by this node.
-     * 
-     * @return
-     */
-    public Composite getComposite() {
-        return composite;
-    }
-
-    /**
-     * Returns contribution JARs available on the classpath.
-     * 
-     * @return
-     */
-    private static Map<String, URL> localContributions() {
-        Map<String, URL> localContributions = new HashMap<String, URL>();
-        collectJARs(localContributions, Thread.currentThread().getContextClassLoader());
-        return localContributions;
-    }
-
-    /**
-     * Collect JARs on the classpath of a URLClassLoader
-     * @param urls
-     * @param cl
-     */
-    private static void collectJARs(Map<String, URL> urls, ClassLoader cl) {
-        if (cl == null) {
-            return;
-        }
-
-        // Collect JARs from the URLClassLoader's classpath
-        if (cl instanceof URLClassLoader) {
-            URL[] jarURLs = ((URLClassLoader)cl).getURLs();
-            if (jarURLs != null) {
-                for (URL jarURL : jarURLs) {
-                    String file = jarURL.getPath();
-                    int i = file.lastIndexOf('/');
-                    if (i != -1 && i < file.length() - 1) {
-                        file = file.substring(i + 1);
-                        urls.put(file, jarURL);
-                    }
-                }
-            }
-        }
-
-        // Collect JARs from the parent ClassLoader
-        collectJARs(urls, cl.getParent());
-    }
-
-    public CompositeActivator getCompositeActivator() {
-        return compositeActivator;
-    }
-    
-    public RuntimeBootStrapper getRuntime() {
-        return runtime;
-    }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
deleted file mode 100644
index 4d78bf8dfe..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.node.impl;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
-import org.apache.tuscany.sca.core.conversation.ConversationManager;
-import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.scope.ScopeRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class RuntimeBootStrapper {
-    private static final Logger logger = Logger.getLogger(RuntimeBootStrapper.class.getName());
-    private List<ModuleActivator> modules;
-    private ExtensionPointRegistry registry;
-
-    private ClassLoader classLoader;
-    private AssemblyFactory assemblyFactory;
-    private ContributionService contributionService;
-    private CompositeActivator compositeActivator;
-    private CompositeBuilder compositeBuilder;
-    // private DomainBuilder domainBuilder;
-    private WorkScheduler workScheduler;
-    private ScopeRegistry scopeRegistry;
-    private ProxyFactory proxyFactory;
-    private List<SCADefinitions> policyDefinitions;
-    private ModelResolver policyDefinitionsResolver;
-    private Monitor monitor;
-    private ConversationManager conversationManager;
-
-    public RuntimeBootStrapper(ClassLoader classLoader) {
-        this.classLoader = classLoader;
-        registry = new DefaultExtensionPointRegistry();
-    }
-
-    public void start() throws ActivationException {
-        long start = System.currentTimeMillis();
-
-        // Create our extension point registry
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-
-        // Get work scheduler
-        workScheduler = utilities.getUtility(WorkScheduler.class);
-
-        conversationManager = utilities.getUtility(ConversationManager.class);
-
-        // Create an interface contract mapper
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-
-        // Get factory extension point
-        ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-
-        // Get Message factory
-        MessageFactory messageFactory = factories.getFactory(MessageFactory.class);
-
-        // Get proxy factory
-        ProxyFactoryExtensionPoint proxyFactories = registry.getExtensionPoint(ProxyFactoryExtensionPoint.class);
-        proxyFactory = new ExtensibleProxyFactory(proxyFactories);
-
-        // Create model factories
-        assemblyFactory = new RuntimeAssemblyFactory();
-        factories.addFactory(assemblyFactory);
-        PolicyFactory policyFactory = new DefaultPolicyFactory();
-        factories.addFactory(policyFactory);
-
-        // Load the runtime modules
-        modules = loadModules(registry);
-
-        // Start the runtime modules
-        startModules(registry, modules);
-
-        SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory intentAttachPointTypeFactory = new DefaultIntentAttachPointTypeFactory();
-        factories.addFactory(intentAttachPointTypeFactory);
-        ContributionFactory contributionFactory = factories.getFactory(ContributionFactory.class);
-
-        // Create a monitor
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-
-        if (monitorFactory != null) {
-            monitor = monitorFactory.createMonitor();
-        } else {
-            monitorFactory = new DefaultMonitorFactoryImpl();
-            monitor = monitorFactory.createMonitor();
-            utilities.addUtility(monitorFactory);
-        }
-
-        // Create a contribution service
-        policyDefinitions = new ArrayList<SCADefinitions>();
-        policyDefinitionsResolver = new DefaultModelResolver();
-        contributionService =
-            RuntimeBuilder.createContributionService(classLoader,
-                                                     registry,
-                                                     contributionFactory,
-                                                     assemblyFactory,
-                                                     policyFactory,
-                                                     mapper,
-                                                     policyDefinitions,
-                                                     policyDefinitionsResolver,
-                                                     monitor);
-
-        // add the contribution service into the utility extension point
-        utilities.addUtility(contributionService);
-
-        // Create the ScopeRegistry
-        scopeRegistry = RuntimeBuilder.createScopeRegistry(registry);
-
-        // Create a composite activator
-        compositeActivator =
-            RuntimeBuilder.createCompositeActivator(registry,
-                                                    assemblyFactory,
-                                                    messageFactory,
-                                                    scaBindingFactory,
-                                                    mapper,
-                                                    proxyFactory,
-                                                    scopeRegistry,
-                                                    workScheduler);
-
-        // Load the definitions.xml
-        loadSCADefinitions();
-
-        if (logger.isLoggable(Level.FINE)) {
-            long end = System.currentTimeMillis();
-            logger.fine("The tuscany runtime is started in " + (end - start) + " ms.");
-        }
-    }
-
-    public void stop() throws ActivationException {
-        long start = System.currentTimeMillis();
-
-        // Stop the runtime modules
-        stopModules(registry, modules);
-
-        // Stop and destroy the work manager
-        workScheduler.destroy();
-
-        conversationManager.destroy();
-        conversationManager = null;
-
-        // Cleanup
-        modules = null;
-        registry = null;
-        assemblyFactory = null;
-        contributionService = null;
-        compositeActivator = null;
-        workScheduler = null;
-        scopeRegistry = null;
-
-        if (logger.isLoggable(Level.FINE)) {
-            long end = System.currentTimeMillis();
-            logger.fine("The tuscany runtime is stopped in " + (end - start) + " ms.");
-        }
-    }
-
-    public void buildComposite(Composite composite) throws CompositeBuilderException {
-        //Get factory extension point
-        ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory intentAttachPointTypeFactory =
-            factories.getFactory(IntentAttachPointTypeFactory.class);
-        EndpointFactory endpointFactory = factories.getFactory(EndpointFactory.class);
-        DocumentBuilderFactory documentBuilderFactory = factories.getFactory(DocumentBuilderFactory.class);
-        TransformerFactory transformerFactory = factories.getFactory(TransformerFactory.class);
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-
-        //Create a composite builder
-        SCADefinitions aggregatedDefinitions = new SCADefinitionsImpl();
-        for (SCADefinitions definition : ((List<SCADefinitions>)policyDefinitions)) {
-            SCADefinitionsUtil.aggregateSCADefinitions(definition, aggregatedDefinitions);
-        }
-        compositeBuilder =
-            RuntimeBuilder.createCompositeBuilder(monitor,
-                                                  assemblyFactory,
-                                                  scaBindingFactory,
-                                                  endpointFactory,
-                                                  intentAttachPointTypeFactory,
-                                                  documentBuilderFactory,
-                                                  transformerFactory,
-                                                  mapper,
-                                                  aggregatedDefinitions);
-        compositeBuilder.build(composite);
-
-    }
-
-    public ContributionService getContributionService() {
-        return contributionService;
-    }
-
-    public CompositeActivator getCompositeActivator() {
-        return compositeActivator;
-    }
-
-    public CompositeBuilder getCompositeBuilder() {
-        return compositeBuilder;
-    }
-
-    public AssemblyFactory getAssemblyFactory() {
-        return assemblyFactory;
-    }
-
-    private void loadSCADefinitions() throws ActivationException {
-        try {
-            URLArtifactProcessorExtensionPoint documentProcessors =
-                registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-            URLArtifactProcessor<SCADefinitions> definitionsProcessor =
-                documentProcessors.getProcessor(SCADefinitions.class);
-            SCADefinitionsProviderExtensionPoint scaDefnProviders =
-                registry.getExtensionPoint(SCADefinitionsProviderExtensionPoint.class);
-
-            SCADefinitions systemSCADefinitions = new SCADefinitionsImpl();
-            SCADefinitions aSCADefn = null;
-            for (SCADefinitionsProvider aProvider : scaDefnProviders.getSCADefinitionsProviders()) {
-                aSCADefn = aProvider.getSCADefinition();
-                SCADefinitionsUtil.aggregateSCADefinitions(aSCADefn, systemSCADefinitions);
-            }
-
-            policyDefinitions.add(systemSCADefinitions);
-
-            //we cannot expect that providers will add the intents and policysets into the resolver
-            //so we do this here explicitly
-            for (Intent intent : systemSCADefinitions.getPolicyIntents()) {
-                policyDefinitionsResolver.addModel(intent);
-            }
-
-            for (PolicySet policySet : systemSCADefinitions.getPolicySets()) {
-                policyDefinitionsResolver.addModel(policySet);
-            }
-
-            for (IntentAttachPointType attachPoinType : systemSCADefinitions.getBindingTypes()) {
-                policyDefinitionsResolver.addModel(attachPoinType);
-            }
-
-            for (IntentAttachPointType attachPoinType : systemSCADefinitions.getImplementationTypes()) {
-                policyDefinitionsResolver.addModel(attachPoinType);
-            }
-
-            //now that all system sca definitions have been read, lets resolve them right away
-            definitionsProcessor.resolve(systemSCADefinitions, policyDefinitionsResolver);
-        } catch (Exception e) {
-            throw new ActivationException(e);
-        }
-    }
-
-    private List<ModuleActivator> loadModules(ExtensionPointRegistry registry) throws ActivationException {
-
-        // Load and instantiate the modules found on the classpath (or any registered ClassLoaders)
-        modules = new ArrayList<ModuleActivator>();
-        try {
-            Set<ServiceDeclaration> moduleActivators =
-                ServiceDiscovery.getInstance().getServiceDeclarations(ModuleActivator.class);
-            List<ServiceDeclaration> orderedModuleActivators = sort(moduleActivators);
-            Set<String> moduleClasses = new HashSet<String>();
-            for (ServiceDeclaration moduleDeclarator : orderedModuleActivators) {
-                if (moduleClasses.contains(moduleDeclarator.getClassName())) {
-                    continue;
-                }
-                moduleClasses.add(moduleDeclarator.getClassName());
-                Class<?> moduleClass = moduleDeclarator.loadClass();
-                ModuleActivator module = (ModuleActivator)moduleClass.newInstance();
-                modules.add(module);
-            }
-        } catch (IOException e) {
-            throw new ActivationException(e);
-        } catch (ClassNotFoundException e) {
-            throw new ActivationException(e);
-        } catch (InstantiationException e) {
-            throw new ActivationException(e);
-        } catch (IllegalAccessException e) {
-            throw new ActivationException(e);
-        }
-
-        return modules;
-    }
-
-    private void startModules(ExtensionPointRegistry registry, List<ModuleActivator> modules)
-        throws ActivationException {
-        boolean debug = logger.isLoggable(Level.FINE);
-        // Start all the extension modules
-        for (ModuleActivator module : modules) {
-            long start = 0L;
-            if (debug) {
-                logger.fine(module.getClass().getName() + " is starting.");
-                start = System.currentTimeMillis();
-            }
-            try {
-                module.start(registry);
-                if (debug) {
-                    long end = System.currentTimeMillis();
-                    logger.fine(module.getClass().getName() + " is started in " + (end - start) + " ms.");
-                }
-            } catch (Throwable e) {
-                logger.log(Level.WARNING, "Exception starting module " + module.getClass().getName()
-                    + " :"
-                    + e.getMessage());
-                logger.log(Level.FINE, "Exception starting module " + module.getClass().getName(), e);
-            }
-        }
-    }
-
-    private void stopModules(final ExtensionPointRegistry registry, List<ModuleActivator> modules) {
-        boolean debug = logger.isLoggable(Level.FINE);
-        for (ModuleActivator module : modules) {
-            long start = 0L;
-            if (debug) {
-                logger.fine(module.getClass().getName() + " is stopping.");
-                start = System.currentTimeMillis();
-            }
-            module.stop(registry);
-            if (debug) {
-                long end = System.currentTimeMillis();
-                logger.fine(module.getClass().getName() + " is stopped in " + (end - start) + " ms.");
-            }
-        }
-    }
-
-    /**
-     * @return the proxyFactory
-     */
-    public ProxyFactory getProxyFactory() {
-        return proxyFactory;
-    }
-
-    /**
-     * @return the registry
-     */
-    public ExtensionPointRegistry getExtensionPointRegistry() {
-        return registry;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<ServiceDeclaration> sort(Set<ServiceDeclaration> servicesDeclaration) {
-        ServiceDeclaration[] servicesArray = new ServiceDeclaration[servicesDeclaration.size()];
-        servicesArray = (ServiceDeclaration[])servicesDeclaration.toArray(servicesArray);
-        Arrays.sort(servicesArray, new Comparator() {
-            public int compare(final Object xObj, final Object yObj) {
-                String xPriority = ((ServiceDeclaration) xObj).getAttributes().get("priority");
-                String yPriority = ((ServiceDeclaration) yObj).getAttributes().get("priority");
-                
-                long x = 0, y = 0;
-                if (xPriority != null && xPriority.length() > 0) {
-                    x = Long.parseLong(xPriority);
-                }
-                
-                if (yPriority != null && yPriority.length() > 0) {
-                    y = Long.parseLong(yPriority);
-                }
-
-                return x > y ? 1 : -1;
-            }
-        });
-        return Arrays.asList(servicesArray);
-    }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
deleted file mode 100644
index f609e15c5c..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
+++ /dev/null
@@ -1,256 +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.node.impl;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;
-import org.apache.tuscany.sca.context.ContextFactoryExtensionPoint;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultValidatingXMLInputFactory;
-import org.apache.tuscany.sca.contribution.processor.DefaultValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensiblePackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.service.ExtensibleContributionListener;
-import org.apache.tuscany.sca.contribution.service.TypeDescriber;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionRepositoryImpl;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionServiceImpl;
-import org.apache.tuscany.sca.contribution.service.impl.PackageTypeDescriberImpl;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.assembly.CompositeActivatorImpl;
-import org.apache.tuscany.sca.core.conversation.ConversationManager;
-import org.apache.tuscany.sca.core.invocation.ExtensibleWireProcessor;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.scope.CompositeScopeContainerFactory;
-import org.apache.tuscany.sca.core.scope.ConversationalScopeContainerFactory;
-import org.apache.tuscany.sca.core.scope.RequestScopeContainerFactory;
-import org.apache.tuscany.sca.core.scope.ScopeContainerFactory;
-import org.apache.tuscany.sca.core.scope.ScopeRegistry;
-import org.apache.tuscany.sca.core.scope.ScopeRegistryImpl;
-import org.apache.tuscany.sca.core.scope.StatelessScopeContainerFactory;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class RuntimeBuilder {
-
-    // private static final Logger logger = Logger.getLogger(RuntimeBuilder.class.getName());
-
-    public static CompositeActivator createCompositeActivator(ExtensionPointRegistry registry,
-                                                              AssemblyFactory assemblyFactory,
-                                                              MessageFactory messageFactory,
-                                                              SCABindingFactory scaBindingFactory,
-                                                              InterfaceContractMapper mapper,
-                                                              ProxyFactory proxyFactory,
-                                                              ScopeRegistry scopeRegistry,
-                                                              WorkScheduler workScheduler) {
-
-        // Create a wire post processor extension point
-        RuntimeWireProcessorExtensionPoint wireProcessors =
-            registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
-        RuntimeWireProcessor wireProcessor = new ExtensibleWireProcessor(wireProcessors);
-
-        // Retrieve the processors extension point
-        StAXArtifactProcessorExtensionPoint processors =
-            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
-        // Create a provider factory extension point
-        ProviderFactoryExtensionPoint providerFactories =
-            registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-
-        // Create a endpoint resolver factory extension point
-        EndpointResolverFactoryExtensionPoint endpointResolverFactories =
-            registry.getExtensionPoint(EndpointResolverFactoryExtensionPoint.class);
-
-        JavaInterfaceFactory javaInterfaceFactory =
-            registry.getExtensionPoint(ModelFactoryExtensionPoint.class).getFactory(JavaInterfaceFactory.class);
-        RequestContextFactory requestContextFactory =
-            registry.getExtensionPoint(ContextFactoryExtensionPoint.class).getFactory(RequestContextFactory.class);
-
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        ConversationManager conversationManager = utilities.getUtility(ConversationManager.class);
-
-        // Create the composite activator
-        CompositeActivator compositeActivator =
-            new CompositeActivatorImpl(assemblyFactory, messageFactory, javaInterfaceFactory, scaBindingFactory,
-                                       mapper, scopeRegistry, workScheduler, wireProcessor, requestContextFactory,
-                                       proxyFactory, providerFactories, endpointResolverFactories, processors,
-                                       conversationManager);
-
-        return compositeActivator;
-    }
-
-    public static CompositeBuilder createCompositeBuilder(Monitor monitor,
-                                                          AssemblyFactory assemblyFactory,
-                                                          SCABindingFactory scaBindingFactory,
-                                                          EndpointFactory endpointFactory,
-                                                          IntentAttachPointTypeFactory intentAttachPointTypeFactory,
-                                                          DocumentBuilderFactory documentBuilderFactory,
-                                                          TransformerFactory transformerFactory,
-                                                          InterfaceContractMapper interfaceContractMapper,
-                                                          SCADefinitions policyDefinitions) {
-
-        return new CompositeBuilderImpl(assemblyFactory, endpointFactory, scaBindingFactory,
-                                        intentAttachPointTypeFactory, documentBuilderFactory, transformerFactory,
-                                        interfaceContractMapper, policyDefinitions,
-                                        monitor);
-    }
-
-    /**
-     * Create the contribution service used by this domain.
-     * 
-     * @throws ActivationException
-     */
-    public static ContributionService createContributionService(ClassLoader classLoader,
-                                                                ExtensionPointRegistry registry,
-                                                                ContributionFactory contributionFactory,
-                                                                AssemblyFactory assemblyFactory,
-                                                                PolicyFactory policyFactory,
-                                                                InterfaceContractMapper mapper,
-                                                                List<SCADefinitions> policyDefinitions,
-                                                                ModelResolver policyDefinitionResolver,
-                                                                Monitor monitor) throws ActivationException {
-
-        // Get the model factory extension point
-        ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-
-        // Create a new XML input factory
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-
-        // Create a validation XML schema extension point
-        ValidationSchemaExtensionPoint schemas = registry.getExtensionPoint(ValidationSchemaExtensionPoint.class);
-
-        // Create a validating XML input factory
-        XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas, monitor);
-        modelFactories.addFactory(validatingInputFactory);
-
-        // Create StAX artifact processor extension point
-        StAXArtifactProcessorExtensionPoint staxProcessors =
-            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
-        // Create and register StAX processors for SCA assembly XML
-        // Allow privileged access to factory. Requires RuntimePermission in security policy file.
-        XMLOutputFactory outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        ExtensibleStAXArtifactProcessor staxProcessor =
-            new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, monitor);
-
-        // Create URL artifact processor extension point
-        URLArtifactProcessorExtensionPoint documentProcessors =
-            registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-
-        // Create and register document processors for SCA assembly XML
-        DocumentBuilderFactory documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
-        documentBuilderFactory.setNamespaceAware(true);
-        documentProcessors.getProcessor(Composite.class);
-        documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, validatingInputFactory,
-                                                                               documentBuilderFactory, policyDefinitions, monitor));
-
-        // Create Model Resolver extension point
-        ModelResolverExtensionPoint modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class);
-
-        // Create contribution package processor extension point
-        TypeDescriber describer = new PackageTypeDescriberImpl();
-        PackageProcessor packageProcessor =
-            new ExtensiblePackageProcessor(registry.getExtensionPoint(PackageProcessorExtensionPoint.class), describer,
-                                           monitor);
-
-        // Create contribution listener
-        ExtensibleContributionListener contributionListener =
-            new ExtensibleContributionListener(registry.getExtensionPoint(ContributionListenerExtensionPoint.class));
-
-        // Create a contribution repository
-        ContributionRepository repository;
-        try {
-            repository = new ContributionRepositoryImpl("target", inputFactory, monitor);
-        } catch (IOException e) {
-            throw new ActivationException(e);
-        }
-
-        ExtensibleURLArtifactProcessor documentProcessor =
-            new ExtensibleURLArtifactProcessor(documentProcessors, monitor);
-
-        // Create the contribution service
-        ContributionService contributionService =
-            new ContributionServiceImpl(repository, packageProcessor, documentProcessor, staxProcessor,
-                                        contributionListener, policyDefinitionResolver, modelResolvers, modelFactories,
-                                        assemblyFactory, contributionFactory, inputFactory, policyDefinitions, registry, monitor);
-        return contributionService;
-    }
-
-    public static ScopeRegistry createScopeRegistry(ExtensionPointRegistry registry) {
-        ScopeRegistry scopeRegistry = new ScopeRegistryImpl();
-        ScopeContainerFactory[] factories =
-            new ScopeContainerFactory[] {new CompositeScopeContainerFactory(), new StatelessScopeContainerFactory(),
-                                         new RequestScopeContainerFactory(),
-                                         new ConversationalScopeContainerFactory(null),
-            // new HttpSessionScopeContainer(monitor)
-            };
-        for (ScopeContainerFactory f : factories) {
-            scopeRegistry.register(f);
-        }
-
-        //FIXME Pass the scope container differently as it's not an extension point
-        registry.addExtensionPoint(scopeRegistry);
-
-        return scopeRegistry;
-    }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
deleted file mode 100644
index 4215855ac9..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
+++ /dev/null
@@ -1,17 +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.node.impl.Node2FactoryImpl
\ No newline at end of file
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
deleted file mode 100644
index 800bdd84cc..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
+++ /dev/null
@@ -1,17 +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.node.impl.NodeFactoryImpl
\ No newline at end of file
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorld.java
deleted file mode 100644
index 2f519cb81d..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorld.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 hello;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * HelloWorld interface
- */
-@Remotable
-public interface HelloWorld {
-    String hello(String name);
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorldImpl.java
deleted file mode 100644
index c9a7560b12..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorldImpl.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 hello;
-
-/**
- * HelloWorldImpl
- */
-public class HelloWorldImpl implements HelloWorld {
-    public String hello(String name) {
-        System.out.println("Hello: " + name);
-        return "Hello, " + name;
-    }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
deleted file mode 100644
index 52d96dd72d..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
+++ /dev/null
@@ -1,119 +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.node.impl;
-
-import hello.HelloWorld;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.Test;
-
-/**
- * Test case for Node2Impl
- */
-public class Node2ImplTestCase {
-    private static String composite =
-        "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\""
-            + " targetNamespace=\"http://sample/composite\""
-            + " xmlns:sc=\"http://sample/composite\""
-            + " name=\"HelloWorld\">"
-            + " <component name=\"HelloWorld\">"
-            + " <implementation.java class=\"hello.HelloWorldImpl\"/>"
-            + " </component>"
-            + " </composite>";
-
-    @Test
-    public void testNodeWithCompositeContent() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        SCANode2 node = factory.createSCANode("HelloWorld.composite", composite, contribution);
-        testNode(node);
-    }
-    
-    @Test
-    public void testNodeWithCompositeContentAndNoContribution() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANode("HelloWorld.composite", composite);
-        testNode(node);
-    }    
-
-    @Test
-    public void testNodeWithoutCompositeURI() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        SCANode2 node = factory.createSCANode(null, contribution);
-        testNode(node);
-    }
-    
-    @Test
-    public void testNodeWithCompositeURI() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = new File("target/test-classes/HelloWorld.composite").toURI().toString();
-        SCANode2 node = factory.createSCANode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithRelativeCompositeURI() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = "HelloWorld.composite";
-        SCANode2 node = factory.createSCANode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithRelativeCompositeURIAndNoContribution() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        String compositeURI = "HelloWorld.composite";
-        SCANode2 node = factory.createSCANode(compositeURI, new SCAContribution[0]);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithClassLoader() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        String compositeURI = "HelloWorld.composite";
-        SCANode2 node = factory.createSCANodeFromClassLoader(compositeURI, HelloWorld.class.getClassLoader());
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithClassLoaderAndNullComposite() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader(null, HelloWorld.class.getClassLoader());
-        testNode(node);
-    }
-    
-    private void testNode(SCANode2 node) {
-        node.start();
-        HelloWorld hw = ((SCAClient)node).getService(HelloWorld.class, "HelloWorld");
-        Assert.assertEquals("Hello, Node", hw.hello("Node"));
-        node.stop();
-    }
-        
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
deleted file mode 100644
index d620f6b62a..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ /dev/null
@@ -1,119 +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.node.impl;
-
-import hello.HelloWorld;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.Test;
-
-/**
- * Test case for NodeImpl
- */
-public class NodeImplTestCase {
-    private static String composite =
-        "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\""
-            + " targetNamespace=\"http://sample/composite\""
-            + " xmlns:sc=\"http://sample/composite\""
-            + " name=\"HelloWorld\">"
-            + " <component name=\"HelloWorld\">"
-            + " <implementation.java class=\"hello.HelloWorldImpl\"/>"
-            + " </component>"
-            + " </composite>";
-
-    @Test
-    public void testNodeWithCompositeContent() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        SCANode node = factory.createSCANode("HelloWorld.composite", composite, contribution);
-        testNode(node);
-    }
-    
-    @Test
-    public void testNodeWithCompositeContentAndNoContribution() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCANode node = factory.createSCANode("HelloWorld.composite", composite);
-        testNode(node);
-    }    
-
-    @Test
-    public void testNodeWithoutCompositeURI() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        SCANode node = factory.createSCANode(null, contribution);
-        testNode(node);
-    }
-    
-    @Test
-    public void testNodeWithCompositeURI() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = new File("target/test-classes/HelloWorld.composite").toURI().toString();
-        SCANode node = factory.createSCANode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithRelativeCompositeURI() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = "HelloWorld.composite";
-        SCANode node = factory.createSCANode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithRelativeCompositeURIAndNoContribution() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        String compositeURI = "HelloWorld.composite";
-        SCANode node = factory.createSCANode(compositeURI, new SCAContribution[0]);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithClassLoader() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        String compositeURI = "HelloWorld.composite";
-        SCANode node = factory.createSCANodeFromClassLoader(compositeURI, HelloWorld.class.getClassLoader());
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithClassLoaderAndNullComposite() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCANode node = factory.createSCANodeFromClassLoader(null, HelloWorld.class.getClassLoader());
-        testNode(node);
-    }
-    
-    private void testNode(SCANode node) {
-        node.start();
-        HelloWorld hw = ((SCAClient)node).getService(HelloWorld.class, "HelloWorld");
-        Assert.assertEquals("Hello, Node", hw.hello("Node"));
-        node.stop();
-    }
-        
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/HelloWorld.composite b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/HelloWorld.composite
deleted file mode 100644
index 9e3299d691..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/HelloWorld.composite
+++ /dev/null
@@ -1,30 +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.    

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://sample/composite"

-	xmlns:sc="http://sample/composite"

-	name="HelloWorld">

-

-    <component name="HelloWorld">

-        <implementation.java class="hello.HelloWorldImpl"/>

-    </component>

-

-</composite>

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 1d37bcebe0..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:sc="http://sample/composite">
-    <deployable composite="sc:HelloWorld" />
-</contribution>