Move redundant modules into contrib

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

249 files changed, 571 insertions, 558 deletions

diff --git a/sandbox/travelsample/chapter-01/build.xml b/sandbox/travelsample/contrib/chapter-01/build.xml
index 549f1f740b..549f1f740b 100644
--- a/sandbox/travelsample/chapter-01/build.xml
+++ b/sandbox/travelsample/contrib/chapter-01/build.xml
diff --git a/sandbox/travelsample/chapter-01/pom.xml b/sandbox/travelsample/contrib/chapter-01/pom.xml
index fef850d2d7..4eb2e218d5 100644
--- a/sandbox/travelsample/chapter-01/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-01/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-01</artifactId>
@@ -32,34 +32,34 @@
         <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>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-01/src/main/java/client/CurrencyConverterClient.java b/sandbox/travelsample/contrib/chapter-01/src/main/java/client/CurrencyConverterClient.java
index df6cdc10e1..df6cdc10e1 100644
--- a/sandbox/travelsample/chapter-01/src/main/java/client/CurrencyConverterClient.java
+++ b/sandbox/travelsample/contrib/chapter-01/src/main/java/client/CurrencyConverterClient.java
diff --git a/sandbox/travelsample/chapter-01/src/main/java/client/TripClient.java b/sandbox/travelsample/contrib/chapter-01/src/main/java/client/TripClient.java
index f221ac9106..f221ac9106 100644
--- a/sandbox/travelsample/chapter-01/src/main/java/client/TripClient.java
+++ b/sandbox/travelsample/contrib/chapter-01/src/main/java/client/TripClient.java
diff --git a/sandbox/travelsample/chapter-01/src/main/java/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/contrib/chapter-01/src/main/java/currencyconverter/CurrencyConverter.java
index 95863271c4..95863271c4 100644
--- a/sandbox/travelsample/chapter-01/src/main/java/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/contrib/chapter-01/src/main/java/currencyconverter/CurrencyConverter.java
diff --git a/sandbox/travelsample/chapter-01/src/main/java/currencyconverter/CurrencyConverterImpl.java b/sandbox/travelsample/contrib/chapter-01/src/main/java/currencyconverter/CurrencyConverterImpl.java
index d5b470ddeb..d5b470ddeb 100644
--- a/sandbox/travelsample/chapter-01/src/main/java/currencyconverter/CurrencyConverterImpl.java
+++ b/sandbox/travelsample/contrib/chapter-01/src/main/java/currencyconverter/CurrencyConverterImpl.java
diff --git a/sandbox/travelsample/chapter-01/src/main/java/trip/Trip.java b/sandbox/travelsample/contrib/chapter-01/src/main/java/trip/Trip.java
index c7f930c631..c7f930c631 100644
--- a/sandbox/travelsample/chapter-01/src/main/java/trip/Trip.java
+++ b/sandbox/travelsample/contrib/chapter-01/src/main/java/trip/Trip.java
diff --git a/sandbox/travelsample/chapter-01/src/main/java/trip/TripImpl.java b/sandbox/travelsample/contrib/chapter-01/src/main/java/trip/TripImpl.java
index 9fe9fb1834..9fe9fb1834 100644
--- a/sandbox/travelsample/chapter-01/src/main/java/trip/TripImpl.java
+++ b/sandbox/travelsample/contrib/chapter-01/src/main/java/trip/TripImpl.java
diff --git a/sandbox/travelsample/chapter-01/src/main/resources/currencyconverter.composite b/sandbox/travelsample/contrib/chapter-01/src/main/resources/currencyconverter.composite
index 2a37151e08..2a37151e08 100644
--- a/sandbox/travelsample/chapter-01/src/main/resources/currencyconverter.composite
+++ b/sandbox/travelsample/contrib/chapter-01/src/main/resources/currencyconverter.composite
diff --git a/sandbox/travelsample/chapter-01/src/main/resources/trip.composite b/sandbox/travelsample/contrib/chapter-01/src/main/resources/trip.composite
index 32a3eed4be..32a3eed4be 100644
--- a/sandbox/travelsample/chapter-01/src/main/resources/trip.composite
+++ b/sandbox/travelsample/contrib/chapter-01/src/main/resources/trip.composite
diff --git a/sandbox/travelsample/chapter-02/build.xml b/sandbox/travelsample/contrib/chapter-02/build.xml
index a58fed933a..a58fed933a 100644
--- a/sandbox/travelsample/chapter-02/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/build.xml
diff --git a/sandbox/travelsample/chapter-02/client-contribution/build.xml b/sandbox/travelsample/contrib/chapter-02/client-contribution/build.xml
index 17bc0d7d5b..17bc0d7d5b 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/client-contribution/build.xml
diff --git a/sandbox/travelsample/chapter-02/client-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-02/client-contribution/pom.xml
index 81d6fe80ef..e5982fe7bd 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/client-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-02-client-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>scatours-chapter-02-tuscanyscatours-contribution</artifactId>

