3 files changed, 19 insertions, 19 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
index 98c8627d6c..4294dd2a96 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
@@ -22,9 +22,9 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>scatours</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent><version>2.0-SNAPSHOT</version>
     <artifactId>scatours-launcher-introducing</artifactId>
     <name>Apache Tuscany SCA Tours Introducing Launcher</name>
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
index 4ad19762d9..7008c834b8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
@@ -21,22 +21,22 @@ package scatours;
 
 import static scatours.launcher.LauncherUtil.locate;
 
-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.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 public class IntroducingLauncher {
 
     public static void main(String[] args) throws Exception {
-        SCANode node =
-            SCANodeFactory.newInstance().createSCANode(null,
+        Node node =
+            NodeFactory.getInstance().createNode(
                                                        locate("introducing-tours"),
                                                        locate("introducing-trips"),
                                                        locate("introducing-client"));
 
         node.start();
 
-        Runnable proxy = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
+        Runnable proxy = ((Node)node).getService(Runnable.class, "TestClient/Runnable");
         proxy.run();
 
         node.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
index 573d2e76bd..5270cbabe6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
@@ -18,10 +18,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;
@@ -33,25 +33,25 @@ import org.junit.Test;
  */
 public class IntroducingTestCase {
 
-    private SCANode node;
+    private Node node;
 
     @Before
     public void startServer() throws Exception {
         node =
-            SCANodeFactory.newInstance()
-                .createSCANode(null,
-                               new SCAContribution("introducing-tours",
+            NodeFactory.getInstance()
+                .createNode(
+                               new Contribution("introducing-tours",
                                                    "../../contributions/introducing-tours/target/classes"),
-                               new SCAContribution("introducing-trips",
+                               new Contribution("introducing-trips",
                                                    "../../contributions/introducing-trips/target/classes"),
-                               new SCAContribution("introducing-client",
+                               new Contribution("introducing-client",
                                                    "../../contributions/introducing-client/target/classes"));
         node.start();
     }
 
     @Test
     public void testClient() throws Exception {
-        Runnable proxy = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
+        Runnable proxy = ((Node)node).getService(Runnable.class, "TestClient/Runnable");
         proxy.run();
     }