From d23b31c01f30008f935e58fb9fb41919327f278e Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 21 Feb 2009 13:33:30 +0000
Subject: Switch poms back to depend on 1.5-SNAPSHOT as much of the stuff that
 I'm adding now depends on 1.x fixes

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@746505 13f79535-47bb-0310-9956-ffa450edef68
---
 sandbox/travelsample/chapter-01/pom.xml            |  12 +-
 .../chapter-02/goodvaluetrips-contribution/pom.xml |   6 +-
 sandbox/travelsample/chapter-02/node/build.xml     |  32 ++--
 sandbox/travelsample/chapter-02/node/pom.xml       |   2 +-
 sandbox/travelsample/chapter-02/pom.xml            |   2 +-
 .../tuscanyscatours-contribution/pom.xml           |   4 +-
 sandbox/travelsample/chapter-03/pom.xml            |   2 +-
 sandbox/travelsample/chapter-05/node/build.xml     | 167 ++++++++++-----------
 sandbox/travelsample/chapter-05/node/pom.xml       |  34 ++---
 .../node/src/main/java/scatours/LaunchNode.java    |   4 +-
 sandbox/travelsample/chapter-05/pom.xml            |   2 +-
 .../chapter-05/ui-contribution/build.xml           |  81 +++++-----
 .../chapter-05/ui-contribution/pom.xml             |  12 +-
 sandbox/travelsample/chapter-06/pom.xml            |   6 +-
 sandbox/travelsample/chapter-07/pom.xml            |   2 +-
 sandbox/travelsample/chapter-08/pom.xml            |   2 +-
 .../chapter-08/ui-contribution-webapp/build.xml    |  58 +++----
 .../chapter-08/ui-contribution-webapp/pom.xml      |  12 +-
 .../creditcard-payment-sdo-contribution/pom.xml    |  14 +-
 sandbox/travelsample/chapter-09/node/build.xml     | 155 ++++++++++---------
 sandbox/travelsample/chapter-09/node/pom.xml       |  28 ++--
 .../chapter-09/payment-contribution/pom.xml        |  12 +-
 sandbox/travelsample/chapter-09/pom.xml            |   2 +-
 .../chapter-09/ui-contribution/build.xml           |   2 +-
 .../chapter-09/ui-contribution/pom.xml             |  10 +-
 sandbox/travelsample/pom.xml                       |   2 +-
 .../calendar-contribution/pom.xml                  |   6 +-
 .../shared-contributions/car-contribution/pom.xml  |   8 +-
 .../common-contribution/pom.xml                    |   6 +-
 .../creditcard-payment-jaxb-contribution/pom.xml   |  14 +-
 .../currency-contribution/pom.xml                  |   6 +-
 .../emailgateway-contribution/pom.xml              |  12 +-
 .../flight-contribution/pom.xml                    |   8 +-
 .../hotel-contribution/pom.xml                     |   8 +-
 sandbox/travelsample/shared-contributions/pom.xml  |   3 +-
 .../scatours-contribution/pom.xml                  |  18 +--
 .../shoppingcart-contribution/pom.xml              |  63 ++++++--
 .../travelcatalog-contribution/pom.xml             |  12 +-
 .../shared-contributions/trip-contribution/pom.xml |   8 +-
 .../tripbooking-contribution/pom.xml               |  12 +-
 40 files changed, 451 insertions(+), 398 deletions(-)

(limited to 'sandbox/travelsample')

diff --git a/sandbox/travelsample/chapter-01/pom.xml b/sandbox/travelsample/chapter-01/pom.xml
index c7fa91b952..fef850d2d7 100644
--- a/sandbox/travelsample/chapter-01/pom.xml
+++ b/sandbox/travelsample/chapter-01/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
diff --git a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/pom.xml b/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/pom.xml
index 745ddd17b3..fe64ac94b3 100644
--- a/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-02/goodvaluetrips-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-02-goodvaluetrips-contribution</artifactId>
@@ -32,14 +32,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <!--        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         -->
 
diff --git a/sandbox/travelsample/chapter-02/node/build.xml b/sandbox/travelsample/chapter-02/node/build.xml
index 9c6f9f9043..1d3e3adea3 100644
--- a/sandbox/travelsample/chapter-02/node/build.xml
+++ b/sandbox/travelsample/chapter-02/node/build.xml
@@ -118,19 +118,19 @@
         <include name="tuscany-xsd-xml-1.5-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="XmlSchema-1.4.2.jar"/>