-            <version>1.5-SNAPSHOT</version>

+            <version>1.6-SNAPSHOT</version>

         </dependency>

     </dependencies>

     

diff --git a/sandbox/travelsample/chapter-02/client-contribution/src/main/java/scatours/client/TestClient.java b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/java/scatours/client/TestClient.java
index cb80368918..cb80368918 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/src/main/java/scatours/client/TestClient.java
+++ b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/java/scatours/client/TestClient.java
diff --git a/sandbox/travelsample/chapter-02/client-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/resources/META-INF/sca-contribution.xml
index 54ae0dbd0a..54ae0dbd0a 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-02/client-contribution/src/main/resources/client.composite b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/resources/client.composite
index 05c2755114..05c2755114 100644
--- a/sandbox/travelsample/chapter-02/client-contribution/src/main/resources/client.composite
+++ b/sandbox/travelsample/contrib/chapter-02/client-contribution/src/main/resources/client.composite
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/build.xml b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/build.xml
index fa67a921e2..fa67a921e2 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/build.xml
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/pom.xml
index 6bbcf056af..5ff8cc8382 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-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-02-goodvaluetrips-contribution</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java
index d30046aaef..d30046aaef 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..365a210368 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml
index 6ed07d5612..6ed07d5612 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/resources/trips.composite b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/resources/trips.composite
index ab173e5ef7..ab173e5ef7 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/src/main/resources/trips.composite
+++ b/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/src/main/resources/trips.composite
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
diff --git a/sandbox/travelsample/chapter-02/pom.xml b/sandbox/travelsample/contrib/chapter-02/pom.xml
index 0132a445e5..0132a445e5 100644
--- a/sandbox/travelsample/chapter-02/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/pom.xml
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/build.xml b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/build.xml
index d9961176f3..d9961176f3 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/build.xml
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/pom.xml
index 6913d7665d..6296c58e95 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-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-02-tuscanyscatours-contribution</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..365a210368 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java
index 9d54d46bb6..9d54d46bb6 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java
index 688fc7e83b..688fc7e83b 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
index 68bf25a8cd..68bf25a8cd 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java
index e64d60545e..e64d60545e 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java
index e33b0399cb..e33b0399cb 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
index cf1153ac14..cf1153ac14 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite
index f166a1635d..f166a1635d 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite
+++ b/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite
diff --git a/sandbox/travelsample/chapter-03/pom.xml b/sandbox/travelsample/contrib/chapter-03/pom.xml
index 7d417a20de..7d417a20de 100644
--- a/sandbox/travelsample/chapter-03/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-03/pom.xml
diff --git a/sandbox/travelsample/chapter-05/node/build.xml b/sandbox/travelsample/contrib/chapter-05/node/build.xml
index a96dff856a..3627e840ad 100644
--- a/sandbox/travelsample/chapter-05/node/build.xml
+++ b/sandbox/travelsample/contrib/chapter-05/node/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-node.jar" basedir="target/classes">
             <manifest>
