3 files changed, 16 insertions, 17 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
index 1ded112193..f478aadae0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
@@ -21,21 +21,20 @@ 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.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 public class JumpstartLauncher {
 
     public static void main(String[] args) throws Exception {
-        SCAContribution gvtContribution = locate("introducing-trips");
+        Contribution gvtContribution = locate("introducing-trips");
 
-        SCANode node = SCANodeFactory.newInstance().createSCANode("trips.composite", gvtContribution);
+        Node node = NodeFactory.getInstance().createNode("trips.composite", gvtContribution);
 
         node.start();
 
-        Trips tripProvider = ((SCAClient)node).getService(Trips.class, "TripProvider/Trips");
+        Trips tripProvider = node.getService(Trips.class, "TripProvider/Trips");
 
         System.out.println("Trip boooking code = " + tripProvider.checkAvailability("FS1APR4", 1));
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
index a7abf8e08d..32db895bf4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
@@ -18,7 +18,7 @@
  */
 package scatours;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface Trips {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
index 4da7c54917..12654494ac 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.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;
@@ -31,21 +31,21 @@ import org.junit.Test;
  */
 public class JumpstartTestCase {
 
-    private SCANode node;
+    private Node node;
 
     @Before
     public void startServer() throws Exception {
         node =
-            SCANodeFactory.newInstance()
-                .createSCANode("trips.composite",
-                               new SCAContribution("introducing-trips",
+            NodeFactory.getInstance()
+                .createNode("trips.composite",
+                               new Contribution("introducing-trips",
                                                    "../../contributions/introducing-trips/target/classes"));
         node.start();
     }
 
     @Test
     public void testClient() throws Exception {
-        Trips tripProvider = ((SCAClient)node).getService(Trips.class, "TripProvider/Trips");
+        Trips tripProvider = ((Node)node).getService(Trips.class, "TripProvider/Trips");
         System.out.println("Trip boooking code = " + tripProvider.checkAvailability("FS1APR4", 2));
     }