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, 40 insertions, 40 deletions

diff --git a/sandbox/travelsample/chapter-05/ui-contribution/build.xml b/sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml
index 4c14d4dde8..2d7b30e1e2 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml
@@ -30,7 +30,6 @@
         </javac>
         <copy todir="target/classes">
             <fileset dir="src\main\resources"/>
-            <fileset dir="src\main\resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-05-ui-contribution.jar" basedir="target/classes">
             <manifest>
@@ -58,39 +57,40 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-endpoint-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.6-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-05/ui-contribution/pom.xml
index a51f04ce59..a706c9ab8d 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-05/ui-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-05-ui-contribution</artifactId>
@@ -32,27 +32,27 @@
         <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>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.5-SNAPSHOT</version>
+                <version>1.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
index 4064565d41..4064565d41 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.composite
index ae8d4b7ff6..ae8d4b7ff6 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.composite
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.html
index b8e27e87fc..b8e27e87fc 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.html
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.odg
index 8ca8fbf133..8ca8fbf133 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.odg
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.odg
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.png
index f68cd84704..f68cd84704 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.png
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.png
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/style.css b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/style.css
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/style.css