@@ -58,83 +57,88 @@
     </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-ejb-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ejb-runtime-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-databinding-sdo-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-bpel-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-bpel-ode-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-ejb-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-ejb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ejb-runtime-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-jee-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-databinding-sdo-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-bpel-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-bpel-ode-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-ejb-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-05/node/pom.xml b/sandbox/travelsample/contrib/chapter-05/node/pom.xml
index df2e00eee0..46dd653664 100644
--- a/sandbox/travelsample/chapter-05/node/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-05/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-05-node</artifactId>
@@ -32,103 +32,103 @@
             <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>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-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-ejb</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-bpel-ode</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -147,7 +147,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/node/src/main/java/scatours/LaunchNode.java b/sandbox/travelsample/contrib/chapter-05/node/src/main/java/scatours/LaunchNode.java
index 6b1c673579..6b1c673579 100644
--- a/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
+++ b/sandbox/travelsample/contrib/chapter-05/node/src/main/java/scatours/LaunchNode.java
diff --git a/sandbox/travelsample/chapter-05/pom.xml b/sandbox/travelsample/contrib/chapter-05/pom.xml
index 5507b545d1..5507b545d1 100644
--- a/sandbox/travelsample/chapter-05/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-05/pom.xml
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
diff --git a/sandbox/travelsample/chapter-06/node/build.xml b/sandbox/travelsample/contrib/chapter-06/node/build.xml
index 0ccfcedee1..e49a915d6d 100644
--- a/sandbox/travelsample/chapter-06/node/build.xml
+++ b/sandbox/travelsample/contrib/chapter-06/node/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-06-node.jar" basedir="target/classes">
             <manifest>
@@ -58,78 +57,82 @@
     </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-spring-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-spring-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-06/node/pom.xml b/sandbox/travelsample/contrib/chapter-06/node/pom.xml
index 5319b87630..19262eeb89 100644
--- a/sandbox/travelsample/chapter-06/node/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-06/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-06-node</artifactId>
@@ -32,89 +32,89 @@
             <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>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -133,7 +133,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-06/node/src/main/java/scatours/LaunchBPELExampleNode.java b/sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
index e87b0ca44e..e87b0ca44e 100644
--- a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
+++ b/sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
diff --git a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java b/sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
index 45c9be4bce..45c9be4bce 100644
--- a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
+++ b/sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/log4j.properties b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/log4j.properties
index 7ed0bcaf77..7ed0bcaf77 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/log4j.properties
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/log4j.properties
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/pom.xml
index e30d8b7ff2..8cfe95771a 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-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-06-payment-bpel-contribution</artifactId>
@@ -32,55 +32,55 @@
         <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-implementation-bpel-ode</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>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-emailgateway-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-creditcard-payment-jaxb-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
index 22ef6de317..22ef6de317 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
index a097d9b7e4..a097d9b7e4 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
index 725c95a2bd..725c95a2bd 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
index e2c4062f2e..e2c4062f2e 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
index 8f11d76888..8f11d76888 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
index a69c16a726..a69c16a726 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
index eaa7498e84..eaa7498e84 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
index 4984ef0252..4984ef0252 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
index ab26a48b20..ab26a48b20 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
+++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/pom.xml
index f80a6e2de1..67882f6ddb 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-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-payment-javascript-contribution</artifactId>
@@ -32,41 +32,41 @@
         <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-implementation-script</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-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl
