Deleting 2.0-M5.1-RC1 release candidate tag

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

13 files changed, 0 insertions, 922 deletions

diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed under the Apache License, Version 2.0 (the "License");

-   you may not use this file except in compliance with the License.

-   You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-   Unless required by applicable law or agreed to in writing, software

-   distributed under the License is distributed on an "AS IS" BASIS,

-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-   See the License for the specific language governing permissions and

-   limitations under the License.

-

-

-

diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/META-INF/MANIFEST.MF
deleted file mode 100644
index e9fb88b202..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0

-SCA-Version: 1.1

-Bundle-Name: Apache Tuscany SCA Domain Node

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bundle-ManifestVersion: 2

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

-Bundle-Description: Apache Tuscany SCA Domain Node

-Import-Package: 

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

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

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

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

- org.apache.tuscany.sca.runtime;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.domain.node

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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/NOTICE
deleted file mode 100644
index 9ddba06a32..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/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-2.x/tags/2.0-M5.1-RC1/modules/domain-node/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/pom.xml
deleted file mode 100644
index 524c1e07cc..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5.1</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-domain-node</artifactId>
-    <name>Apache Tuscany SCA Domain Node</name>
-
-    <dependencies>
- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-M5.1</version>
-        </dependency>
-
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5.1</version>
-        </dependency>  
-                      
-    </dependencies>
-
-</project>
diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
deleted file mode 100644
index e538ea9f53..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
+++ /dev/null
@@ -1,179 +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.domain.node;

-

-import java.net.URI;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.apache.tuscany.sca.assembly.Endpoint;

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

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.apache.tuscany.sca.node.configuration.NodeConfiguration;

-import org.apache.tuscany.sca.node.impl.NodeImpl;

-import org.apache.tuscany.sca.runtime.DomainRegistryFactory;

-import org.apache.tuscany.sca.runtime.EndpointRegistry;

-import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;

-import org.oasisopen.sca.NoSuchDomainException;

-import org.oasisopen.sca.NoSuchServiceException;

-import org.oasisopen.sca.client.SCAClientFactory;

-

-public class DomainNode {

-

-    private static final String DEFAULT_DOMAIN_SCHEME = "vm";

-    private static final String DEFAULT_DOMAIN_NAME = "defaultDomain";

-    private static final String DEFAULT_CONFIG_URI = DEFAULT_DOMAIN_SCHEME + "://" + DEFAULT_DOMAIN_NAME;

-

-    private String domainName;

-    private String domainRegistryURI;

-    

-    private Map<String, Node> nodes = new HashMap<String, Node>();

-    

-    public DomainNode() {

-       this(DEFAULT_CONFIG_URI, new String[]{});   

-    }

-    

-    public DomainNode(String... contributionLocations) {

-        this(DEFAULT_CONFIG_URI, contributionLocations);   

-    }

-    

-    public DomainNode(String configURI, String[] contributionLocations) {

-        this.domainRegistryURI = configURI;

-        initDomainName(configURI);

-        if (contributionLocations == null || contributionLocations.length == 0) {

-            addContribution(null, "_null");

-        } else {

-            for (String loc : contributionLocations) {

-                addContribution(loc);

-            }

-        }

-    }

-

-    public void stop() {

-        for (Node node : nodes.values()) {

-            node.stop();

-        }

-    }

-

-    public String addContribution(String location) {

-        String uri = location;

-        addContribution(uri, location);

-        return uri;

-    }

-

-    public void addContribution(String location, String uri) {

-        if (nodes.containsKey(uri)) {

-            throw new IllegalArgumentException("contribution already added: " + uri);

-        }

-        NodeConfiguration configuration = NodeFactory.getInstance().createNodeConfiguration();

-        if (location != null) {

-            configuration.addContribution(uri, location);

-        }

-        configuration.setDomainRegistryURI(domainRegistryURI);

-        configuration.setDomainURI(domainName);

-        configuration.setURI(uri); //???

-        Node node = NodeFactory.getInstance().createNode(configuration).start();

-        nodes.put(uri, node);

-    }

-

-    public void removeContribution(String uri) {

-        if (!nodes.containsKey(uri)) {

-            throw new IllegalArgumentException("contribution not found: " + uri);

-        }

-        Node node = nodes.remove(uri);

-        node.stop();

-    }

-

-    public String getDomainName() {

-        return domainName;

-    }

-    

-    public String getDomainConfigURI() {

-        return domainRegistryURI;

-    }

-    

-    public List<String> getServiceNames() {

-        List<String> serviceNames = new ArrayList<String>();

-        if (nodes.size() > 0) {

-            ExtensionPointRegistry extensionsRegistry = ((NodeImpl)nodes.values().iterator().next()).getExtensionPointRegistry();

-            DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionsRegistry);

-            EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry(getDomainConfigURI(), getDomainName());

-            for (Endpoint endpoint : endpointRegistry.getEndpoints()) {

-                // Would be nice if Endpoint.getURI() returned this:

-                String name = endpoint.getComponent().getName() + "/" + endpoint.getService().getName();

-                if (endpoint.getBinding() != null) {

-                    // TODO: shouldn't the binding name be null if its not explicitly specified? 

-                    //       For now don't include it if the same as the default

-                    if (!endpoint.getService().getName().equals(endpoint.getBinding().getName())) {

-                        name += "/" + endpoint.getBinding().getName();

-                    }

-                }

-                serviceNames.add(name);

-            }

-        }

-        return serviceNames;

-    }