+        <include name="XmlSchema-1.5-SNAPSHOT.2.jar"/>
         <include name="activation-1.1.jar"/>
         <include name="annogen-0.1.0.jar"/>
         <include name="asm-all-3.1.jar"/>
         <include name="axiom-api-1.2.7.jar"/>
         <include name="axiom-dom-1.2.7.jar"/>
         <include name="axiom-impl-1.2.7.jar"/>
-        <include name="axis-ant-1.4.jar"/>
-        <include name="axis2-adb-1.4.1.jar"/>
-        <include name="axis2-codegen-1.4.1.jar"/>
-        <include name="axis2-java2wsdl-1.4.1.jar"/>
-        <include name="axis2-kernel-1.4.1.jar"/>
-        <include name="axis2-mtompolicy-1.4.1.jar"/>
+        <include name="axis-ant-1.5-SNAPSHOT.jar"/>
+        <include name="axis2-adb-1.5-SNAPSHOT.1.jar"/>
+        <include name="axis2-codegen-1.5-SNAPSHOT.1.jar"/>
+        <include name="axis2-java2wsdl-1.5-SNAPSHOT.1.jar"/>
+        <include name="axis2-kernel-1.5-SNAPSHOT.1.jar"/>
+        <include name="axis2-mtompolicy-1.5-SNAPSHOT.1.jar"/>
         <include name="backport-util-concurrent-3.1.jar"/>
         <include name="bcprov-jdk13-132.jar"/>
         <include name="cglib-nodep-2.2.jar"/>
@@ -139,12 +139,12 @@
         <include name="commons-discovery-0.2.jar"/>
         <include name="commons-fileupload-1.2.jar"/>
         <include name="commons-httpclient-3.1.jar"/>
-        <include name="commons-io-1.4.jar"/>
+        <include name="commons-io-1.5-SNAPSHOT.jar"/>
         <include name="commons-logging-1.1.1.jar"/>
-        <include name="derby-10.3.1.4.jar"/>
+        <include name="derby-10.3.1.5-SNAPSHOT.jar"/>
         <include name="dom4j-1.6.1.jar"/>
         <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
-        <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
+        <include name="geronimo-javamail_1.5-SNAPSHOT_spec-1.2.jar"/>
         <include name="geronimo-jms_1.1_spec-1.1.jar"/>
         <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
         <include name="httpcore-4.0-beta1.jar"/>
@@ -160,13 +160,13 @@
         <include name="jsr250-api-1.0.jar"/>
         <include name="junit-4.5.jar"/>
         <include name="log4j-1.2.15.jar"/>
-        <include name="mail-1.4.jar"/>
-        <include name="mex-1.41-impl.jar"/>
+        <include name="mail-1.5-SNAPSHOT.jar"/>
+        <include name="mex-1.5-SNAPSHOT1-impl.jar"/>
         <include name="neethi-2.0.4.jar"/>
         <include name="opensaml-1.1.jar"/>
-        <include name="rampart-core-1.4.jar"/>
-        <include name="rampart-policy-1.4.jar"/>
-        <include name="rampart-trust-1.4.jar"/>
+        <include name="rampart-core-1.5-SNAPSHOT.jar"/>
+        <include name="rampart-policy-1.5-SNAPSHOT.jar"/>
+        <include name="rampart-trust-1.5-SNAPSHOT.jar"/>
         <include name="servlet-api-2.3.jar"/>
         <include name="stax-api-1.0-2.jar"/>
         <include name="woden-api-1.0M8.jar"/>
@@ -178,7 +178,7 @@
         <include name="xercesImpl-2.8.1.jar"/>
         <include name="xml-apis-1.3.03.jar"/>
         <include name="xmlParserAPIs-2.6.0.jar"/>
-        <include name="xmlsec-1.4.2.jar"/>
+        <include name="xmlsec-1.5-SNAPSHOT.2.jar"/>
     </fileset>
 
 </project>