index 1813c77436..1813c77436 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl
index a097d9b7e4..a097d9b7e4 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml
index 7adba24d58..7adba24d58 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl
index 2519d7642e..2519d7642e 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite
index 9743f24ada..9743f24ada 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy
index dab3003eed..dab3003eed 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java
index 21bf6ff428..21bf6ff428 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java
index 556a699ad8..556a699ad8 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
index ac05bf7359..ac05bf7359 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java
index 974c902f5d..974c902f5d 100644
--- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/pom.xml
index cdfe544737..3018bc651d 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-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-payment-spring-annotation-contribution</artifactId>
@@ -32,41 +32,41 @@
         <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>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>      
         
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java
index 68e941e138..68e941e138 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
index 644519a5e7..644519a5e7 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl
index dbf89924cc..dbf89924cc 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl
index a097d9b7e4..a097d9b7e4 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml
index 896b1ceb48..896b1ceb48 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml
index 6942649d8a..6942649d8a 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl
index e2c4062f2e..e2c4062f2e 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java
index 5e47c9075e..5e47c9075e 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java
index 556a699ad8..556a699ad8 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml
index 92de8d375b..92de8d375b 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite
index aeb9a3e413..aeb9a3e413 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/pom.xml
index 752c5ebebf..299b989cca 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-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-payment-spring-contribution</artifactId>
@@ -32,41 +32,41 @@
         <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>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java
index 48f829ae0f..48f829ae0f 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
index 644519a5e7..644519a5e7 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl
index dbf89924cc..dbf89924cc 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl
index a097d9b7e4..a097d9b7e4 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
index 78a5d851f9..78a5d851f9 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml
index e786e15d55..e786e15d55 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl
index e2c4062f2e..e2c4062f2e 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java
index 8046e8b2cd..8046e8b2cd 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java
index 556a699ad8..556a699ad8 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml
index 4e61a2f127..4e61a2f127 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/payment.composite b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/payment.composite
index 52deda7a18..52deda7a18 100644
--- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/payment.composite
+++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/payment.composite
diff --git a/sandbox/travelsample/chapter-06/pom.xml b/sandbox/travelsample/contrib/chapter-06/pom.xml
index 605a362c31..605a362c31 100644
--- a/sandbox/travelsample/chapter-06/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-06/pom.xml
diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/build.xml b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml
index 591b58299e..37b6800014 100644
--- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml
@@ -58,39 +58,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-06/ui-bpel-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/pom.xml
index 1a04dbd879..448bd8a96f 100644
--- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-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-06-ui-bpel-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-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
index b3de1910d1..b3de1910d1 100644
--- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite
index 4b5290b910..4b5290b910 100644
--- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite
diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html
index b8e27e87fc..b8e27e87fc 100644
--- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html
+++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html
diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg
index 8ca8fbf133..8ca8fbf133 100644
--- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg
+++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg
diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png
index f68cd84704..f68cd84704 100644
--- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png
+++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png
diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/style.css b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/style.css
+++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/style.css
diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/build.xml b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml
index 2f8bd12107..68b3a3adf9 100644
--- a/sandbox/travelsample/chapter-06/ui-spring-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml
@@ -58,39 +58,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-06/ui-spring-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/pom.xml
index 2303628ab0..42df0ab469 100644
--- a/sandbox/travelsample/chapter-06/ui-spring-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-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-ui-spring-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-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
index b3de1910d1..b3de1910d1 100644
--- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite
index 9b21c2a9f2..9b21c2a9f2 100644
--- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite
diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.html b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.html
index b8e27e87fc..b8e27e87fc 100644
--- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.html
+++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.html
diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg
index 8ca8fbf133..8ca8fbf133 100644
--- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg
+++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg
diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.png
index f68cd84704..f68cd84704 100644
--- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.png
+++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.png
diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/style.css b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/style.css
+++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/style.css
diff --git a/sandbox/travelsample/chapter-07/pom.xml b/sandbox/travelsample/contrib/chapter-07/pom.xml
index 5f9e3ef56b..5f9e3ef56b 100644
--- a/sandbox/travelsample/chapter-07/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-07/pom.xml
diff --git a/sandbox/travelsample/chapter-08/pom.xml b/sandbox/travelsample/contrib/chapter-08/pom.xml
index caf9636c18..caf9636c18 100644
--- a/sandbox/travelsample/chapter-08/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-08/pom.xml
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/build.xml b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/build.xml
index f453e53815..f453e53815 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/build.xml
+++ b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/build.xml
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/pom.xml b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/pom.xml
index a253fbf74b..a253fbf74b 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/pom.xml
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/scatours.composite b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/scatours.composite
index 2fa83b7a3b..2fa83b7a3b 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/scatours.composite
+++ b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/scatours.composite
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/WEB-INF/web.xml
index 3f833b6856..3f833b6856 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.html b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.html
index 9aad807887..9aad807887 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.html
+++ b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.html
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.odg b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.odg
index 8ca8fbf133..8ca8fbf133 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.odg
+++ b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.odg
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.png b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.png
index f68cd84704..f68cd84704 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.png
+++ b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/scatours.png
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/style.css b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/src/main/webapp/style.css
+++ b/sandbox/travelsample/contrib/chapter-08/ui-contribution-webapp/src/main/webapp/style.css
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
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
diff --git a/sandbox/travelsample/shared-contributions/car-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/car-contribution/pom.xml
index 9728629bfe..0e20cacb3a 100644
--- a/sandbox/travelsample/shared-contributions/car-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/car-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-car-contribution</artifactId>
@@ -32,19 +32,19 @@
         <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>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/car-contribution/src/main/java/scatours/car/CarImpl.java b/sandbox/travelsample/contrib/shared-contributions/car-contribution/src/main/java/scatours/car/CarImpl.java
