Update dependencies so that jars are set on the launchers' classpath

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

24 files changed, 54 insertions, 73 deletions

diff --git a/sandbox/travelsample/distribution/src/main/components/bin-modules.xml b/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
index 2a3e93583e..1e84f323c4 100644
--- a/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
+++ b/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
@@ -48,6 +48,7 @@
 
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
             <includes>
                 <include>org.apache.tuscany.sca:scatours-launcher-common</include>
diff --git a/sandbox/travelsample/launchers/blog-feed/pom.xml b/sandbox/travelsample/launchers/blog-feed/pom.xml
index 440ac4e713..e97bf59ff7 100644
--- a/sandbox/travelsample/launchers/blog-feed/pom.xml
+++ b/sandbox/travelsample/launchers/blog-feed/pom.xml
@@ -40,6 +40,7 @@
             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-impl</artifactId>

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

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/currency-converter-corba/pom.xml b/sandbox/travelsample/launchers/currency-converter-corba/pom.xml
index 7af66cbaa6..1025b111ee 100644
--- a/sandbox/travelsample/launchers/currency-converter-corba/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-corba/pom.xml
@@ -51,9 +51,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/currency-converter-jms/pom.xml b/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
index 2c9f6a7ec1..cecd6c45b9 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
@@ -51,9 +51,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml b/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
index f255952b62..357170fc6a 100644
--- a/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
@@ -51,9 +51,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/currency-converter-ws/pom.xml b/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
index 326dc3e692..4763ddd9b9 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
@@ -52,9 +52,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/currency-converter/pom.xml b/sandbox/travelsample/launchers/currency-converter/pom.xml
index ca15f58f36..0dbce0f089 100644
--- a/sandbox/travelsample/launchers/currency-converter/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter/pom.xml
@@ -44,16 +44,16 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

             <scope>runtime</scope>

         </dependency>

-

+        

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/databinding/pom.xml b/sandbox/travelsample/launchers/databinding/pom.xml
index 78873a8263..648bcbb237 100644
--- a/sandbox/travelsample/launchers/databinding/pom.xml
+++ b/sandbox/travelsample/launchers/databinding/pom.xml
@@ -45,20 +45,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java b/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
index 61f6b74582..c62f0d34ab 100644
--- a/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
+++ b/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
@@ -27,9 +27,9 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 
 public class DatabindingLauncher {
     public static void main(String[] args) throws Exception {
-        SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, locate("paymentjava"), locate("client"));
+        SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, locate("payment-java"), locate("client"));
 
-        SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, locate("creditcardpaymentsdo"));
+        SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, locate("creditcard-payment-sdo"));
 
         node1.start();
         node2.start();