diff --git a/sandbox/travelsample/chapter-02/node/pom.xml b/sandbox/travelsample/chapter-02/node/pom.xml
index 15b4cc7333..15fbfaf79c 100644
--- a/sandbox/travelsample/chapter-02/node/pom.xml
+++ b/sandbox/travelsample/chapter-02/node/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
+            <version>10.3.1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/chapter-02/pom.xml b/sandbox/travelsample/chapter-02/pom.xml
index 9450cbaeb5..61d99c1777 100644
--- a/sandbox/travelsample/chapter-02/pom.xml
+++ b/sandbox/travelsample/chapter-02/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-chapter-02</artifactId>
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml
index 4536d16dfe..dc6cea44ae 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sandbox/travelsample/chapter-03/pom.xml b/sandbox/travelsample/chapter-03/pom.xml
index 63b1a1003c..7d417a20de 100644
--- a/sandbox/travelsample/chapter-03/pom.xml
+++ b/sandbox/travelsample/chapter-03/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-chapter-03</artifactId>
diff --git a/sandbox/travelsample/chapter-05/node/build.xml b/sandbox/travelsample/chapter-05/node/build.xml
index 773598a32f..a96dff856a 100644
--- a/sandbox/travelsample/chapter-05/node/build.xml
+++ b/sandbox/travelsample/chapter-05/node/build.xml
@@ -18,19 +18,19 @@
 -->
 
 <project name="scatours-chapter-05-node" default="compile">
-    <property environment="env"/> 
 
     <target name="compile">
         <mkdir dir="target/classes"/>
         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src"/>
+            <src path="src\main\java"/>
             <classpath>
                 <fileset refid="tuscany.jars"/>
                 <fileset refid="3rdparty.jars"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
+            <fileset dir="src\main\resources"/>
+            <fileset dir="src\main\resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-05-node.jar" basedir="target/classes">
             <manifest>
@@ -57,86 +57,86 @@
         </delete>
     </target>
 
-    <fileset id="tuscany.jars" dir="${env.TUSCANY}/modules">
-        <include name="tuscany-assembly-1.4.jar"/>
-        <include name="tuscany-assembly-xml-1.4.jar"/>
-        <include name="tuscany-assembly-xsd-1.4.jar"/>
-        <include name="tuscany-binding-atom-1.4.jar"/>
-        <include name="tuscany-binding-atom-abdera-1.4.jar"/>
-        <include name="tuscany-binding-ejb-1.4.jar"/>
-        <include name="tuscany-binding-ejb-runtime-1.4.jar"/>
-        <include name="tuscany-binding-http-1.4.jar"/>
-        <include name="tuscany-binding-http-runtime-1.4.jar"/>
-        <include name="tuscany-binding-jsonrpc-1.4.jar"/>
-        <include name="tuscany-binding-jsonrpc-runtime-1.4.jar"/>
-        <include name="tuscany-binding-sca-1.4.jar"/>
-        <include name="tuscany-binding-sca-axis2-1.4.jar"/>
-        <include name="tuscany-binding-sca-xml-1.4.jar"/>
-        <include name="tuscany-binding-ws-1.4.jar"/>
-        <include name="tuscany-binding-ws-axis2-1.4.jar"/>
-        <include name="tuscany-binding-ws-axis2-policy-1.4.jar"/>
-        <include name="tuscany-binding-ws-wsdlgen-1.4.jar"/>
-        <include name="tuscany-binding-ws-xml-1.4.jar"/>
-        <include name="tuscany-contribution-1.4.jar"/>
-        <include name="tuscany-contribution-impl-1.4.jar"/>
-        <include name="tuscany-contribution-java-1.4.jar"/>
-        <include name="tuscany-contribution-namespace-1.4.jar"/>
-        <include name="tuscany-contribution-resource-1.4.jar"/>
-        <include name="tuscany-contribution-xml-1.4.jar"/>
-        <include name="tuscany-core-1.4.jar"/>
-        <include name="tuscany-core-databinding-1.4.jar"/>
-        <include name="tuscany-core-spi-1.4.jar"/>
-        <include name="tuscany-data-api-1.4.jar"/>
-        <include name="tuscany-databinding-1.4.jar"/>
-        <include name="tuscany-databinding-axiom-1.4.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4.jar"/>
-        <include name="tuscany-databinding-jaxb-axiom-1.4.jar"/>
-        <include name="tuscany-databinding-json-1.4.jar"/>
-        <include name="tuscany-databinding-sdo-1.4.jar"/>
-        <include name="tuscany-definitions-1.4.jar"/>
-        <include name="tuscany-definitions-xml-1.4.jar"/>
-        <include name="tuscany-domain-manager-1.4.jar"/>
-        <include name="tuscany-endpoint-1.4.jar"/>
-        <include name="tuscany-extensibility-1.4.jar"/>
-        <include name="tuscany-host-embedded-1.4.jar"/>
-        <include name="tuscany-host-http-1.4.jar"/>
-        <include name="tuscany-host-jetty-1.4.jar"/>
-        <include name="tuscany-implementation-bpel-1.4.jar"/>
-        <include name="tuscany-implementation-bpel-ode-1.4.jar"/>
-        <include name="tuscany-implementation-ejb-1.4.jar"/>
-        <include name="tuscany-implementation-java-1.4.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.4.jar"/>
-        <include name="tuscany-implementation-java-xml-1.4.jar"/>
-        <include name="tuscany-implementation-node-1.4.jar"/>
-        <include name="tuscany-implementation-node-runtime-1.4.jar"/>
-        <include name="tuscany-implementation-resource-1.4.jar"/>
-        <include name="tuscany-implementation-resource-runtime-1.4.jar"/>
-        <include name="tuscany-implementation-widget-1.4.jar"/>
-        <include name="tuscany-implementation-widget-runtime-1.4.jar"/>
-        <include name="tuscany-interface-1.4.jar"/>
-        <include name="tuscany-interface-java-1.4.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.4.jar"/>
-        <include name="tuscany-interface-java-xml-1.4.jar"/>
-        <include name="tuscany-interface-wsdl-1.4.jar"/>
-        <include name="tuscany-interface-wsdl-xml-1.4.jar"/>
-        <include name="tuscany-monitor-1.4.jar"/>
-        <include name="tuscany-node-api-1.4.jar"/>
-        <include name="tuscany-node-impl-1.4.jar"/>
-        <include name="tuscany-node-launcher-1.4.jar"/>
-        <include name="tuscany-node-manager-1.4.jar"/>
-        <include name="tuscany-policy-1.4.jar"/>
-        <include name="tuscany-policy-security-1.4.jar"/>
-        <include name="tuscany-policy-xml-1.4.jar"/>
-        <include name="tuscany-policy-xml-ws-1.4.jar"/>
-        <include name="tuscany-sca-api-1.4.jar"/>
-        <include name="tuscany-sca-api-extension-1.4.jar"/>
-        <include name="tuscany-workspace-1.4.jar"/>
-        <include name="tuscany-workspace-impl-1.4.jar"/>
-        <include name="tuscany-workspace-xml-1.4.jar"/>
-        <include name="tuscany-xsd-1.4.jar"/>
-        <include name="tuscany-xsd-xml-1.4.jar"/>
+    <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"/>
     </fileset>
