Updates to payment process now that implementation.bpel can support multiple outgoing partner links

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

2 files changed, 95 insertions, 97 deletions

diff --git a/sandbox/travelsample/node/build.xml b/sandbox/travelsample/node/build.xml
index 7c4e2ae15a..e515111e39 100644
--- a/sandbox/travelsample/node/build.xml
+++ b/sandbox/travelsample/node/build.xml
@@ -57,80 +57,80 @@
     </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-atom-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-atom-abdera-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ejb-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ejb-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-axis2-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-policy-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-wsdlgen-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-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-resource-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-data-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-axiom-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-json-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-manager-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-host-http-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-host-jetty-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-ejb-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-widget-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-widget-runtime-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-interface-wsdl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-logging-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-manager-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-security-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-ws-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-impl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-xml-1.4-SNAPSHOT.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-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-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-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="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
@@ -155,15 +155,14 @@
         <include name="axis2-kernel-1.4.1.jar"/>
         <include name="axis2-mtompolicy-1.4.1.jar"/>
         <include name="backport-util-concurrent-3.1.jar"/>
-        <include name="bcel-5.2.jar"/>
-        <include name="bcprov-jdk15-132.jar"/>
+        <include name="bcprov-jdk13-132.jar"/>
         <include name="cglib-nodep-2.1_3.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.1.1.jar"/>
-        <include name="commons-httpclient-3.0.1.jar"/>
-        <include name="commons-io-1.1.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-logging-1.1.1.jar"/>
         <include name="derby-10.3.1.4.jar"/>
         <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
@@ -175,7 +174,6 @@
         <include name="htmlparser-1.0.5.jar"/>
         <include name="httpcore-4.0-beta1.jar"/>
         <include name="httpcore-nio-4.0-beta1.jar"/>
-        <include name="jakarta-regexp-1.4.jar"/>
         <include name="jaxb-api-2.1.jar"/>
         <include name="jaxb-impl-2.1.7.jar"/>
         <include name="jaxen-1.1.1.jar"/>
@@ -186,7 +184,7 @@
         <include name="json-rpc-1.0.jar"/>
         <include name="jsr181-api-1.0-MR1.jar"/>
         <include name="jsr250-api-1.0.jar"/>
-        <include name="junit-3.8.1.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"/>
diff --git a/sandbox/travelsample/node/pom.xml b/sandbox/travelsample/node/pom.xml
index 18deb000d0..43436113c6 100644
--- a/sandbox/travelsample/node/pom.xml
+++ b/sandbox/travelsample/node/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>scatours-node</artifactId>
@@ -32,96 +32,96 @@
             <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</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-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -154,7 +154,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>1.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>