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

1 files changed, 9 insertions, 9 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
index 2904349a49..48d229f2f0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
@@ -21,27 +21,27 @@ 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.notification.Notification;

 

 public class NotificationRMILauncher {

 

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

-        SCAContribution notificationContribution = locate("notification");

-        SCAContribution notificationRMIContribution = locate("notification-rmi");

+        Contribution notificationContribution = locate("notification");

+        Contribution notificationRMIContribution = locate("notification-rmi");

 

-        SCANode node =

-            SCANodeFactory.newInstance().createSCANode("notification-rmi.composite",

+        Node node =

+            NodeFactory.getInstance().createNode("notification-rmi.composite",

                                                        notificationContribution,

                                                        notificationRMIContribution);

         node.start();

 

         System.out.println("Quick notification test");

-        Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");

+        Notification notification = ((Node)node).getService(Notification.class, "Notification");

         String accountID = "1234";

         String subject = "Holiday payment taken";

         String message = "Payment of £102.37 accepted...";