Move redundant modules into contrib

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

27 files changed, 141 insertions, 137 deletions

diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/pom.xml
index e93aa76758..9388e4e3fb 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-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-09-creditcard-payment-sdo-contribution</artifactId>
@@ -32,40 +32,40 @@
         <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-node-impl</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-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-databinding-sdo</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </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>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/CreditCardPayment.java b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/CreditCardPayment.java
index 5b333648f4..5b333648f4 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/CreditCardPayment.java
+++ b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/CreditCardPayment.java
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/impl/CreditCardPaymentImpl.java b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/impl/CreditCardPaymentImpl.java
index 178268eac1..178268eac1 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/impl/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/CreditCardPayment.wsdl
index f73279e7d8..f73279e7d8 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml
index d22f4816ab..d22f4816ab 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite
index 938385dbf9..938385dbf9 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite
+++ b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
index 041e4e4847..041e4e4847 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
diff --git a/sandbox/travelsample/chapter-09/node/build.xml b/sandbox/travelsample/contrib/chapter-09/node/build.xml
index 2c26646c51..46333e4852 100644
--- a/sandbox/travelsample/chapter-09/node/build.xml
+++ b/sandbox/travelsample/contrib/chapter-09/node/build.xml
@@ -58,77 +58,81 @@
     </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-atom-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-atom-abdera-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-axis2-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-policy-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-wsdlgen-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-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-resource-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-data-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-axiom-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-axiom-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-json-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-manager-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-host-http-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-host-jetty-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-widget-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-widget-runtime-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-interface-wsdl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-wsdl-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-node-launcher-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-manager-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-security-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-ws-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-workspace-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-xml-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-atom-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-abdera-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-js-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-axis2-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-wsdlgen-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-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-resource-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-data-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-axiom-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-json-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-domain-manager-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-host-jetty-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-tuscany-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-interface-wsdl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-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-node-launcher-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-manager-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-ws-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-web-javascript-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-xml-1.6-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
diff --git a/sandbox/travelsample/chapter-09/node/pom.xml b/sandbox/travelsample/contrib/chapter-09/node/pom.xml
index b6a0d70a6a..8deb76212c 100644
--- a/sandbox/travelsample/chapter-09/node/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-09/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-09-node</artifactId>
@@ -32,82 +32,82 @@
             <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-node-launcher</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</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>runtime</scope>
         </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-widget-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-resource-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-binding-atom-abdera</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-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-binding-http-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-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
        
@@ -127,7 +127,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-09/node/src/main/java/scatours/LaunchNode.java b/sandbox/travelsample/contrib/chapter-09/node/src/main/java/scatours/LaunchNode.java
index 7ed9b0d126..7ed9b0d126 100644
--- a/sandbox/travelsample/chapter-09/node/src/main/java/scatours/LaunchNode.java
+++ b/sandbox/travelsample/contrib/chapter-09/node/src/main/java/scatours/LaunchNode.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-09/payment-contribution/pom.xml
index 5f3b822de7..d642fa3d17 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-09/payment-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-09-payment-contribution</artifactId>
@@ -32,34 +32,34 @@
         <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>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-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-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/Payment.java b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/main/java/payment/Payment.java
index f1a45cb031..f1a45cb031 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/Payment.java
+++ b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/main/java/payment/Payment.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/main/java/payment/PaymentImpl.java
index aa8f3cd01a..aa8f3cd01a 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/PaymentImpl.java
+++ b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/main/java/payment/PaymentImpl.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/main/resources/CreditCardPayment.wsdl
index b40c341389..b40c341389 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/main/resources/META-INF/sca-contribution.xml
index d22f4816ab..d22f4816ab 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
index 21bf6ff428..21bf6ff428 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
index b7d44c1abe..b7d44c1abe 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/test/resources/payment.composite b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/test/resources/payment.composite
index 90665e86e0..90665e86e0 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/test/resources/payment.composite
+++ b/sandbox/travelsample/contrib/chapter-09/payment-contribution/src/test/resources/payment.composite
diff --git a/sandbox/travelsample/chapter-09/pom.xml b/sandbox/travelsample/contrib/chapter-09/pom.xml
index 7d7bee30ff..7d7bee30ff 100644
--- a/sandbox/travelsample/chapter-09/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-09/pom.xml
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/build.xml b/sandbox/travelsample/contrib/chapter-09/ui-contribution/build.xml
index dfebf9c5c1..9bb124b5d0 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-09/ui-contribution/build.xml
@@ -57,42 +57,42 @@
     </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-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.5-SNAPSHOT.2.jar"/>
+        <include name="XmlSchema-1.6-SNAPSHOT.2.jar"/>
         <include name="activation-1.1.jar"/>
         <include name="asm-all-3.1.jar"/>
         <include name="cglib-nodep-2.2.jar"/>
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-09/ui-contribution/pom.xml
index 8b6a8790b1..958aed8d7b 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-09/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-09-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> 
 
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/scatours.odg b/sandbox/travelsample/contrib/chapter-09/ui-contribution/scatours.odg
index 8ca8fbf133..8ca8fbf133 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/scatours.odg
+++ b/sandbox/travelsample/contrib/chapter-09/ui-contribution/scatours.odg
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/scatours.png b/sandbox/travelsample/contrib/chapter-09/ui-contribution/scatours.png
index f68cd84704..f68cd84704 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/scatours.png
+++ b/sandbox/travelsample/contrib/chapter-09/ui-contribution/scatours.png
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-09/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
index 764030c28e..764030c28e 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-09/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contrib/chapter-09/ui-contribution/src/main/resources/scatours.composite
index 53fac26d3e..53fac26d3e 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contrib/chapter-09/ui-contribution/src/main/resources/scatours.composite
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.html b/sandbox/travelsample/contrib/chapter-09/ui-contribution/src/main/resources/scatours.html
index f4206548c0..f4206548c0 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.html
+++ b/sandbox/travelsample/contrib/chapter-09/ui-contribution/src/main/resources/scatours.html
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/style.css b/sandbox/travelsample/contrib/chapter-09/ui-contribution/src/main/resources/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/style.css
+++ b/sandbox/travelsample/contrib/chapter-09/ui-contribution/src/main/resources/style.css