3 files changed, 30 insertions, 30 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java
index 2cf08ec420..6115833182 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java
@@ -21,10 +21,10 @@ package scatours;
 
 import org.apache.activemq.broker.BrokerService;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -35,7 +35,7 @@ import org.junit.Test;
 public class BuildingBlocksApplTestCase {
 
     private BrokerService jmsBroker;
-    private SCANode node1, node2;
+    private Node node1, node2;
 
     @Before
     public void startServer() throws Exception {
@@ -44,12 +44,12 @@ public class BuildingBlocksApplTestCase {
         jmsBroker.setUseJmx(false);
         jmsBroker.addConnector("tcp://localhost:61619");
 
-        node1 = SCANodeFactory.newInstance().createSCANode("tours-appl.composite",
-                    new SCAContribution("introducing-trips", "../introducing-trips/target/classes"),
-                    new SCAContribution("buildingblocks", "../buildingblocks/target/classes"));
+        node1 = NodeFactory.getInstance().createNode("tours-appl.composite",
+                    new Contribution("introducing-trips", "../introducing-trips/target/classes"),
+                    new Contribution("buildingblocks", "../buildingblocks/target/classes"));
 
-        node2 = SCANodeFactory.newInstance().createSCANode("tours-appl-client.composite",
-                    new SCAContribution("buildingblocks-client", "./target/classes"));
+        node2 = NodeFactory.getInstance().createNode("tours-appl-client.composite",
+                    new Contribution("buildingblocks-client", "./target/classes"));
 
         jmsBroker.start();
         node1.start();
@@ -58,7 +58,7 @@ public class BuildingBlocksApplTestCase {
 
     @Test
     public void testAppl() {
-        Runnable client = ((SCAClient)node2).getService(Runnable.class, "ApplClient/Runnable");
+        Runnable client = ((Node)node2).getService(Runnable.class, "ApplClient/Runnable");
         client.run();
     }
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
index ad48db5616..ebc278f5b4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
@@ -19,10 +19,10 @@
 
 package scatours;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -32,21 +32,21 @@ import org.junit.Test;
  */
 public class BuildingBlocksImplIncludeTestCase {
 
-    private SCANode node;
+    private Node node;
 
     @Before
     public void startServer() throws Exception {
-        node = SCANodeFactory.newInstance().createSCANode("tours-impl-include-client.composite",
-                   new SCAContribution("introducing-trips", "../introducing-trips/target/classes"),
-                   new SCAContribution("buildingblocks", "../buildingblocks/target/classes"),
-                   new SCAContribution("buildingblocks-client", "./target/classes"));
+        node = NodeFactory.getInstance().createNode("tours-impl-include-client.composite",
+                   new Contribution("introducing-trips", "../introducing-trips/target/classes"),
+                   new Contribution("buildingblocks", "../buildingblocks/target/classes"),
+                   new Contribution("buildingblocks-client", "./target/classes"));
 
         node.start();
     }
 
     @Test
     public void testImplInclude() {
-        Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+        Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
         client.run();
     }
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java
index c4cffa3e02..9356a2b146 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java
@@ -19,10 +19,10 @@
 
 package scatours;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -32,20 +32,20 @@ import org.junit.Test;
  */
 public class BuildingBlocksImplTestCase {
 
-    private SCANode node;
+    private Node node;
 
     @Before
     public void startServer() throws Exception {
-        node = SCANodeFactory.newInstance().createSCANode("tours-impl-client.composite",
-                   new SCAContribution("buildingblocks", "../buildingblocks/target/classes"),
-                   new SCAContribution("buildingblocks-client", "./target/classes"));
+        node = NodeFactory.getInstance().createNode("tours-impl-client.composite",
+                   new Contribution("buildingblocks", "../buildingblocks/target/classes"),
+                   new Contribution("buildingblocks-client", "./target/classes"));
 
         node.start();
     }
 
     @Test
     public void testImpl() {
-        Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+        Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
         client.run();
     }