diff --git a/sandbox/travelsample/launchers/feed-logger/pom.xml b/sandbox/travelsample/launchers/feed-logger/pom.xml
index 3a3d6025c8..bd56dadd30 100644
--- a/sandbox/travelsample/launchers/feed-logger/pom.xml
+++ b/sandbox/travelsample/launchers/feed-logger/pom.xml
@@ -41,6 +41,7 @@
             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-impl</artifactId>

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

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/fullapp/pom.xml b/sandbox/travelsample/launchers/fullapp/pom.xml
index e329a1bd06..3afc431053 100644
--- a/sandbox/travelsample/launchers/fullapp/pom.xml
+++ b/sandbox/travelsample/launchers/fullapp/pom.xml
@@ -63,20 +63,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java b/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
index 5e533c77c6..89a0e5c405 100644
--- a/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
+++ b/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
@@ -39,9 +39,9 @@ public class FullAppLauncher {
                                                        locate("trip"),
                                                        locate("tripbooking"),
                                                        locate("travelcatalog"),
-                                                       locate("payment"),
-                                                       //locate("payment"),
-                                                       locate("creditcard"),
+                                                       locate("payment-java"),
+                                                       //locate("payment-spring"),
+                                                       locate("creditcard-payment-jaxb"),
                                                        locate("shoppingcart"),
                                                        locate("scatours"),
                                                        locate("fullapp-ui"),
diff --git a/sandbox/travelsample/launchers/help-pages/pom.xml b/sandbox/travelsample/launchers/help-pages/pom.xml
index 236bde6a45..ff4e02f8cd 100644
--- a/sandbox/travelsample/launchers/help-pages/pom.xml
+++ b/sandbox/travelsample/launchers/help-pages/pom.xml
@@ -44,9 +44,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/interaction/pom.xml b/sandbox/travelsample/launchers/interaction/pom.xml
index 80da7b54f1..11b0caef6e 100644
--- a/sandbox/travelsample/launchers/interaction/pom.xml
+++ b/sandbox/travelsample/launchers/interaction/pom.xml
@@ -44,7 +44,7 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

             <scope>runtime</scope>

         </dependency>

diff --git a/sandbox/travelsample/launchers/introducing-client/pom.xml b/sandbox/travelsample/launchers/introducing-client/pom.xml
index 31e6b9298c..814578873f 100644
--- a/sandbox/travelsample/launchers/introducing-client/pom.xml
+++ b/sandbox/travelsample/launchers/introducing-client/pom.xml
@@ -44,9 +44,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/introducing/pom.xml b/sandbox/travelsample/launchers/introducing/pom.xml
index 8102a8e2f7..2dbbfc3b5c 100644
--- a/sandbox/travelsample/launchers/introducing/pom.xml
+++ b/sandbox/travelsample/launchers/introducing/pom.xml
@@ -51,9 +51,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/jumpstart/pom.xml b/sandbox/travelsample/launchers/jumpstart/pom.xml
index 93b4a3c7c9..a2b90df992 100644
--- a/sandbox/travelsample/launchers/jumpstart/pom.xml
+++ b/sandbox/travelsample/launchers/jumpstart/pom.xml
@@ -49,11 +49,11 @@
             <scope>runtime</scope>

         </dependency>

 

-        <dependency>

+         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/notification-corba/pom.xml b/sandbox/travelsample/launchers/notification-corba/pom.xml
index ed1e00a1f1..1951487d0c 100644
--- a/sandbox/travelsample/launchers/notification-corba/pom.xml
+++ b/sandbox/travelsample/launchers/notification-corba/pom.xml
@@ -51,9 +51,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

-            <scope>test</scope>

+            <artifactId>tuscany-node-impl</artifactId>

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

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/notification-ejb/pom.xml b/sandbox/travelsample/launchers/notification-ejb/pom.xml
index 1ad1e6ca74..84cbe23c44 100644
--- a/sandbox/travelsample/launchers/notification-ejb/pom.xml
+++ b/sandbox/travelsample/launchers/notification-ejb/pom.xml
@@ -51,9 +51,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/notification-jms/pom.xml b/sandbox/travelsample/launchers/notification-jms/pom.xml
index d9bbbd8456..7192413c46 100644
--- a/sandbox/travelsample/launchers/notification-jms/pom.xml
+++ b/sandbox/travelsample/launchers/notification-jms/pom.xml
@@ -44,16 +44,16 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

             <scope>runtime</scope>

         </dependency>

-

+        

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/notification-rmi/pom.xml b/sandbox/travelsample/launchers/notification-rmi/pom.xml
index ae42108069..53e10b588b 100644
--- a/sandbox/travelsample/launchers/notification-rmi/pom.xml
+++ b/sandbox/travelsample/launchers/notification-rmi/pom.xml
@@ -51,9 +51,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/notification-ws/pom.xml b/sandbox/travelsample/launchers/notification-ws/pom.xml
index 4312bfedac..d0ea8b223a 100644
--- a/sandbox/travelsample/launchers/notification-ws/pom.xml
+++ b/sandbox/travelsample/launchers/notification-ws/pom.xml
@@ -51,9 +51,9 @@
 

         <dependency>

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

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

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

-            <scope>test</scope>

+            <scope>runtime</scope>

         </dependency>

 

         <dependency>

diff --git a/sandbox/travelsample/launchers/policy/pom.xml b/sandbox/travelsample/launchers/policy/pom.xml
index 33a7e3af73..e51a2fcad0 100644
--- a/sandbox/travelsample/launchers/policy/pom.xml
+++ b/sandbox/travelsample/launchers/policy/pom.xml
@@ -65,16 +65,16 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>${tuscany.version}</version>
-            <scope>test</scope>
+            <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
             <version>${tuscany.version}</version>
-            <scope>test</scope>
+            <scope>runtime</scope>
         </dependency>        
 
         <dependency>
diff --git a/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java b/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
index 4e16b9c072..b48c4e88ec 100644
--- a/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
+++ b/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
@@ -28,11 +28,15 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 public class PolicyLauncher {
 
     public static void main(String[] args) throws Exception {
-        SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, locate("client"), locate("payment"));
+        SCANode node1 =
+            SCANodeFactory.newInstance().createSCANode(null, 
+                                                       locate("policy-client"), 
+                                                       locate("payment-java-policy"));
 
         node1.start();
 
-        SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, locate("creditcard"));
+        SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, 
+                                                                   locate("creditcard-payment-jaxb-policy"));
 
         node2.start();