-

-    public <T> T getService(Class<T> interfaze, String uri) throws NoSuchServiceException {

-        try {

-            return SCAClientFactory.newInstance(URI.create(getDomainName())).getService(interfaze, uri);

-        } catch (NoSuchDomainException e) {

-            throw new IllegalStateException(e);

-        }

-    }

-

-    protected void initDomainName(String configURI) {

-//        URI uri = URI.create(fixScheme(configURI));

-//        String dn = uri.getHost();

-//        if (dn == null || dn.length() < 1) {

-//            dn = DEFAULT_DOMAIN_NAME;

-//        }

-        if (configURI.startsWith("tuscany:vm:")) {

-            domainName = configURI.substring("tuscany:vm:".length());  

-        } else if (configURI.startsWith("tuscany:")) {

-            int i = configURI.indexOf('?');

-            if (i == -1) {

-                domainName = configURI.substring("tuscany:".length());  

-            } else{

-                domainName = configURI.substring("tuscany:".length(), i);  

-            }

-        } else {

-            domainName = configURI;  

-        }

-    }

-    

-    /**

-     * I keep typing the scheme part with just a colon instead of colon slash slash

-     * which URI doesn't parse properly which irritates me so fix it up here

-     */

-    protected String fixScheme(String uri) {

-        int i = uri.indexOf(":");

-        if (i > -1 && uri.charAt(i+1) != '/') {

-            uri = uri.replaceFirst(":", ":/");

-        }

-        if (i > -1 && uri.charAt(i+2) != '/') {

-            uri = uri.replaceFirst(":/", "://");

-        }

-        return uri;

-    }

-}

diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
deleted file mode 100644
index ac0672fb2c..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
+++ /dev/null
@@ -1,67 +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.domain.node;

-

-import java.io.File;

-import java.util.ArrayList;

