Move redundant modules into contrib

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

35 files changed, 11 insertions, 11 deletions

diff --git a/sandbox/travelsample/chapter-02/build.xml b/sandbox/travelsample/contrib/chapter-02/build.xml
index a58fed933a..a58fed933a 100644
--- a/sandbox/travelsample/chapter-02/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/build.xml
diff --git a/sandbox/travelsample/chapter-02/client-contribution/build.xml b/sandbox/travelsample/contrib/chapter-02/client-contribution/build.xml
index 17bc0d7d5b..17bc0d7d5b 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/client-contribution/build.xml
diff --git a/sandbox/travelsample/chapter-02/client-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-02/client-contribution/pom.xml
index 81d6fe80ef..e5982fe7bd 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/client-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.5-SNAPSHOT</version>

+        <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent>

     <artifactId>scatours-chapter-02-client-contribution</artifactId>

@@ -32,13 +32,13 @@
         <dependency>

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

             <artifactId>tuscany-sca-api</artifactId>

-            <version>1.5-SNAPSHOT</version>

+            <version>1.6-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>scatours-chapter-02-tuscanyscatours-contribution</artifactId>

-            <version>1.5-SNAPSHOT</version>

+            <version>1.6-SNAPSHOT</version>

         </dependency>

     </dependencies>

     

diff --git a/sandbox/travelsample/chapter-02/client-contribution/src/main/java/scatours/client/TestClient.java b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/java/scatours/client/TestClient.java
index cb80368918..cb80368918 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/src/main/java/scatours/client/TestClient.java
+++ b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/java/scatours/client/TestClient.java
diff --git a/sandbox/travelsample/chapter-02/client-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/resources/META-INF/sca-contribution.xml
index 54ae0dbd0a..54ae0dbd0a 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-02/client-contribution/src/main/resources/client.composite b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/resources/client.composite
index 05c2755114..05c2755114 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/src/main/resources/client.composite
+++ b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/resources/client.composite
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/build.xml b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/build.xml
index fa67a921e2..fa67a921e2 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/build.xml
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/pom.xml
index 6bbcf056af..5ff8cc8382 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-02-goodvaluetrips-contribution</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java
index d30046aaef..d30046aaef 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..365a210368 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml
index 6ed07d5612..6ed07d5612 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/resources/trips.composite b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/resources/trips.composite
index ab173e5ef7..ab173e5ef7 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/resources/trips.composite
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/resources/trips.composite
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/build.xml b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/build.xml
index 0c3c506b67..0c3c506b67 100644
--- a/sandbox/travelsample/chapter-02/node-jumpstart/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/build.xml
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/pom.xml b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/pom.xml
index f858f9f7e7..f858f9f7e7 100644
--- a/sandbox/travelsample/chapter-02/node-jumpstart/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/pom.xml
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/java/scatours/LaunchNode.java b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/src/main/java/scatours/LaunchNode.java
index b09939e49f..b09939e49f 100644
--- a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/java/scatours/LaunchNode.java
+++ b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/src/main/java/scatours/LaunchNode.java
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/src/main/resources/META-INF/sca-contribution.xml
index e3ac806b9a..e3ac806b9a 100644
--- a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/scatours.composite b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/src/main/resources/scatours.composite
index 6524f078f5..6524f078f5 100644
--- a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/src/main/resources/scatours.composite
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/src/test/java/scatours/NodeTestCase.java b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/src/test/java/scatours/NodeTestCase.java
index 16cff30934..16cff30934 100644
--- a/sandbox/travelsample/chapter-02/node-jumpstart/src/test/java/scatours/NodeTestCase.java
+++ b/sandbox/travelsample/contrib/chapter-02/node-jumpstart/src/test/java/scatours/NodeTestCase.java
diff --git a/sandbox/travelsample/chapter-02/node/build.xml b/sandbox/travelsample/contrib/chapter-02/node/build.xml
index 0c3c506b67..0c3c506b67 100644
--- a/sandbox/travelsample/chapter-02/node/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/node/build.xml
diff --git a/sandbox/travelsample/chapter-02/node/pom.xml b/sandbox/travelsample/contrib/chapter-02/node/pom.xml
index 737649372a..849bfef794 100644
--- a/sandbox/travelsample/chapter-02/node/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-02-node</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/chapter-02/node/src/main/java/scatours/LaunchNode.java b/sandbox/travelsample/contrib/chapter-02/node/src/main/java/scatours/LaunchNode.java
index b7888c8749..b7888c8749 100644
--- a/sandbox/travelsample/chapter-02/node/src/main/java/scatours/LaunchNode.java
+++ b/sandbox/travelsample/contrib/chapter-02/node/src/main/java/scatours/LaunchNode.java
diff --git a/sandbox/travelsample/chapter-02/node/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-02/node/src/main/resources/META-INF/sca-contribution.xml
index 4a6250ad25..4a6250ad25 100644
--- a/sandbox/travelsample/chapter-02/node/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-02/node/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-02/node/src/main/resources/scatours.composite b/sandbox/travelsample/contrib/chapter-02/node/src/main/resources/scatours.composite
index a5e26fd7b7..a5e26fd7b7 100644
--- a/sandbox/travelsample/chapter-02/node/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contrib/chapter-02/node/src/main/resources/scatours.composite
diff --git a/sandbox/travelsample/chapter-02/node/src/test/java/scatours/NodeTestCase.java b/sandbox/travelsample/contrib/chapter-02/node/src/test/java/scatours/NodeTestCase.java
index d37e52a409..d37e52a409 100644
--- a/sandbox/travelsample/chapter-02/node/src/test/java/scatours/NodeTestCase.java
+++ b/sandbox/travelsample/contrib/chapter-02/node/src/test/java/scatours/NodeTestCase.java
diff --git a/sandbox/travelsample/chapter-02/pom.xml b/sandbox/travelsample/contrib/chapter-02/pom.xml
index 0132a445e5..0132a445e5 100644
--- a/sandbox/travelsample/chapter-02/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/pom.xml
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/build.xml b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/build.xml
index d9961176f3..d9961176f3 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/build.xml
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/pom.xml
index 6913d7665d..6296c58e95 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-02-tuscanyscatours-contribution</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..365a210368 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java
index 9d54d46bb6..9d54d46bb6 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java
index 688fc7e83b..688fc7e83b 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
index 68bf25a8cd..68bf25a8cd 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java
index e64d60545e..e64d60545e 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java
index e33b0399cb..e33b0399cb 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
index cf1153ac14..cf1153ac14 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite
index f166a1635d..f166a1635d 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite