Move redundant modules into contrib

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

8 files changed, 3 insertions, 3 deletions

diff --git a/sandbox/travelsample/shared-contributions/common-contribution/build.xml b/sandbox/travelsample/contrib/shared-contributions/common-contribution/build.xml
index b4fbc726cf..b4fbc726cf 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/build.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/common-contribution/build.xml
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/common-contribution/pom.xml
index 1a876f2539..e1899df159 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/common-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-common-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>tuscany-data-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java
index 630ba1dfe5..630ba1dfe5 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java
+++ b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java
index 67335e72dc..67335e72dc 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java
+++ b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
index 7c3a0ed45c..7c3a0ed45c 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
+++ b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java
index 1fd78c8dd5..1fd78c8dd5 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java
+++ b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripLeg.java b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/TripLeg.java
index 1af33aa6f9..1af33aa6f9 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripLeg.java
+++ b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/java/scatours/common/TripLeg.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml
index c2b9fd12c7..c2b9fd12c7 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml