Move redundant modules into contrib

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

10 files changed, 2 insertions, 2 deletions

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