index 059365a9ab..059365a9ab 100644
--- a/sandbox/travelsample/shared-contributions/car-contribution/src/main/java/scatours/car/CarImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/car-contribution/src/main/java/scatours/car/CarImpl.java
diff --git a/sandbox/travelsample/shared-contributions/car-contribution/src/main/java/scatours/car/CarInfo.java b/sandbox/travelsample/contrib/shared-contributions/car-contribution/src/main/java/scatours/car/CarInfo.java
index 2538c51e09..2538c51e09 100644
--- a/sandbox/travelsample/shared-contributions/car-contribution/src/main/java/scatours/car/CarInfo.java
+++ b/sandbox/travelsample/contrib/shared-contributions/car-contribution/src/main/java/scatours/car/CarInfo.java
diff --git a/sandbox/travelsample/shared-contributions/car-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/car-contribution/src/main/resources/META-INF/sca-contribution.xml
index f9c448e8ee..f9c448e8ee 100644
--- a/sandbox/travelsample/shared-contributions/car-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/car-contribution/src/main/resources/META-INF/sca-contribution.xml
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
diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml
index edf5b6cc21..94f0e80f77 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-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-creditcard-payment-jaxb-contribution</artifactId>
@@ -32,41 +32,41 @@
         <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-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/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
index b7d44c1abe..b7d44c1abe 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
index 1813c77436..1813c77436 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
index 8faf8db4ee..8faf8db4ee 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
index 0c25509ab3..0c25509ab3 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
index 666c488b6d..666c488b6d 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite
index d0721a8bae..d0721a8bae 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite
+++ b/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite
diff --git a/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/currency-contribution/pom.xml
index 9897d0dcb8..61ef0b6752 100644
--- a/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/currency-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-currency-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/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/contrib/shared-contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverter.java
index 9b3851721f..9b3851721f 100644
--- a/sandbox/travelsample/shared-contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/contrib/shared-contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverter.java
diff --git a/sandbox/travelsample/shared-contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverterImpl.java b/sandbox/travelsample/contrib/shared-contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverterImpl.java
index eddc59f555..eddc59f555 100644
--- a/sandbox/travelsample/shared-contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverterImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverterImpl.java
diff --git a/sandbox/travelsample/shared-contributions/currency-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/currency-contribution/src/main/resources/META-INF/sca-contribution.xml
index 549a3bc7a3..549a3bc7a3 100644
--- a/sandbox/travelsample/shared-contributions/currency-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/currency-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/pom.xml
index 87d39db135..34cf7d2512 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/emailgateway-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-emailgateway-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/shared-contributions/emailgateway-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
index 6e971c3267..6e971c3267 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl
index 7c5c190e1e..7c5c190e1e 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/main/resources/META-INF/sca-contribution.xml
index d77df2fd7e..d77df2fd7e 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
index 1dfaf14eb0..1dfaf14eb0 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
+++ b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/client/EmailGatewayClientImpl.java b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/client/EmailGatewayClientImpl.java
index 074c3bffa4..074c3bffa4 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/client/EmailGatewayClientImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/client/EmailGatewayClientImpl.java
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java
index 6e971c3267..6e971c3267 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml
index cd9f3c864c..cd9f3c864c 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/emailgateway.composite b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/resources/emailgateway.composite
index 5daf27a61d..5daf27a61d 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/emailgateway.composite
+++ b/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/src/test/resources/emailgateway.composite
diff --git a/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/flight-contribution/pom.xml
index 87420897e3..2bd543e5ab 100644
--- a/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/flight-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-flight-contribution</artifactId>
@@ -32,19 +32,19 @@
         <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>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java b/sandbox/travelsample/contrib/shared-contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java