-    <fileset id="3rdparty.jars" dir="${env.TUSCANY}/lib">
+    <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
         <include name="abdera-client-0.4.0-incubating.jar"/>
         <include name="abdera-core-0.4.0-incubating.jar"/>
@@ -162,7 +162,7 @@
         <include name="axis2-mtompolicy-1.4.1.jar"/>
         <include name="backport-util-concurrent-3.1.jar"/>
         <include name="bcprov-jdk13-132.jar"/>
-        <include name="cglib-nodep-2.1_3.jar"/>
+        <include name="cglib-nodep-2.2.jar"/>
         <include name="common-2.2.3.jar"/>
         <include name="commons-codec-1.3.jar"/>
         <include name="commons-collections-3.1.jar"/>
@@ -181,7 +181,6 @@
         <include name="ecore-xmi-2.2.3.jar"/>
         <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
         <include name="geronimo-common-1.2-beta.jar"/>
-        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
         <include name="geronimo-connector-1.2-beta.jar"/>
         <include name="geronimo-core-1.2-beta.jar"/>
         <include name="geronimo-deployment-1.2-beta.jar"/>
diff --git a/sandbox/travelsample/chapter-05/node/pom.xml b/sandbox/travelsample/chapter-05/node/pom.xml
index e5bb7affb5..df2e00eee0 100644
--- a/sandbox/travelsample/chapter-05/node/pom.xml
+++ b/sandbox/travelsample/chapter-05/node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4</version>
+            <version>1.5-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.4</version>
+                <version>1.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java b/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
index e41f28c425..e78b387f6f 100644
--- a/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
+++ b/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
@@ -45,8 +45,8 @@ public class LaunchNode {
                                                                new SCAContribution("trip", "../../shared-contributions/trip-contribution/target/classes"),
                                                                new SCAContribution("tripbooking", "../../shared-contributions/tripbooking-contribution/target/classes"),
                                                                new SCAContribution("travelcatalog", "../../shared-contributions/travelcatalog-contribution/target/classes"),
-                                                               //new SCAContribution("payment", "../../shared-contributions/payment-contribution/target/classes"),
-                                                               //new SCAContribution("emailgateway", "../../shared-contributions/emailgateway-contribution/target/classes"),
+                                                               new SCAContribution("payment", "../../shared-contributions/payment-java-contribution/target/classes"),
+                                                               new SCAContribution("creditcard", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/classes"),
                                                                new SCAContribution("shoppingcart", "../../shared-contributions/shoppingcart-contribution/target/classes"),
                                                                new SCAContribution("scatours", "../../shared-contributions/scatours-contribution/target/classes"),
                                                                new SCAContribution("ui", "../ui-contribution/target/classes"));
diff --git a/sandbox/travelsample/chapter-05/pom.xml b/sandbox/travelsample/chapter-05/pom.xml
index b358ed5804..5507b545d1 100644
--- a/sandbox/travelsample/chapter-05/pom.xml
+++ b/sandbox/travelsample/chapter-05/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-chapter-05</artifactId>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/build.xml b/sandbox/travelsample/chapter-05/ui-contribution/build.xml
index 11d6c40c45..4c14d4dde8 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/build.xml
+++ b/sandbox/travelsample/chapter-05/ui-contribution/build.xml
@@ -22,14 +22,15 @@
     <target name="compile">
         <mkdir dir="target/classes"/>
         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src"/>
+            <src path="src\main\java"/>
             <classpath>
                 <fileset refid="tuscany.jars"/>
                 <fileset refid="3rdparty.jars"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
+            <fileset dir="src\main\resources"/>
+            <fileset dir="src\main\resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-05-ui-contribution.jar" basedir="target/classes">
             <manifest>
@@ -57,48 +58,54 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.4.jar"/>
-        <include name="tuscany-assembly-xml-1.4.jar"/>
-        <include name="tuscany-assembly-xsd-1.4.jar"/>
-        <include name="tuscany-binding-sca-1.4.jar"/>
-        <include name="tuscany-binding-sca-xml-1.4.jar"/>
-        <include name="tuscany-contribution-1.4.jar"/>
-        <include name="tuscany-contribution-impl-1.4.jar"/>
-        <include name="tuscany-contribution-java-1.4.jar"/>
-        <include name="tuscany-contribution-namespace-1.4.jar"/>
-        <include name="tuscany-contribution-xml-1.4.jar"/>
-        <include name="tuscany-core-1.4.jar"/>
-        <include name="tuscany-core-databinding-1.4.jar"/>
-        <include name="tuscany-core-spi-1.4.jar"/>
-        <include name="tuscany-databinding-1.4.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4.jar"/>
-        <include name="tuscany-definitions-1.4.jar"/>
-        <include name="tuscany-definitions-xml-1.4.jar"/>
-        <include name="tuscany-endpoint-1.4.jar"/>
-        <include name="tuscany-extensibility-1.4.jar"/>
-        <include name="tuscany-host-embedded-1.4.jar"/>
-        <include name="tuscany-implementation-node-1.4.jar"/>
-        <include name="tuscany-interface-1.4.jar"/>
-        <include name="tuscany-interface-java-1.4.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.4.jar"/>
-        <include name="tuscany-interface-java-xml-1.4.jar"/>
-        <include name="tuscany-monitor-1.4.jar"/>
-        <include name="tuscany-node-api-1.4.jar"/>
-        <include name="tuscany-node-impl-1.4.jar"/>
-        <include name="tuscany-policy-1.4.jar"/>
-        <include name="tuscany-policy-xml-1.4.jar"/>
-        <include name="tuscany-sca-api-1.4.jar"/>
-        <include name="tuscany-sca-api-extension-1.4.jar"/>
-        <include name="tuscany-xsd-1.4.jar"/>
+        <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"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
         <include name="activation-1.1.jar"/>
         <include name="asm-all-3.1.jar"/>
-        <include name="cglib-nodep-2.1_3.jar"/>
-        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+        <include name="axiom-api-1.2.7.jar"/>
+        <include name="axiom-impl-1.2.7.jar"/>
+        <include name="cglib-nodep-2.2.jar"/>
+        <include name="commons-logging-1.1.1.jar"/>
+        <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
+        <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
+        <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
         <include name="jaxb-api-2.1.jar"/>
         <include name="jaxb-impl-2.1.7.jar"/>
+        <include name="jaxen-1.1.1.jar"/>
         <include name="jaxws-api-2.1.jar"/>
         <include name="jsr181-api-1.0-MR1.jar"/>
         <include name="jsr250-api-1.0.jar"/>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/pom.xml b/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
index bc9399e9d8..a51f04ce59 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4</version>
+            <version>1.5-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.4</version>
+                <version>1.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sandbox/travelsample/chapter-06/pom.xml b/sandbox/travelsample/chapter-06/pom.xml
index 4a5ec5b694..b8fc7a5881 100644
--- a/sandbox/travelsample/chapter-06/pom.xml
+++ b/sandbox/travelsample/chapter-06/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-chapter-06</artifactId>
@@ -38,6 +38,10 @@
             <modules>
                 <module>node</module>
                 <module>payment-bpel-contribution</module>
+                <module>payment-spring-contribution</module>
+                <module>payment-spring-annotation-contribution</module>
+                <module>ui-bpel-contribution</module>
+                <module>ui-spring-contribution</module>
             </modules>
         </profile>
 
diff --git a/sandbox/travelsample/chapter-07/pom.xml b/sandbox/travelsample/chapter-07/pom.xml
index b418036f65..5f9e3ef56b 100644
--- a/sandbox/travelsample/chapter-07/pom.xml
+++ b/sandbox/travelsample/chapter-07/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-chapter-07</artifactId>
diff --git a/sandbox/travelsample/chapter-08/pom.xml b/sandbox/travelsample/chapter-08/pom.xml
index 0ac36f2965..caf9636c18 100644
--- a/sandbox/travelsample/chapter-08/pom.xml
+++ b/sandbox/travelsample/chapter-08/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-chapter-08</artifactId>
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/build.xml b/sandbox/travelsample/chapter-08/ui-contribution-webapp/build.xml
index 924456228e..f453e53815 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/build.xml
+++ b/sandbox/travelsample/chapter-08/ui-contribution-webapp/build.xml
@@ -57,35 +57,35 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-endpoint-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.5-SNAPSHOT-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.5-SNAPSHOT-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.3.1.jar"/>
diff --git a/sandbox/travelsample/chapter-08/ui-contribution-webapp/pom.xml b/sandbox/travelsample/chapter-08/ui-contribution-webapp/pom.xml
index 614ff82ac7..a253fbf74b 100644
--- a/sandbox/travelsample/chapter-08/ui-contribution-webapp/pom.xml
+++ b/sandbox/travelsample/chapter-08/ui-contribution-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <packaging>war</packaging>
@@ -33,27 +33,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
@@ -86,7 +86,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>1.5-SNAPSHOT-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml
index 9fb34dba76..e93aa76758 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml
+++ b/sandbox/travelsample/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.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/chapter-09/node/build.xml b/sandbox/travelsample/chapter-09/node/build.xml
index 84c1a14a5e..2c26646c51 100644
--- a/sandbox/travelsample/chapter-09/node/build.xml
+++ b/sandbox/travelsample/chapter-09/node/build.xml
@@ -18,19 +18,19 @@
 -->
 
 <project name="scatours-chapter-09-node" default="compile">
-    <property environment="env"/> 
 
     <target name="compile">
         <mkdir dir="target/classes"/>
         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src"/>
+            <src path="src\main\java"/>
             <classpath>
                 <fileset refid="tuscany.jars"/>
                 <fileset refid="3rdparty.jars"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
+            <fileset dir="src\main\resources"/>
+            <fileset dir="src\main\resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-09-node.jar" basedir="target/classes">
             <manifest>
@@ -57,80 +57,80 @@
         </delete>
     </target>
 
-    <fileset id="tuscany.jars" dir="${env.TUSCANY}/modules">
-        <include name="tuscany-assembly-1.4.jar"/>
-        <include name="tuscany-assembly-xml-1.4.jar"/>
-        <include name="tuscany-assembly-xsd-1.4.jar"/>
-        <include name="tuscany-binding-atom-1.4.jar"/>
-        <include name="tuscany-binding-atom-abdera-1.4.jar"/>
-        <include name="tuscany-binding-http-1.4.jar"/>
-        <include name="tuscany-binding-http-runtime-1.4.jar"/>
-        <include name="tuscany-binding-jsonrpc-1.4.jar"/>
-        <include name="tuscany-binding-jsonrpc-runtime-1.4.jar"/>
-        <include name="tuscany-binding-sca-1.4.jar"/>
-        <include name="tuscany-binding-sca-axis2-1.4.jar"/>
-        <include name="tuscany-binding-sca-xml-1.4.jar"/>
-        <include name="tuscany-binding-ws-1.4.jar"/>
-        <include name="tuscany-binding-ws-axis2-1.4.jar"/>
-        <include name="tuscany-binding-ws-axis2-policy-1.4.jar"/>
-        <include name="tuscany-binding-ws-wsdlgen-1.4.jar"/>
-        <include name="tuscany-binding-ws-xml-1.4.jar"/>
-        <include name="tuscany-contribution-1.4.jar"/>
-        <include name="tuscany-contribution-impl-1.4.jar"/>
-        <include name="tuscany-contribution-java-1.4.jar"/>
-        <include name="tuscany-contribution-namespace-1.4.jar"/>
-        <include name="tuscany-contribution-resource-1.4.jar"/>
-        <include name="tuscany-contribution-xml-1.4.jar"/>
-        <include name="tuscany-core-1.4.jar"/>
-        <include name="tuscany-core-databinding-1.4.jar"/>
-        <include name="tuscany-core-spi-1.4.jar"/>
-        <include name="tuscany-data-api-1.4.jar"/>
-        <include name="tuscany-databinding-1.4.jar"/>
-        <include name="tuscany-databinding-axiom-1.4.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4.jar"/>
-        <include name="tuscany-databinding-jaxb-axiom-1.4.jar"/>
-        <include name="tuscany-databinding-json-1.4.jar"/>
-        <include name="tuscany-definitions-1.4.jar"/>
-        <include name="tuscany-definitions-xml-1.4.jar"/>
-        <include name="tuscany-domain-manager-1.4.jar"/>
-        <include name="tuscany-endpoint-1.4.jar"/>
-        <include name="tuscany-extensibility-1.4.jar"/>
-        <include name="tuscany-host-embedded-1.4.jar"/>
-        <include name="tuscany-host-http-1.4.jar"/>
-        <include name="tuscany-host-jetty-1.4.jar"/>
-        <include name="tuscany-implementation-java-1.4.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.4.jar"/>
-        <include name="tuscany-implementation-java-xml-1.4.jar"/>
-        <include name="tuscany-implementation-node-1.4.jar"/>
-        <include name="tuscany-implementation-node-runtime-1.4.jar"/>
-        <include name="tuscany-implementation-resource-1.4.jar"/>
-        <include name="tuscany-implementation-resource-runtime-1.4.jar"/>
-        <include name="tuscany-implementation-widget-1.4.jar"/>
-        <include name="tuscany-implementation-widget-runtime-1.4.jar"/>
-        <include name="tuscany-interface-1.4.jar"/>
-        <include name="tuscany-interface-java-1.4.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.4.jar"/>
-        <include name="tuscany-interface-java-xml-1.4.jar"/>
-        <include name="tuscany-interface-wsdl-1.4.jar"/>
-        <include name="tuscany-interface-wsdl-xml-1.4.jar"/>
-        <include name="tuscany-monitor-1.4.jar"/>
-        <include name="tuscany-node-api-1.4.jar"/>
-        <include name="tuscany-node-impl-1.4.jar"/>
-        <include name="tuscany-node-launcher-1.4.jar"/>
-        <include name="tuscany-node-manager-1.4.jar"/>
-        <include name="tuscany-policy-1.4.jar"/>
-        <include name="tuscany-policy-security-1.4.jar"/>
-        <include name="tuscany-policy-xml-1.4.jar"/>
-        <include name="tuscany-policy-xml-ws-1.4.jar"/>
-        <include name="tuscany-sca-api-1.4.jar"/>
-        <include name="tuscany-sca-api-extension-1.4.jar"/>
-        <include name="tuscany-workspace-1.4.jar"/>
-        <include name="tuscany-workspace-impl-1.4.jar"/>
-        <include name="tuscany-workspace-xml-1.4.jar"/>
-        <include name="tuscany-xsd-1.4.jar"/>
-        <include name="tuscany-xsd-xml-1.4.jar"/>
+    <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"/>
     </fileset>
-    <fileset id="3rdparty.jars" dir="${env.TUSCANY}/lib">
+    <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
         <include name="abdera-client-0.4.0-incubating.jar"/>
         <include name="abdera-core-0.4.0-incubating.jar"/>
@@ -154,7 +154,7 @@
         <include name="axis2-mtompolicy-1.4.1.jar"/>
         <include name="backport-util-concurrent-3.1.jar"/>
         <include name="bcprov-jdk13-132.jar"/>
-        <include name="cglib-nodep-2.1_3.jar"/>
+        <include name="cglib-nodep-2.2.jar"/>
         <include name="commons-codec-1.3.jar"/>
         <include name="commons-collections-3.1.jar"/>
         <include name="commons-discovery-0.2.jar"/>
@@ -164,7 +164,6 @@
         <include name="commons-logging-1.1.1.jar"/>
         <include name="derby-10.3.1.4.jar"/>
         <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
-        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
         <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
         <include name="geronimo-jms_1.1_spec-1.1.jar"/>
         <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
diff --git a/sandbox/travelsample/chapter-09/node/pom.xml b/sandbox/travelsample/chapter-09/node/pom.xml
index 08cd919bfc..b6a0d70a6a 100644
--- a/sandbox/travelsample/chapter-09/node/pom.xml
+++ b/sandbox/travelsample/chapter-09/node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-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.4</version>
+                <version>1.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/pom.xml b/sandbox/travelsample/chapter-09/payment-contribution/pom.xml
index ce60f33f29..5f3b822de7 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-09/payment-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sandbox/travelsample/chapter-09/pom.xml b/sandbox/travelsample/chapter-09/pom.xml
index 8fac6c9a59..7d7bee30ff 100644
--- a/sandbox/travelsample/chapter-09/pom.xml
+++ b/sandbox/travelsample/chapter-09/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-chapter-09</artifactId>
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/build.xml b/sandbox/travelsample/chapter-09/ui-contribution/build.xml
index 0aa96f56de..dfebf9c5c1 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/build.xml
+++ b/sandbox/travelsample/chapter-09/ui-contribution/build.xml
@@ -92,7 +92,7 @@
         <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="XmlSchema-1.4.2.jar"/>
+        <include name="XmlSchema-1.5-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/chapter-09/ui-contribution/pom.xml
index b330385cd1..8b6a8790b1 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-09/ui-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
diff --git a/sandbox/travelsample/pom.xml b/sandbox/travelsample/pom.xml
index af9fa85ee9..4227a3588a 100644
--- a/sandbox/travelsample/pom.xml
+++ b/sandbox/travelsample/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours</artifactId>
diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml b/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml
index 165ffa20b5..ac4004355c 100644
--- a/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/shared-contributions/car-contribution/pom.xml b/sandbox/travelsample/shared-contributions/car-contribution/pom.xml
index 7cfcf79d97..9728629bfe 100644
--- a/sandbox/travelsample/shared-contributions/car-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/car-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/pom.xml b/sandbox/travelsample/shared-contributions/common-contribution/pom.xml
index 6563b8d6ab..1a876f2539 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/common-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml
index 137ed29d5b..edf5b6cc21 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml
+++ b/sandbox/travelsample/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.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml b/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml
index f358d94f98..9897d0dcb8 100644
--- a/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml b/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml
index 302c9398b9..87d39db135 100644
--- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml b/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml
index b324946692..87420897e3 100644
--- a/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml b/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml
index b9c7483699..4d985fdf51 100644
--- a/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/pom.xml b/sandbox/travelsample/shared-contributions/pom.xml
index 648c067f92..dec2e0b4a1 100644
--- a/sandbox/travelsample/shared-contributions/pom.xml
+++ b/sandbox/travelsample/shared-contributions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-common-contributions</artifactId>
@@ -49,6 +49,7 @@
                 <module>tripbooking-contribution</module>
                 <module>trip-contribution</module>
                 <module>scatours-contribution</module>
+                <module>payment-java-contribution</module>
             </modules>
         </profile>
 
diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml b/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml
index 816fbe11b4..6a29b5d00c 100644
--- a/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-travelcatalog-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-tripbooking-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-shoppingcart-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>     
 
         <!--        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-paymentprocess-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         -->
 
diff --git a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml
index 248c757067..0b90382703 100644
--- a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-shoppingcart-contribution</artifactId>
@@ -32,34 +32,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
-
-        <!--        
+       
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-paymentprocess-contribution</artifactId>
-            <version>1.4</version>
+            <artifactId>scatours-payment-java-contribution</artifactId>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
-        -->
 
         <dependency>
             <groupId>junit</groupId>
@@ -72,5 +70,50 @@
 
     <build>
        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.9</version>
+                <executions>
+                    <execution>
+                        <id>payment</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>payment</packageName>
+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>Payment.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution>               
+                </executions>
+            </plugin>      
+        </plugins>
     </build>
 </project>
diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml
index 0622458c17..54e521d76b 100644
--- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-tripbooking-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml b/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml
index 4f2cb813fb..3c257ac4b1 100644
--- a/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml b/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml
index 23cffc631f..66f006a670 100644
--- a/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-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.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-shoppingcart-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>         
 
         <dependency>
-- 
cgit v1.2.3