Introduce a LauncherUtil to locate contributions by name

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@833142 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 18 insertions, 10 deletions

diff --git a/sandbox/travelsample/launchers/interaction/pom.xml b/sandbox/travelsample/launchers/interaction/pom.xml
index e66bf1c1df..4195f386cc 100644
--- a/sandbox/travelsample/launchers/interaction/pom.xml
+++ b/sandbox/travelsample/launchers/interaction/pom.xml
@@ -29,6 +29,13 @@
     <name>Apache Tuscany SCA Tours Interaction Launcher</name>

 

     <dependencies>

+    

+        <dependency>

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

+            <artifactId>scatours-launcher-common</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+            

         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

diff --git a/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java b/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
index 6ab50cb712..315233f40f 100644
--- a/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
+++ b/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
@@ -19,8 +19,9 @@
 

 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;

 

@@ -28,17 +29,17 @@ public class InteractionLauncher {
 

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

     	SCANode node1 = SCANodeFactory.newInstance().createSCANode("client.composite", 

-            new SCAContribution("common", "../../contributions/common/target/classes"),

-            new SCAContribution("currency", "../../contributions/currency/target/classes"),

-            new SCAContribution("calendar", "../../contributions/calendar/target/classes"),

-            new SCAContribution("shoppingcart", "../../contributions/shoppingcart/target/classes"),

-            new SCAContribution("client", "../../contributions/interaction-client/target/classes"));

+            locate("common"),

+            locate("currency"),

+            locate("calendar"),

+            locate("shoppingcart"),

+            locate("client"));

     	

     	SCANode node2 = SCANodeFactory.newInstance().createSCANode("service.composite", 

-            new SCAContribution("common", "../../contributions/common/target/classes"),

-            new SCAContribution("hotel", "../../contributions/hotel/target/classes"),

-            new SCAContribution("flight", "../../contributions/flight/target/classes"),

-            new SCAContribution("remoteService", "../../contributions/interaction-service-remote/target/classes"));

+            locate("common"),

+            locate("hotel"),

+            locate("flight"),

+            locate("remoteService"));

 

     	node2.start();

         node1.start();