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

3 files changed, 12 insertions, 10 deletions

diff --git a/sandbox/travelsample/payment-contribution/pom.xml b/sandbox/travelsample/payment-contribution/pom.xml
index 2e22120c38..903bd7096f 100644
--- a/sandbox/travelsample/payment-contribution/pom.xml
+++ b/sandbox/travelsample/payment-contribution/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-payment-contribution</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-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</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-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-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
index ac5af4e547..48378e6cd0 100644
--- a/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
@@ -24,6 +24,7 @@ import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -58,6 +59,7 @@ public class CreditCardPaymentTestCase {
     }
     
     @Test
+    //@Ignore
     public void testWaitForInput() {
         System.out.println("Press a key to end");
         try {
diff --git a/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl b/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
index 14ab0b3bbb..b40c341389 100644
--- a/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
@@ -30,7 +30,7 @@
                     targetNamespace="http://www.example.org/CreditCardPayment/"

                     xmlns:tns="http://www.example.org/CreditCardPayment/">

             

-            <xsd:element name="Authorize" type="tns:AuthorizeType"/>

+            <xsd:element name="authorize" type="tns:AuthorizeType"/>

             <xsd:complexType name="AuthorizeType">

                 <xsd:sequence>

                     <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

@@ -38,7 +38,7 @@
                 </xsd:sequence>

             </xsd:complexType>

 

-            <xsd:element name="AuthorizeResponse" type="tns:AuthorizeResponseType"/>

+            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>

             <xsd:complexType name="AuthorizeResponseType">

                 <xsd:sequence>

                     <xsd:element name="Status" type="xsd:string"></xsd:element>

@@ -81,10 +81,10 @@
         </xsd:schema>

     </wsdl:types>
     <wsdl:message name="AuthorizeRequest">

-        <wsdl:part name="parameters" element="tns:Authorize"></wsdl:part>

+        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

     </wsdl:message>

     <wsdl:message name="AuthorizeResponse">

-        <wsdl:part name="parameters" element="tns:AuthorizeResponse"></wsdl:part>

+        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

     </wsdl:message>

     <wsdl:portType name="CreditCardPayment">

         <wsdl:operation name="authorize">