Move redundant modules into contrib

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

12 files changed, 4 insertions, 4 deletions

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