You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/05/31 17:37:54 UTC

svn commit: r780458 - in /tuscany/sandbox/travelsample/launchers: fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java

Author: slaws
Date: Sun May 31 15:37:54 2009
New Revision: 780458

URL: http://svn.apache.org/viewvc?rev=780458&view=rev
Log:
Launcher updates to take account of latest contribution changes

Modified:
    tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
    tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java

Modified: tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java?rev=780458&r1=780457&r2=780458&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java Sun May 31 15:37:54 2009
@@ -47,7 +47,12 @@
 	           new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"),
 	           new SCAContribution("shoppingcart", "../../contributions/shoppingcart-contribution/target/classes"),
 	           new SCAContribution("scatours", "../../contributions/scatours-contribution/target/classes"),
-	           new SCAContribution("ui", "../../contributions/fullapp-ui-contribution/target/classes"));
+	           new SCAContribution("fullapp-ui", "../../contributions/fullapp-ui-contribution/target/classes"),
+	           new SCAContribution("fullapp-frontend", "../../contributions/fullapp-frontend-contribution/target/classes"),
+	           new SCAContribution("fullapp-currency", "../../contributions/fullapp-currency-contribution/target/classes"),
+	           new SCAContribution("fullapp-packagedtrip", "../../contributions/fullapp-packagedtrip-contribution/target/classes"),
+	           new SCAContribution("fullapp-bespoketrip", "../../contributions/fullapp-bespoketrip-contribution/target/classes"),
+	           new SCAContribution("fullapp-shoppingcart", "../../contributions/fullapp-shoppingcart-contribution/target/classes"));
 
             node1.start();
 

Modified: tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java?rev=780458&r1=780457&r2=780458&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java Sun May 31 15:37:54 2009
@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 
+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;
@@ -32,31 +33,26 @@
     
     // OK for development but you must launch the node from this module 
     public static void launchFromFileSystemDir(){
-        SCANode node = null; 
         
         try {
-            node = SCANodeFactory.newInstance().createSCANode("scatours.composite", 
-                                                               new SCAContribution("common", "../../contributions/common-contribution/target/classes"),
-                                                               new SCAContribution("currency", "../../contributions/currency-contribution/target/classes"),
-                                                               new SCAContribution("hotel", "../../contributions/hotel-contribution/target/classes"),
-                                                               new SCAContribution("flight", "../../contributions/flight-contribution/target/classes"),
-                                                               new SCAContribution("car", "../../contributions/car-contribution/target/classes"),
-                                                               new SCAContribution("trip", "../../contributions/trip-contribution/target/classes"),
-                                                               new SCAContribution("tripbooking", "../../contributions/tripbooking-contribution/target/classes"),
-                                                               new SCAContribution("travelcatalog", "../../contributions/travelcatalog-contribution/target/classes"),
-                                                               new SCAContribution("payment", "../../contributions/payment-java-contribution/target/classes"),
-                                                               new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"),
-                                                               new SCAContribution("shoppingcart", "../../contributions/shoppingcart-contribution/target/classes"),
-                                                               new SCAContribution("scatours", "../../contributions/scatours-contribution/target/classes"),
-                                                               new SCAContribution("ui", "../../contribution/interaction-ui-contribution/target/classes"));
-            node.start();
+        	SCANode node1 = SCANodeFactory.newInstance().createSCANode("client.composite", 
+                new SCAContribution("common", "../../contributions/common-contribution/target/classes"),
+                new SCAContribution("calendar", "../../contributions/calendar-contribution/target/classes"),
+                new SCAContribution("client", "../../contributions/interaction-client-contribution/target/classes"));
+        	
+        	SCANode node2 = SCANodeFactory.newInstance().createSCANode("client.composite", 
+                    new SCAContribution("common", "../../contributions/common-contribution/target/classes"),
+                    new SCAContribution("hotel", "../../contributions/hotel-contribution/target/classes"),
+                    new SCAContribution("remoteService", "../../contributions/interaction-service-remote-contribution/target/classes"));
+
+        	node2.start();
+            node1.start();
             
-            System.out.println("Node started - Press enter to shutdown.");
-            try {
-                System.in.read();
-            } catch (IOException e) {}
+            Runnable runner = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable");
+            runner.run();
             
-            node.stop();
+            node1.stop();
+            node2.stop();
             
         } catch (Exception ex) {
             System.out.println(ex.toString());