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, 10 insertions, 10 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
index b8067e75f2..4dd36bfcfc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/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-feed-logger</artifactId>

     <name>Apache Tuscany SCA Tours Feed Logger Launcher</name>

 

@@ -53,7 +53,7 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>${tuscany.version}</version>

         </dependency>

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
index 4aea24dbfe..35c3560645 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.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.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 scatours.feedlogger.FeedLogger;

 

 public class FeedLoggerLauncher {

 

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

-        SCAContribution feedContribution = locate("feed-logger");

+        Contribution feedContribution = locate("feed-logger");

 

-        SCANode node = SCANodeFactory.newInstance().createSCANode("feed-logger.composite", feedContribution);

+        Node node = NodeFactory.getInstance().createNode("feed-logger.composite", feedContribution);

         node.start();

 

-        FeedLogger logger = ((SCAClient)node).getService(FeedLogger.class, "FeedLogger");

+        FeedLogger logger = ((Node)node).getService(FeedLogger.class, "FeedLogger");

         logger.logFeeds(5);

 

         node.stop();