Move redundant modules into contrib

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

87 files changed, 73 insertions, 73 deletions

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