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

5 files changed, 20 insertions, 20 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml
index 7f02dc408e..0a1daf914b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/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-util-jaxws-runtime</artifactId>

     <name>Apache Tuscany SCA Tours JAX-WS Runtime Dependencies for JDK 5</name>

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml
index a499139eff..afb66cc792 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/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-util-launcher-common</artifactId>
     <name>Apache Tuscany SCA Tours Common Utility for Launchers</name>
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
index 0cae436c82..02a32ecf04 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
@@ -21,9 +21,9 @@ package scatours.launcher;
 
 import java.io.File;
 
-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.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 /**
  * This utility locates SCA contributions by name so that the launcher can work with various environments where 
@@ -34,9 +34,9 @@ public class LauncherUtil {
     /**
      * Locate an SCA contribution by name
      * @param name The name of the SCA contribution archive
-     * @return The SCAContribution
+     * @return The Contribution
      */
-    public static SCAContribution locate(String name) {
+    public static Contribution locate(String name) {
         // Try to use the target/classes directory inside Eclipse/Maven
         File file = new File("../../contributions/" + name + "/target/classes");
         if (!file.exists()) {
@@ -54,18 +54,18 @@ public class LauncherUtil {
                 }
             }
         }
-        return new SCAContribution(name, file.toURI().toString());
+        return new Contribution(name, file.toURI().toString());
     }
 
     /**
      * Locate an SCA contribution by replacing the ${name} in the pattern 
      * @param urlPattern The url pattern that contains ${name}
      * @param name The name of the contribution archive
-     * @return The SCAContribution
+     * @return The Contribution
      */
-    public static SCAContribution locate(String urlPattern, String name) {
+    public static Contribution locate(String urlPattern, String name) {
         String url = urlPattern.replace("${name}", name);
-        return new SCAContribution(name, url);
+        return new Contribution(name, url);
     }
 
     /**
@@ -74,13 +74,13 @@ public class LauncherUtil {
      * @param contributionNames
      * @return
      */
-    public static SCANode createNode(String composite, String... contributionNames) {
-        SCAContribution[] contributions = new SCAContribution[contributionNames.length];
+    public static Node createNode(String composite, String... contributionNames) {
+        Contribution[] contributions = new Contribution[contributionNames.length];
         int index = 0;
         for (String name : contributionNames) {
             contributions[index++] = locate(name);
         }
-        SCANode node = SCANodeFactory.newInstance().createSCANode(composite, contributions);
+        Node node = NodeFactory.getInstance().createNode(composite, contributions);
         return node;
     }
 }
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
index b78fd646d6..c6b5a02097 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/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-util-openejb-runtime</artifactId>

     <name>Apache Tuscany SCA Tours OpenEJB Runtime Dependencies</name>

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml
index 7f987f9afd..6426cd5189 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/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-util</artifactId>

     <packaging>pom</packaging>

     <name>Apache Tuscany SCA Tours Utilities</name>