index 72c1c7201c..72c1c7201c 100644
--- a/sandbox/travelsample/shared-contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java
diff --git a/sandbox/travelsample/shared-contributions/flight-contribution/src/main/java/scatours/flight/FlightInfo.java b/sandbox/travelsample/contrib/shared-contributions/flight-contribution/src/main/java/scatours/flight/FlightInfo.java
index fb5fb9fef5..fb5fb9fef5 100644
--- a/sandbox/travelsample/shared-contributions/flight-contribution/src/main/java/scatours/flight/FlightInfo.java
+++ b/sandbox/travelsample/contrib/shared-contributions/flight-contribution/src/main/java/scatours/flight/FlightInfo.java
diff --git a/sandbox/travelsample/shared-contributions/flight-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/flight-contribution/src/main/resources/META-INF/sca-contribution.xml
index 394be817a9..394be817a9 100644
--- a/sandbox/travelsample/shared-contributions/flight-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/flight-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/hotel-contribution/pom.xml
index 4d985fdf51..7e2f764dad 100644
--- a/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/hotel-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-hotel-contribution</artifactId>
@@ -32,19 +32,19 @@
         <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>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java b/sandbox/travelsample/contrib/shared-contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java
index a9a6d1bbde..a9a6d1bbde 100644
--- a/sandbox/travelsample/shared-contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java
diff --git a/sandbox/travelsample/shared-contributions/hotel-contribution/src/main/java/scatours/hotel/HotelInfo.java b/sandbox/travelsample/contrib/shared-contributions/hotel-contribution/src/main/java/scatours/hotel/HotelInfo.java
index 3b0d11d16e..3b0d11d16e 100644
--- a/sandbox/travelsample/shared-contributions/hotel-contribution/src/main/java/scatours/hotel/HotelInfo.java
+++ b/sandbox/travelsample/contrib/shared-contributions/hotel-contribution/src/main/java/scatours/hotel/HotelInfo.java
diff --git a/sandbox/travelsample/shared-contributions/hotel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/hotel-contribution/src/main/resources/META-INF/sca-contribution.xml
index 765c8d1cc3..765c8d1cc3 100644
--- a/sandbox/travelsample/shared-contributions/hotel-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/hotel-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/pom.xml
index 21826c81c0..aee48250d6 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-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-payment-java-contribution</artifactId>
@@ -32,48 +32,48 @@
         <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>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>     
         
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java
index 8c9777fdd4..8c9777fdd4 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
index 02918efb6c..02918efb6c 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java
index f80a691d96..f80a691d96 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java
index ebfb104650..ebfb104650 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java
index c7c9f11a6c..c7c9f11a6c 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
index 615f0ef1b9..615f0ef1b9 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java
index 6c3662b265..6c3662b265 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
index b5a5debd38..b5a5debd38 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl
index 7d30a6a395..7d30a6a395 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
index 7adba24d58..7adba24d58 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/Payment.wsdl
index 2519d7642e..2519d7642e 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/definitions.xml b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/definitions.xml
index 475d923506..475d923506 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/definitions.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/definitions.xml
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/payment.composite
index 00ea330e79..00ea330e79 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/payment.composite
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
index d88764cfac..d88764cfac 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
diff --git a/sandbox/travelsample/shared-contributions/pom.xml b/sandbox/travelsample/contrib/shared-contributions/pom.xml
index dec2e0b4a1..dec2e0b4a1 100644
--- a/sandbox/travelsample/shared-contributions/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/pom.xml
diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/pom.xml
index 6a29b5d00c..f56eab078f 100644
--- a/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/scatours-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-scatours-contribution</artifactId>
@@ -32,50 +32,50 @@
         <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>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-travelcatalog-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-tripbooking-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-shoppingcart-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>     
 
         <!--        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-paymentprocess-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
         -->
 
diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java
index ac39443e9c..ac39443e9c 100644
--- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java
+++ b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java
diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java
index 74755f5e32..74755f5e32 100644
--- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java
+++ b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java
diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
index e38be75af7..e38be75af7 100644
--- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java
index f0f435fc06..f0f435fc06 100644
--- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java
+++ b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java
diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml
index 368e95ebd0..368e95ebd0 100644
--- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/pom.xml
index 0b90382703..610471b9f2 100644
--- a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-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-shoppingcart-contribution</artifactId>
@@ -32,31 +32,31 @@
         <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>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-payment-java-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java
index f7595c71fe..f7595c71fe 100644
--- a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java
+++ b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java
diff --git a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
index 5021f62715..5021f62715 100644
--- a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
diff --git a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
index f4010d04b1..f4010d04b1 100644
--- a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/src/main/resources/Payment.wsdl
index 2519d7642e..2519d7642e 100644
--- a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/travelcatalog-contribution/pom.xml
index 54e521d76b..34beb37b5c 100644
--- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/travelcatalog-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-travelcatalog-contribution</artifactId>
@@ -32,31 +32,31 @@
         <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>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-tripbooking-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java b/sandbox/travelsample/contrib/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java
index 4ad2c80c8f..4ad2c80c8f 100644
--- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java
diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java b/sandbox/travelsample/contrib/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java
index df22724de2..df22724de2 100644
--- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java
+++ b/sandbox/travelsample/contrib/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java
diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml
index 286b9c2a05..286b9c2a05 100644
--- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/trip-contribution/pom.xml
index 3c257ac4b1..707ae97e5a 100644
--- a/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/trip-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-trip-contribution</artifactId>
@@ -32,19 +32,19 @@
         <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>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java b/sandbox/travelsample/contrib/shared-contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java
index 9d51c8078b..9d51c8078b 100644
--- a/sandbox/travelsample/shared-contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java
diff --git a/sandbox/travelsample/shared-contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java b/sandbox/travelsample/contrib/shared-contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java
index 343a3d2cef..343a3d2cef 100644
--- a/sandbox/travelsample/shared-contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java
+++ b/sandbox/travelsample/contrib/shared-contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java
diff --git a/sandbox/travelsample/shared-contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml
index 8a4f6abf02..8a4f6abf02 100644
--- a/sandbox/travelsample/shared-contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/tripbooking-contribution/build.xml b/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/build.xml
index b4fbc726cf..b4fbc726cf 100644
--- a/sandbox/travelsample/shared-contributions/tripbooking-contribution/build.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/build.xml
diff --git a/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/pom.xml
index 66f006a670..97de81ad2e 100644
--- a/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/tripbooking-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-tripbooking-contribution</artifactId>
@@ -32,31 +32,31 @@
         <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>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-shoppingcart-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>         
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java b/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
index 72320884e6..72320884e6 100644
--- a/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
+++ b/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
diff --git a/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java b/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
index 13c75de1f0..13c75de1f0 100644
--- a/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
diff --git a/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml
index 2accecffaa..2accecffaa 100644
--- a/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml