Moving 1.x branches

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

15 files changed, 0 insertions, 958 deletions

diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java
deleted file mode 100644
index d7dc4473ad..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java
+++ /dev/null
@@ -1,31 +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 calculator;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9b7e254e5..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,31 +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 calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        System.out.println("AddService - add " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
deleted file mode 100644
index 5b63ad5a17..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
+++ /dev/null
@@ -1,31 +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 calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceUpdateImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        System.out.println("AddService Update - add " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index 5fbd3a3f6b..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The Calculator service interface.
- */
-@Remotable
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index da869e00fd..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,74 +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 calculator;
-
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService; 
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-       this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-    
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-    
-    public double add(double n1, double n2) {
-        System.out.println("CalculatorService - add " + n1 + " and " + n2);
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        System.out.println("CalculatorService - subtract " + n1 + " and " + n2);
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        System.out.println("CalculatorService - multiply " + n1 + " and " + n2);
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        System.out.println("CalculatorService - divide " + n1 + " and " + n2);
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.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 calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.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 calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index 78ab9c6ee0..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,31 +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 calculator;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the multiply service
- */
-@Remotable
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1010207154..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,31 +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 calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        System.out.println("SubtractService - subtract " + n1 + " and " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
deleted file mode 100644
index 0305b4303b..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
+++ /dev/null
@@ -1,123 +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 javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.domain.SCADomainFactory;
-import org.apache.tuscany.sca.node.SCADomainFinder;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.AddService;
-import calculator.CalculatorService;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory 
- * implementation of the distributed domain
- */
-public class DomainDrivenTestCase {
-    
-    private static SCADomain domain;
-    private static SCANode   nodeA;
-    private static SCANode   nodeB;
-    private static SCANode   nodeC;
-    private static CalculatorService calculatorServiceA;
-    private static CalculatorService calculatorServiceB;
-    private static AddService addServiceB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-             
-        try {
-            System.out.println("Setting up domain");
-            
-            SCADomainFactory domainFactory = SCADomainFactory.newInstance();
-            domain = domainFactory.createSCADomain("http://localhost:9999");
-            
-            System.out.println("Setting up calculator nodes");
-            
-            ClassLoader cl = DomainDrivenTestCase.class.getClassLoader();
-            
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            
-            nodeA = nodeFactory.createSCANode("http://localhost:8100/nodeA", "http://localhost:9999");           
-            nodeB = nodeFactory.createSCANode("http://localhost:8200/nodeB", "http://localhost:9999");
-            nodeC = nodeFactory.createSCANode("http://localhost:8300/nodeC", "http://localhost:9999");
-
-            domain.addContribution("nodeA", cl.getResource("nodeA/"));
-            domain.addContribution("nodeB", cl.getResource("nodeB/"));
-            domain.addContribution("nodeC", cl.getResource("nodeC/"));
-            
-            domain.addToDomainLevelComposite(new QName("http://sample", "CalculatorA"));
-            domain.addToDomainLevelComposite(new QName("http://sample", "CalculatorB"));
-            domain.addToDomainLevelComposite(new QName("http://sample", "CalculatorC"));
-            
-            domain.start();
-            
-            calculatorServiceA = domain.getService(CalculatorService.class, "CalculatorServiceComponentA");
-            calculatorServiceB = domain.getService(CalculatorService.class, "CalculatorServiceComponentB");
- 
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }  
-        
-   }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        // stop the domain
-        domain.stop();
-        
-        // destroy the nodes
-        nodeA.destroy();
-        nodeB.destroy();
-        nodeC.destroy();
-        
-        // destroy the domain
-        domain.destroy();
-    }
-    
-    //@Test
-    public void testKeepServerRunning() throws Exception {
-        System.out.println("press enter to continue");
-        System.in.read();
-    }      
-
-    @Test
-    public void testCalculator() throws Exception {       
-        // Calculate
-        Assert.assertEquals(calculatorServiceA.add(3, 2), 5.0);
-        Assert.assertEquals(calculatorServiceA.subtract(3, 2), 1.0);
-        Assert.assertEquals(calculatorServiceA.multiply(3, 2), 6.0);
-        Assert.assertEquals(calculatorServiceA.divide(3, 2), 1.5);
-        Assert.assertEquals(calculatorServiceB.add(3, 2), 5.0);
-        Assert.assertEquals(calculatorServiceB.subtract(3, 2), 1.0);
-        Assert.assertEquals(calculatorServiceB.multiply(3, 2), 6.0);
-        Assert.assertEquals(calculatorServiceB.divide(3, 2), 1.5);
-    }
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
deleted file mode 100644
index 783f61b2c2..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.node.impl;
-
-
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.domain.SCADomainFactory;
-import org.apache.tuscany.sca.domain.impl.SCADomainImpl;
-import org.apache.tuscany.sca.node.SCADomainFinder;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.AddService;
-import calculator.CalculatorService;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory 
- * implementation of the distributed domain
- */
-public class NodeDrivenTestCase {
-    
-    private static SCADomain domain;
-    private static SCANode   nodeA;
-    private static SCANode   nodeB;
-    private static SCANode   nodeC;
-    private static SCADomain domainProxy;
-    private static CalculatorService calculatorServiceA;
-    private static CalculatorService calculatorServiceB;
-    private static AddService addServiceBDomainFinder;
-    private static AddService addServiceBDomainProxy;
-    private static AddService addServiceBDomain;
-
-    @BeforeClass
-    public static void init() throws Exception {
-             
-        try {
-            System.out.println("Setting up domain");
-            
-            SCADomainFactory domainFactory = SCADomainFactory.newInstance();
-            domain= domainFactory.createSCADomain("http://localhost:9999");
-            
-            System.out.println("Setting up calculator nodes");
-            
-            ClassLoader cl = NodeDrivenTestCase.class.getClassLoader();
-            
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            
-            // sca-contribution.xml test
-            nodeA = nodeFactory.createSCANode("http://localhost:8100/nodeA", "http://localhost:9999");
-            nodeA.addContribution("nodeA", cl.getResource("nodeA/"));
-            nodeA.addToDomainLevelComposite(new QName("http://sample", "CalculatorA"));
-
-            // sca-deployables test
-            nodeB = nodeFactory.createSCANode("http://localhost:8200/nodeB", "http://localhost:9999");
-            nodeB.addContribution("nodeB", cl.getResource("nodeB/"));
-            nodeB.addToDomainLevelComposite(new QName("http://sample", "CalculatorB"));
-
-            // sca-deployables test
-            nodeC = nodeFactory.createSCANode("http://localhost:8300/nodeC", "http://localhost:9999");
-            nodeC.addContribution("nodeC", cl.getResource("nodeC/"));
-            nodeC.addToDomainLevelComposite(new QName("http://sample", "CalculatorC")); 
-            nodeC.addToDomainLevelComposite(new QName("http://sample", "CalculatorC"));
-            
-            // start the domain
-            domain.start();
-            
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }  
-        
-   }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        // stop the domain
-        domain.stop();
-        
-        // destroy the nodes    
-        nodeA.destroy();
-        nodeB.destroy();    
-        nodeC.destroy();
-        
-        // destroy the domain
-        domain.destroy();
-    }
-    
-    //@Test
-    public void testKeepServerRunning() throws Exception {
-        System.out.println("press enter to continue");
-        System.in.read();
-    }    
-
-    @Test
-    public void testDomainProxyNode() throws Exception {   
-        // the domain proxy associated with each node used to get local services
-        calculatorServiceA = nodeA.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentA");
-        calculatorServiceB = nodeB.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentB");
-        
-        // Calculate
-        Assert.assertEquals(calculatorServiceA.add(3, 2), 5.0);
-        Assert.assertEquals(calculatorServiceA.subtract(3, 2), 1.0);
-        Assert.assertEquals(calculatorServiceA.multiply(3, 2), 6.0);
-        Assert.assertEquals(calculatorServiceA.divide(3, 2), 1.5);
-        Assert.assertEquals(calculatorServiceB.add(3, 2), 5.0);
-        Assert.assertEquals(calculatorServiceB.subtract(3, 2), 1.0);
-        Assert.assertEquals(calculatorServiceB.multiply(3, 2), 6.0);
-        Assert.assertEquals(calculatorServiceB.divide(3, 2), 1.5);
-        
-        // the domain proxy associate with each node used to get remote services
-        addServiceBDomainProxy = nodeA.getDomain().getService(AddService.class, "AddServiceComponentB");
-        
-        Assert.assertEquals(addServiceBDomainProxy.add(3, 2), 5.0);        
-    }
-    
-    @Test
-    public void testDomain() throws Exception {
-        // the domain itself 
-        addServiceBDomain = domain.getService(AddService.class, "AddServiceComponentB");
-        
-        System.out.println(((SCADomainProxyImpl)nodeA.getDomain()).getComposite(new QName("http://sample", "CalculatorA")));
-
-        Assert.assertEquals(addServiceBDomain.add(3, 2), 5.0);
-    }    
-    
-    @Test
-    public void testDomainProxyFinder() throws Exception {
-        // the domain proxy retrieved via the domain finder
-        SCADomainFinder domainFinder = SCADomainFinder.newInstance();
-        domainProxy = domainFinder.getSCADomain("http://localhost:9999");
-        addServiceBDomainFinder = domainProxy.getService(AddService.class, "AddServiceComponentB");
-  
-        Assert.assertEquals(addServiceBDomainFinder.add(3, 2), 5.0);
-        
-        System.out.println(domainProxy.getDomainLevelComposite());
-    }
-      
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
deleted file mode 100644
index ff8987da01..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
+++ /dev/null
@@ -1,85 +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 javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.domain.SCADomainFactory;
-import org.apache.tuscany.sca.node.SCADomainFinder;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.AddService;
-import calculator.CalculatorService;
-import calculator.SubtractService;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory 
- * implementation of the distributed domain. The test repeatedly
- * creates and destroys the node to see if memory is being leaked.
- * Looking for leaked memory is a manual task.
- */
-public class NodeMemoryTestCase {
-    
-    @Test
-    public void testDoNothing() throws Exception {
-        
-    }
-    
-    //@Test
-    public void testNodeMemoryUseage() throws Exception {   
-        
-        ClassLoader cl = NodeMemoryTestCase.class.getClassLoader();
-        SCANodeFactory nodeFactory;
-        SCANode   node;
-        CalculatorService calculatorServiceB;
-        SubtractService subtractServiceC;
-
-        for(int i=0; i < 40; i++) {
-            
-            nodeFactory = SCANodeFactory.newInstance();
-            node = nodeFactory.createSCANode("http://localhost:8200/node", null);
-            node.addContribution("nodeB", cl.getResource("nodeB/"));
-            node.addContribution("nodeC", cl.getResource("nodeC/"));
-            node.addToDomainLevelComposite(new QName("http://sample", "CalculatorB"));
-            node.addToDomainLevelComposite(new QName("http://sample", "CalculatorC"));
-            node.start();   
-            
-            calculatorServiceB = node.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentB");
-            subtractServiceC = node.getDomain().getService(SubtractService.class, "SubtractServiceComponentC");
-            
-            for(int j=0; j < 20; j++){
-                Assert.assertEquals(calculatorServiceB.subtract(3, 2), 1.0); 
-                Assert.assertEquals(subtractServiceC.subtract(3, 2), 1.0); 
-            }
-            
-            node.destroy();
-        }
-        
-        //com.ibm.jvm.Dump.HeapDump();          
-    }          
-}
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java b/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
deleted file mode 100644
index eef0374866..0000000000
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
+++ /dev/null
@@ -1,206 +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 javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.domain.SCADomainFactory;
-import org.apache.tuscany.sca.node.SCADomainFinder;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.AddService;
-import calculator.CalculatorService;
-import calculator.SubtractService;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory 
- * implementation of the distributed domain
- */
-public class StandaloneNodeTestCase {
-    
-    private static SCANodeFactory nodeFactory;
-    private static SCANode   node;
-    private static CalculatorService calculatorServiceA;
-    private static CalculatorService calculatorServiceB;    
-    private static CalculatorService calculatorServiceD;
-    private static AddService addServiceD;
-    private static SubtractService subtractServiceC;
-    private static ClassLoader cl;
-    
-
-    @BeforeClass
-    public static void init() throws Exception {
-             
-        try {
-            System.out.println("Setting up add node");
-            
-            cl = StandaloneNodeTestCase.class.getClassLoader();
-            nodeFactory = SCANodeFactory.newInstance();
-            
-        } catch(Exception ex){
-            System.err.println(ex.toString());
-        }  
-        
-   }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        // stop the node      
-        node.destroy();    
-    }
-    
-
-    @Test
-    public void testAddContributionAndStartNode() throws Exception {       
-        node = nodeFactory.createSCANode("http://localhost:8100/node", null);
-        node.addContribution("nodeC", cl.getResource("nodeC/"));
-        node.addToDomainLevelComposite(new QName("http://sample", "CalculatorC"));
-        node.start();
-       
-        // get a reference to various services in the node
-        subtractServiceC = node.getDomain().getService(SubtractService.class, "SubtractServiceComponentC");            
-    }    
-
-    @Test
-    public void testSubtract() throws Exception {       
-        Assert.assertEquals(subtractServiceC.subtract(3, 2), 1.0);        
-    }
-    
-    //@Test
-    public void testKeepServerRunning1() throws Exception {
-        System.out.println("press enter to continue");
-        System.in.read();
-    }  
-    
-    @Test
-    public void testStopNode() throws Exception {       
-        node.stop();
-        try {
-            subtractServiceC.subtract(3, 2); 
-// TODO - stopping the node doesn't actually stop the local wires?
-//            Assert.fail();
-        } catch (Exception ex) {
-           // System.out.println(ex.toString());
-        }       
-    }    
-    
-    @Test
-    public void testAddOtherContributionsAndStartNode() throws Exception {       
-        node.addContribution("nodeB", cl.getResource("nodeB/"));
-        node.addToDomainLevelComposite(new QName("http://sample", "CalculatorB"));
-        node.addContribution("nodeD", cl.getResource("nodeD/"));
-        node.addToDomainLevelComposite(new QName("http://sample", "CalculatorD"));
-        node.start();
-        subtractServiceC = node.getDomain().getService(SubtractService.class, "SubtractServiceComponentC");
-        calculatorServiceD = node.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentD");
-        calculatorServiceB = node.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentB");
-        addServiceD = node.getDomain().getService(AddService.class, "AddServiceComponentD");        
-        
-    } 
-    
-    //@Test
-    public void testKeepServerRunning2() throws Exception {
-        System.out.println("press enter to continue");
-        System.in.read();
-    }    
-    
-    @Test
-    public void testCalculate() throws Exception {         
-        // Calculate   
-        Assert.assertEquals(calculatorServiceB.add(3, 2), 5.0);
-        Assert.assertEquals(calculatorServiceB.subtract(3, 2), 1.0);
-        Assert.assertEquals(calculatorServiceB.multiply(3, 2), 6.0);
-        Assert.assertEquals(calculatorServiceB.divide(3, 2), 1.5);
-        Assert.assertEquals(calculatorServiceD.add(3, 2), 5.0);
-        Assert.assertEquals(calculatorServiceD.subtract(3, 2), 1.0);
-        Assert.assertEquals(calculatorServiceD.multiply(3, 2), 6.0);
-        Assert.assertEquals(calculatorServiceD.divide(3, 2), 1.5);
-        Assert.assertEquals(addServiceD.add(3, 2), 5.0);
-        Assert.assertEquals(subtractServiceC.subtract(3, 2), 1.0);        
-        
-    } 
-    
-    @Test
-    public void testRemoveContribution() throws Exception { 
-        node.stop();
-        node.removeContribution("nodeD");
-        
-        try {
-            calculatorServiceD.add(3, 2);
-            Assert.fail();
-        } catch (Exception ex) {
-            // System.out.println(ex.toString());
-        }            
-
-        calculatorServiceD = node.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentD");
-             
-        try {       
-            Assert.assertEquals(calculatorServiceD.add(3, 2), 5.0);
-            Assert.fail();
-        } catch (Exception ex) {
-            // System.out.println(ex.toString());
-        } 
-        
-    }
-    
-    @Test
-    public void testAddContributionBackAgain() throws Exception {       
-       
-        node.addContribution("nodeD", cl.getResource("nodeD/"));  
-        node.addToDomainLevelComposite(new QName("http://sample", "CalculatorD"));
-        node.start();
-        
-        calculatorServiceD = node.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentD");
-               
-        Assert.assertEquals(calculatorServiceD.add(3, 2), 5.0);
-        
-        // stop and remove all the contributions to date 
-        node.stop();
-        node.removeContribution("nodeB");
-        node.removeContribution("nodeC");
-        node.removeContribution("nodeD");        
-    }
-
-    @Test
-    public void testAddDepdendentContributions() throws Exception {   
-        node = nodeFactory.createSCANode("http://localhost:8200/node", null);
-        
-        // add one contribution that depends on another
-        node.addContribution("dependent", cl.getResource("calculatordependent/"));        
-        node.addContribution("primary", cl.getResource("calculatorprimary/"));
-        node.addToDomainLevelComposite(new QName("http://primary", "CalculatorA"));
-        node.start();
-        calculatorServiceA = node.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentA");
-        Assert.assertEquals(calculatorServiceA.add(3, 2), 5.0);
-        Assert.assertEquals(calculatorServiceA.subtract(3, 2), 1.0);
-        Assert.assertEquals(calculatorServiceA.multiply(3, 2), 6.0);
-        Assert.assertEquals(calculatorServiceA.divide(3, 2), 1.5);
-    }
-         
-            
-}