Fix up the BPEL payment component to run in the wider application and take advantage of the BPEL resolved fix in 1.x

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

4 files changed, 204 insertions, 179 deletions

diff --git a/sandbox/travelsample/chapter-06/node/build.xml b/sandbox/travelsample/chapter-06/node/build.xml
index 05d7479267..0ccfcedee1 100644
--- a/sandbox/travelsample/chapter-06/node/build.xml
+++ b/sandbox/travelsample/chapter-06/node/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-06-node.jar" basedir="target/classes">
             <manifest>
@@ -57,83 +58,78 @@
     </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-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"/>
+        <include name="tuscany-assembly-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-abdera-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-axis2-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-policy-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-wsdlgen-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-resource-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-data-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-axiom-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-axiom-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-json-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-domain-manager-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-jetty-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-spring-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-launcher-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-manager-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-ws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-xml-1.5-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
@@ -146,13 +142,12 @@
         <include name="abdera-parser-0.4.0-incubating.jar"/>
         <include name="abdera-server-0.4.0-incubating.jar"/>
         <include name="activation-1.1.jar"/>
-        <include name="activeio-2.0-r118.jar"/>
         <include name="annogen-0.1.0.jar"/>
+        <include name="aopalliance-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="axion-1.0-M3-dev.jar"/>
         <include name="axis-ant-1.4.jar"/>
         <include name="axis2-adb-1.4.1.jar"/>
         <include name="axis2-codegen-1.4.1.jar"/>
@@ -161,59 +156,26 @@
         <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="common-2.2.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"/>
         <include name="commons-fileupload-1.2.jar"/>
         <include name="commons-httpclient-3.1.jar"/>
         <include name="commons-io-1.4.jar"/>
-        <include name="commons-jexl-1.1.jar"/>
-        <include name="commons-lang-2.1.jar"/>
         <include name="commons-logging-1.1.1.jar"/>
-        <include name="commons-primitives-1.0.jar"/>
         <include name="derby-10.3.1.4.jar"/>
-        <include name="dom4j-1.6.1.jar"/>
-        <include name="ecore-2.2.3.jar"/>
-        <include name="ecore-change-2.2.3.jar"/>
-        <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"/>
-        <include name="geronimo-ejb_3.0_spec-1.0.jar"/>
-        <include name="geronimo-interceptor-1.2-beta.jar"/>
-        <include name="geronimo-j2ee-1.2-beta.jar"/>
-        <include name="geronimo-j2ee-connector_1.5_spec-1.1.jar"/>
-        <include name="geronimo-j2ee-jacc_1.0_spec-1.1.jar"/>
-        <include name="geronimo-j2ee-management_1.0_spec-1.1.jar"/>
         <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
         <include name="geronimo-jms_1.1_spec-1.1.jar"/>
-        <include name="geronimo-jpa_3.0_spec-1.0.jar"/>
-        <include name="geronimo-jta_1.0.1B_spec-1.0.jar"/>
-        <include name="geronimo-kernel-1.2-beta.jar"/>
-        <include name="geronimo-management-1.2-beta.jar"/>
-        <include name="geronimo-naming-1.2-beta.jar"/>
-        <include name="geronimo-security-1.2-beta.jar"/>
-        <include name="geronimo-spec-j2ee-connector-1.5-rc4.jar"/>
-        <include name="geronimo-spec-jta-1.0.1B-rc4.jar"/>
         <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
-        <include name="geronimo-system-1.2-beta.jar"/>
-        <include name="geronimo-transaction-1.2-beta.jar"/>
-        <include name="geronimo-util-1.2-beta.jar"/>
-        <include name="howl-1.0.1-1.jar"/>
         <include name="htmlparser-1.0.5.jar"/>
         <include name="httpcore-4.0-beta1.jar"/>
         <include name="httpcore-nio-4.0-beta1.jar"/>
-        <include name="javacc-3.2.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="jdom-1.0.jar"/>
         <include name="jettison-1.0.1.jar"/>
         <include name="jetty-6.1.7.jar"/>
         <include name="jetty-util-6.1.7.jar"/>
@@ -221,54 +183,29 @@
         <include name="jsr181-api-1.0-MR1.jar"/>
         <include name="jsr250-api-1.0.jar"/>
         <include name="junit-4.5.jar"/>
-        <include name="log4j-1.2.13.jar"/>
+        <include name="log4j-1.2.15.jar"/>
         <include name="mail-1.4.jar"/>
         <include name="mex-1.41-impl.jar"/>
         <include name="neethi-2.0.4.jar"/>
-        <include name="ode-bpel-api-1.1.1.jar"/>
-        <include name="ode-bpel-compiler-1.1.1.jar"/>
-        <include name="ode-bpel-dao-1.1.1.jar"/>
-        <include name="ode-bpel-epr-1.1.1.jar"/>
-        <include name="ode-bpel-obj-1.1.1.jar"/>
-        <include name="ode-bpel-runtime-1.1.1.jar"/>
-        <include name="ode-bpel-schemas-1.1.1.jar"/>
-        <include name="ode-bpel-store-1.1.1.jar"/>
-        <include name="ode-dao-jpa-1.1.1.jar"/>
-        <include name="ode-jacob-1.1.1.jar"/>
-        <include name="ode-jacob-ap-1.1.1.jar"/>
-        <include name="ode-scheduler-simple-1.1.1.jar"/>
-        <include name="ode-utils-1.1.1.jar"/>
-        <include name="openjpa-all-0.9.7-incubating.jar"/>
-        <include name="openjpa-persistence-0.9.7-incubating.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="regexp-1.3.jar"/>
-        <include name="saxon-8.7.jar"/>
-        <include name="saxon-dom-8.7.jar"/>
-        <include name="saxon-xpath-8.7.jar"/>
-        <include name="serp-1.12.0.jar"/>
         <include name="servlet-api-2.5.jar"/>
