5 files changed, 29 insertions, 29 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
index 95d2077d0e..c0e8f0c83d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/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-fullapp-domain</artifactId>
     <name>Apache Tuscany SCA Tours Full App Domain Launcher</name>
     
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
index 34d2007daa..26bab49e0d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/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-fullapp-nodes</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Nodes Launcher</name>
 
@@ -125,7 +125,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
index 4d6459b749..cd618a45e0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
@@ -21,41 +21,41 @@ package scatours;
 
 import java.io.IOException;
 
-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.NodeFactory;
 
 public class FullAppNodesLauncher {
 
     public static void main(String[] args) throws Exception {
-        SCANode nodeCreditcard =
-            SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/creditcard");
+        Node nodeCreditcard =
+            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/creditcard");
         nodeCreditcard.start();
 
-        SCANode nodePayment =
-            SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/payment");
+        Node nodePayment =
+            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/payment");
         nodePayment.start();
 
-        SCANode nodeShoppingcart =
-            SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/shoppingcart");
+        Node nodeShoppingcart =
+            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/shoppingcart");
         nodeShoppingcart.start();
 
-        SCANode nodeCurrency =
-            SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/currency");
+        Node nodeCurrency =
+            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/currency");
         nodeCurrency.start();
 
-        SCANode nodePackagedtrip =
-            SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/packagedtrip");
+        Node nodePackagedtrip =
+            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/packagedtrip");
         nodePackagedtrip.start();
 
-        SCANode nodeBespoketrip =
-            SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/bespoketrip");
+        Node nodeBespoketrip =
+            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/bespoketrip");
         nodeBespoketrip.start();
 
-        SCANode nodeFrontend =
-            SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/coordination");
+        Node nodeFrontend =
+            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/coordination");
         nodeFrontend.start();
 
-        SCANode nodeUI = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ui");
+        Node nodeUI = NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/ui");
         nodeUI.start();
 
         System.out.println("Point your browser at - http://localhost:8080/scatours/ ");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
index 24b4624912..c9e810e44a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
@@ -22,10 +22,10 @@
     <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>
+    <version>2.0-SNAPSHOT</version>
     <artifactId>scatours-launcher-fullapp</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Launcher</name>
 
@@ -127,7 +127,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
index ab1b7d031b..c3f68e2d60 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
@@ -23,14 +23,14 @@ import static scatours.launcher.LauncherUtil.locate;
 
 import java.io.IOException;
 
-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.NodeFactory;
 
 public class FullAppLauncher {
 
     public static void main(String[] args) throws Exception {
-        SCANode node =
-            SCANodeFactory.newInstance().createSCANode(null,
+        Node node =
+            NodeFactory.getInstance().createNode(
                                                        locate("common"),
                                                        locate("currency"),
                                                        locate("hotel"),