Move redundant modules into contrib

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

7 files changed, 3 insertions, 3 deletions

diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/pom.xml
index ac4004355c..30c3ef2cc0 100644
--- a/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/calendar-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-calendar-contribution</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</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>
 
diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/Calendar.java b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/main/java/calendar/Calendar.java
index 90736b92b4..90736b92b4 100644
--- a/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/Calendar.java
+++ b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/main/java/calendar/Calendar.java
diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
index 5aee34431c..5aee34431c 100644
--- a/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/main/resources/META-INF/sca-contribution.xml
index 327ce07643..327ce07643 100644
--- a/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/resources/calendar.composite b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/main/resources/calendar.composite
index b72c450446..b72c450446 100644
--- a/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/resources/calendar.composite
+++ b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/main/resources/calendar.composite
diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
index fee00fbb0a..fee00fbb0a 100644
--- a/sandbox/travelsample/shared-contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
+++ b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/src/test/resources/calendar.composite b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/test/resources/calendar.composite
index b72c450446..b72c450446 100644
--- a/sandbox/travelsample/shared-contributions/calendar-contribution/src/test/resources/calendar.composite
+++ b/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/src/test/resources/calendar.composite