+        <include name="spring-beans-2.5.5.jar"/>
+        <include name="spring-context-2.5.5.jar"/>
+        <include name="spring-core-2.5.5.jar"/>
         <include name="stax-api-1.0-2.jar"/>
-        <include name="tranql-connector-1.1.jar"/>
-        <include name="tuscany-sdo-api-r2.1-1.1.1.jar"/>
-        <include name="tuscany-sdo-impl-1.1.1.jar"/>
-        <include name="tuscany-sdo-lib-1.1.1.jar"/>
         <include name="woden-api-1.0M8.jar"/>
         <include name="woden-impl-dom-1.0M8.jar"/>
         <include name="wsdl4j-1.6.2.jar"/>
         <include name="wss4j-1.5.4.jar"/>
         <include name="wstx-asl-3.2.4.jar"/>
         <include name="xalan-2.7.0.jar"/>
-        <include name="xbean-naming-2.7.jar"/>
         <include name="xercesImpl-2.8.1.jar"/>
         <include name="xml-apis-1.3.03.jar"/>
-        <include name="xml-resolver-1.1.jar"/>
         <include name="xmlParserAPIs-2.6.0.jar"/>
-        <include name="xmlbeans-2.3.0.jar"/>
         <include name="xmlsec-1.4.2.jar"/>
-        <include name="xsd-2.2.3.jar"/>
     </fileset>
 
 </project>
diff --git a/sandbox/travelsample/chapter-06/node/pom.xml b/sandbox/travelsample/chapter-06/node/pom.xml
index 61c8b43b94..5319b87630 100644
--- a/sandbox/travelsample/chapter-06/node/pom.xml
+++ b/sandbox/travelsample/chapter-06/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-06-node</artifactId>
@@ -32,103 +32,89 @@
             <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>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.4</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>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -147,7 +133,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>
@@ -159,6 +145,42 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                    <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
+                    <version>2.3.1</version>
+                <configuration>
+                    <useFile>false</useFile>
+                    <trimStackTrace>false</trimStackTrace>
+                    <useSystemClassLoader>true</useSystemClassLoader>
+                </configuration>
+            </plugin>             
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.ode</groupId>
+                                    <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+                                    <version>1.1</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>                   
        </plugins>
     </build>
 </project>
diff --git a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchNode.java b/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
index 777963c13e..e87b0ca44e 100644
--- a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchNode.java
+++ b/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
@@ -24,11 +24,10 @@ import java.io.IOException;
 import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
 
-public class LaunchNode {
+public class LaunchBPELExampleNode {
     public static void main(String[] args) throws Exception {
-        LaunchNode.launchFromFileSystemDir();
+        LaunchBPELExampleNode.launchFromFileSystemDir();
     }
     
     // OK for development but you must launch the node from this module 
@@ -45,11 +44,12 @@ 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("creditcardpayment", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/classes"),
                                                                new SCAContribution("emailgateway", "../../shared-contributions/emailgateway-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"));
+                                                               new SCAContribution("payment", "../payment-bpel-contribution/target/classes"),
+                                                               new SCAContribution("ui", "../ui-bpel-contribution/target/classes"));
             node.start();
             
             System.out.println("Node started - Press enter to shutdown.");
diff --git a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java b/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
new file mode 100644
index 0000000000..45c9be4bce
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package scatours;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+
+public class LaunchSpringExampleNode {
+    public static void main(String[] args) throws Exception {
+        LaunchSpringExampleNode.launchFromFileSystemDir();
+    }
+    
+    // OK for development but you must launch the node from this module 
+    public static void launchFromFileSystemDir(){
+        SCANode node = null; 
+        
+        try {
+            node = SCANodeFactory.newInstance().createSCANode("scatours.composite", 
+                                                               new SCAContribution("common", "../../shared-contributions/common-contribution/target/classes"),
+                                                               new SCAContribution("currency", "../../shared-contributions/currency-contribution/target/classes"),
+                                                               new SCAContribution("hotel", "../../shared-contributions/hotel-contribution/target/classes"),
+                                                               new SCAContribution("flight", "../../shared-contributions/flight-contribution/target/classes"),
+                                                               new SCAContribution("car", "../../shared-contributions/car-contribution/target/classes"),
+                                                               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("creditcardpayment", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/classes"),
+                                                               new SCAContribution("emailgateway", "../../shared-contributions/emailgateway-contribution/target/classes"),
+                                                               new SCAContribution("shoppingcart", "../../shared-contributions/shoppingcart-contribution/target/classes"),
+                                                               new SCAContribution("scatours", "../../shared-contributions/scatours-contribution/target/classes"),
+                                                               new SCAContribution("payment", "../payment-spring-annotation-contribution/target/classes"),
+                                                               new SCAContribution("ui", "../ui-spring-contribution/target/classes"));
+            node.start();
+            
+            System.out.println("Node started - Press enter to shutdown.");
+            try {
+                System.in.read();
+            } catch (IOException e) {}
+            
+            node.stop();
+            
+        } catch (Exception ex) {
+            System.out.println(ex.toString());
+        }
+    }     
+}