Update the travelsample with 2.x namespace/api/dependency (not completed yet)

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

2 files changed, 15 insertions, 15 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
index 7e15913e53..c259624844 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/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-interaction</artifactId>

     <name>Apache Tuscany SCA Tours Interaction Launcher</name>

 

@@ -59,7 +59,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/interaction/src/main/java/scatours/InteractionLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
index b3e0e52f2e..9b66a5c838 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
@@ -21,23 +21,23 @@ 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 InteractionLauncher {

 

     public static void main(String[] args) throws Exception {

-        SCANode node1 =

-            SCANodeFactory.newInstance().createSCANode("client.composite",

+        Node node1 =

+            NodeFactory.getInstance().createNode("client.composite",

                                                        locate("common"),

                                                        locate("currency"),

                                                        locate("calendar"),

                                                        locate("shoppingcart"),

                                                        locate("interaction-client"));

 

-        SCANode node2 =

-            SCANodeFactory.newInstance().createSCANode("service.composite",

+        Node node2 =

+            NodeFactory.getInstance().createNode("service.composite",

                                                        locate("common"),

                                                        locate("hotel"),

                                                        locate("flight"),

@@ -46,22 +46,22 @@ public class InteractionLauncher {
         node2.start();

         node1.start();

 

-        Runnable localInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionLocalClient/Runnable");

+        Runnable localInteraction = ((Node)node1).getService(Runnable.class, "InteractionLocalClient/Runnable");

         localInteraction.run();

 

-        Runnable remoteInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable");

+        Runnable remoteInteraction = ((Node)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable");

         remoteInteraction.run();

 

         Runnable requestResponseInteraction =

-            ((SCAClient)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable");

+            ((Node)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable");

         requestResponseInteraction.run();

 

         Runnable onewayCallbackInteraction =

-            ((SCAClient)node1).getService(Runnable.class, "InteractionOneWayCallbackClient/Runnable");

+            ((Node)node1).getService(Runnable.class, "InteractionOneWayCallbackClient/Runnable");

         onewayCallbackInteraction.run();

 

         Runnable conversationalInteraction =

-            ((SCAClient)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");

+            ((Node)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");

         conversationalInteraction.run();

 

         node1.stop();