Work in progress. Fixed implementation of NodeImpl, now working without dependencies on implementations from other bundles (except RuntimeAssemblyFactory, which will need to be cleaned up too). Started to remove dependencies on host-embedded and port code to NodeFactory and Node, as an interim step to bring them up, before porting them to the OSGi-enabled node launcher.

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

7 files changed, 55 insertions, 39 deletions

diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 3ff6c8969a..306ce68327 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
@@ -19,8 +19,8 @@
 
 package node;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.launcher.NodeLauncher;
 import org.osoa.sca.ServiceRuntimeException;
 
@@ -29,7 +29,7 @@ import calculator.CalculatorService;
 public class LaunchCalculatorNodeA {
     public static void main(String[] args) throws Exception {
         
-        SCANode node = null;
+        Node node = null;
         try {
             
             NodeLauncher nodeLauncher = NodeLauncher.newInstance();
@@ -38,7 +38,7 @@ public class LaunchCalculatorNodeA {
             node.start();
             
             // get a reference to the calculator component
-            SCAClient client = (SCAClient)node;
+            Client client = (Client)node;
             CalculatorService calculatorService = 
                 client.getService(CalculatorService.class, "CalculatorServiceComponentA");
             
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index 2a6f3af002..cd6e934854 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
@@ -21,9 +21,9 @@ package calculator;
 

 import junit.framework.Assert;

 

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

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

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

+import org.apache.tuscany.sca.node.Client;

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

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

 import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

@@ -35,10 +35,10 @@ import org.junit.Test;
  */

 public class CalculatorDistributedTestCase {

 

-    private static SCANode manager;

-    private static SCANode nodeA;

-    private static SCANode nodeB;

-    private static SCANode nodeC;

+    private static Node manager;

+    private static Node nodeA;

+    private static Node nodeB;

+    private static Node nodeC;

 

     private static CalculatorService calculatorService;

     

@@ -53,16 +53,16 @@ public class CalculatorDistributedTestCase {
             manager = managerLauncher.createDomainManager();

             manager.start();

             

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            nodeC  = nodeFactory.createSCANodeFromURL("http://localhost:9990/node-config/NodeC");

-            nodeB  = nodeFactory.createSCANodeFromURL("http://localhost:9990/node-config/NodeB");

-            nodeA  = nodeFactory.createSCANodeFromURL("http://localhost:9990/node-config/NodeA");

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            nodeC  = nodeFactory.createNode("http://localhost:9990/node-config/NodeC");

+            nodeB  = nodeFactory.createNode("http://localhost:9990/node-config/NodeB");

+            nodeA  = nodeFactory.createNode("http://localhost:9990/node-config/NodeA");

 

             nodeC.start();

             nodeB.start();

             nodeA.start();

             

-            SCAClient client = (SCAClient)nodeA;

+            Client client = (Client)nodeA;

             calculatorService = 

                 client.getService(CalculatorService.class, "CalculatorServiceComponentA");

 

diff --git a/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
index 83c0e7c9ff..28d83fac4a 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
+++ b/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
@@ -20,7 +20,7 @@ package calculator;
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
 import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
@@ -35,7 +35,7 @@ import org.osoa.sca.annotations.Scope;
 public class CalculatorTestCase extends TestCase {
 
     private NodeLauncher launcher;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
@@ -48,8 +48,11 @@ public class CalculatorTestCase extends TestCase {
 
     @Override
     protected void tearDown() throws Exception {
-        if (launcher != null) {
+        if (node != null) {
             node.stop();
+            node.destroy();
+        }
+        if (launcher != null) {
             launcher.destroy();
         }
     }
diff --git a/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
index a007a28f21..f965e710d5 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
+++ b/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
@@ -20,8 +20,10 @@ package calculator;
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.osoa.sca.annotations.EagerInit;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
@@ -33,7 +35,7 @@ import org.osoa.sca.annotations.Scope;
 public class CalculatorTestCase extends TestCase {
 
     private static CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
     
     @Reference
     public void setCalculatorService(CalculatorService calculatorService) {
@@ -42,14 +44,16 @@ public class CalculatorTestCase extends TestCase {
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANodeFromClassLoader("CalculatorTest.composite", getClass().getClassLoader());
+        NodeFactory factory = NodeFactory.newInstance();
+        String contribution = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
+        node = factory.createNode("CalculatorTest.composite", new Contribution("calculator", contribution));
         node.start();
     }
 
     @Override
     protected void tearDown() throws Exception {
         node.stop();
+        node.destroy();
     }
 
     public void testCalculator() throws Exception {
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java b/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
index c3122cca7c..4fd7b8520d 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
+++ b/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
@@ -18,7 +18,7 @@
  */
 package calculator.rcp;
 
-import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
 import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
@@ -38,7 +38,7 @@ public class Activator extends AbstractUIPlugin {
     private static Activator plugin;
 
     private NodeLauncher launcher;
-    private SCANode node;
+    private Node node;
 
     public Activator() {
     }
@@ -58,6 +58,7 @@ public class Activator extends AbstractUIPlugin {
         super.stop(context);
         if (node != null) {
             node.stop();
+            node.destroy();
         }
         if (launcher != null) {
             launcher.destroy();
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java b/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 3b2966e96d..3f0bcd15c9 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
@@ -19,9 +19,11 @@
 
 package calculator;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 /**
  * This client program shows how to create an SCA runtime, start it,
@@ -30,11 +32,12 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 public class CalculatorClient {
     public static void main(String[] args) throws Exception {
 
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("Calculator.composite", CalculatorClient.class.getClassLoader());
+        NodeFactory factory = NodeFactory.newInstance();
+        String contribution = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
+        Node node = factory.createNode("Calculator.composite", new Contribution("calculator", contribution));
         node.start();
         
-        CalculatorService calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        CalculatorService calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
         
         // Calculate
         System.out.println("3 + 2=" + calculatorService.add(3, 2));
@@ -43,6 +46,7 @@ public class CalculatorClient {
         System.out.println("3 / 2=" + calculatorService.divide(3, 2));
 
         node.stop();
+        node.destroy();
     }
 
 }
diff --git a/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 1b7476534a..1a880d2656 100644
--- a/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
@@ -20,9 +20,11 @@ package calculator;
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 /**
  * This shows how to test the Calculator service component.
@@ -30,20 +32,22 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 public class CalculatorTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANodeFromClassLoader("Calculator.composite", getClass().getClassLoader());
+        NodeFactory factory = NodeFactory.newInstance();
+        String contribution = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
+        node = factory.createNode("Calculator.composite", new Contribution("calculator", contribution));
         node.start();
         
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
     protected void tearDown() throws Exception {
         node.stop();
+        node.destroy();
     }
 
     public void testCalculator() throws Exception {