-import java.util.List;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-public class DomainNodeMain {

-

-    /**

-     * Start an SCA domain node

-     * @param args a list of contribution jars for the node to run

-     */

-    public static void main(String[] args) throws Exception {

-

-        String configURI = "uri:default";

-

-        List<String> contributions = new ArrayList<String>();

-        for (int i = 0; i < args.length; i++) {

-            if (args[i].startsWith("vm:") || args[i].startsWith("tribes:") || args[i].startsWith("tuscany:") || args[i].startsWith("uri:") || args[i].startsWith("properties:")) {

-                configURI = args[i];

-            } else{

-                File f = new File(args[i]);

-                if (!f.exists()) {

-                    System.err.println("contribution not found: " + f);

-                    System.exit(1);

-                }

-                contributions.add(f.toURI().toString());

-            }

-        }

-

-        Node node = NodeFactory.newInstance(configURI).createNode((String)null, contributions.toArray(new String[contributions.size()]));

-        node.start();

-

-        System.out.println("Hit enter to stop node...");

-        if (System.in.read() == -1) {

-            // no sysin so wait for ever letting caller do the terminate

-            Object lock = new Object();

-            synchronized (lock) {

-                lock.wait();

-            }

-        }

-

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java
deleted file mode 100644
index ee15dfba12..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package itest.nodes;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Helloworld {

-    

-    String sayHello(String name);

-

-}

diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java
deleted file mode 100644
index 3613cce9d2..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java
+++ /dev/null
@@ -1,84 +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.domain.node;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import itest.nodes.Helloworld;
-
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * This shows how to test the Calculator service component.
- */
-@Ignore("TUSCANY-3391")
-public class GetServiceTestCase{
-
-    private static DomainNode clientNode;
-    private static DomainNode serviceNode;
-    
-    @Test
-    public void testTwoNodesSameDomain() throws Exception {
-        serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-M5.1.jar");
-        clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-M5.1.jar");
-
-        Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService");
-        assertNotNull(service);
-        assertEquals("Hello Petra", service.sayHello("Petra"));
-
-        Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-    }
-
-    @Test
-    public void testTwoNodesDifferentDomains() throws Exception {
-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-M5.1.jar"});
-        Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService");
-        assertNotNull(service);
-        assertEquals("Hello Petra", service.sayHello("Petra"));
-
-        clientNode = new DomainNode("vm://barDomain", new String[] {"target/test-classes/itest-nodes-helloworld-client-2.0-M5.1.jar"});
-        Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-
-        try {
-            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-            fail();
-        } catch (ServiceRuntimeException e) {
-            // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException?
-            // expected
-        }
-    }
-
-    @After
-    public void tearDownAfterClass() throws Exception {
-        if (clientNode != null) {
-            clientNode.stop();
-        }
-        if (serviceNode != null) {
-            serviceNode.stop();
-        }
-    }
-}
diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
deleted file mode 100644
index a000b686b4..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
+++ /dev/null
@@ -1,87 +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.domain.node;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import itest.nodes.Helloworld;
-
-import java.net.URI;
-
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-@Ignore("TUSCANY-3391")
-public class MultipleNodesPerJVMTestCase{
-
-    private static DomainNode clientNode;
-    private static DomainNode serviceNode;
-    
-    @Test
-    public void testTwoNodesSameDomain() throws Exception {
-        serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-M5.1.jar");
-        clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-M5.1.jar");
-
-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
-        assertNotNull(service);
-        assertEquals("Hello Petra", service.sayHello("Petra"));
-
-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-    }
-
-    @Test
-    public void testTwoNodesDifferentDomains() throws Exception {
-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-M5.1.jar"});
-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService");
-        assertNotNull(service);
-        assertEquals("Hello Petra", service.sayHello("Petra"));
-
-        clientNode = new DomainNode("vm://barDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-M5.1.jar"});
-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://barDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-
-        try {
-            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-            fail();
-        } catch (ServiceRuntimeException e) {
-            // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException?
-            // expected
-        }
-    }
-
-    @After
-    public void tearDownAfterClass() throws Exception {
-        if (clientNode != null) {
-            clientNode.stop();
-        }
-        if (serviceNode != null) {
-            serviceNode.stop();
-        }
-    }
-}
diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
deleted file mode 100644
index d6009f5230..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.domain.node;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import itest.nodes.Helloworld;
-
-import java.net.URI;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.NoSuchDomainException;
-import org.oasisopen.sca.NoSuchServiceException;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-@Ignore("TUSCANY-3391")
-public class OneNodeTestCase{
-
-    private static DomainNode domain;
-    private static String serviceContributionUri;
-    
-    @Before
-    public void setUpBeforeClass() throws Exception {
-        domain = new DomainNode();
-        serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-M5.1.jar");
-        domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-M5.1.jar");
-    }
-
-    @Test
-    public void testService() throws Exception {
-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
-        assertNotNull(service);
-        assertEquals("Hello Petra", service.sayHello("Petra"));
-    }
-
-    @Test
-    public void testClient() throws Exception {
-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-    }
-    
-    @Test
-    public void testRemovingServiceContribution() throws Exception {
-        domain.removeContribution(serviceContributionUri);
-        try {
-            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
-        // FIXME: should this be NoSuchServiceException or ServiceNotFoundException?
-        } catch (NoSuchServiceException e) {
-            // expected
-        }
-
-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        try {
-            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-            fail();
-        } catch (Exception e) {
-            // FIXME: this gives an NPE, would be better to be something like ServiceNotFoundException
-            // expected
-        }
-    }
-
-    @Test
-    public void testStoppingDomainNode() throws Exception {
-        domain.stop();
-        try {
-            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
-            fail();
-        } catch (NoSuchDomainException e) {
-            // expected
-        }
-    }
-
-    @After
-    public void tearDownAfterClass() throws Exception {
-        if (domain != null) {
-            domain.stop();
-        }
-    }
-}
diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
deleted file mode 100644
index bd1583065b..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
+++ /dev/null
@@ -1,82 +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.domain.node;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import itest.nodes.Helloworld;
-
-import java.net.URI;
-
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-@Ignore("TUSCANY-3391")
-public class StopStartNodesTestCase{
-
-    private static DomainNode clientNode;
-    private static DomainNode serviceNode;
-    
-    @Test
-    public void testTwoNodesSameDomain() throws Exception {
-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-M5.1.jar"});
-        clientNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-M5.1.jar"});
-
-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService");
-        assertNotNull(service);
-        assertEquals("Hello Petra", service.sayHello("Petra"));
-
-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-
-        serviceNode.stop();
-
-        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        try {
-            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-            fail();
-        } catch (Exception e) {
-            // expected
-        }
-
-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-M5.1.jar"});
-        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-    }
-
-    @After
-    public void tearDownAfterClass() throws Exception {
-        if (clientNode != null) {
-            clientNode.stop();
-        }
-        if (serviceNode != null) {
-            serviceNode.stop();
-        }
-    }
-}
diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar
deleted file mode 100644
index 3e9ae79a41..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar
deleted file mode 100644
index 40333cab75..0000000000
--- a/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar
+++ /dev/null