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

9 files changed, 96 insertions, 70 deletions

diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
index a90c73cdfb..22ef6de317 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
@@ -18,17 +18,17 @@
  * under the License.    
 -->
 <wsdl:definitions name="CreditCardPayment" 
-                  targetNamespace="http://www.example.org/CreditCardPayment/"
+                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/CreditCardPayment/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                   xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
                   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
     <wsdl:types>
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.example.org/CreditCardPayment/"
-                    xmlns:tns="http://www.example.org/CreditCardPayment/"
+                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
+                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"
                     elementFormDefault="unqualified">
             
             <xsd:element name="authorize" type="tns:AuthorizeType"/>
@@ -96,7 +96,7 @@
     <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
         <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.example.org/CreditCardPayment/authorize" />
+            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
             <wsdl:input>
                 <soap:body use="literal" />
             </wsdl:input>
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
index d9a5e36bc0..a097d9b7e4 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
@@ -18,17 +18,17 @@
  * under the License.    
 -->
 <wsdl:definitions name="EmailGateway" 
-                  targetNamespace="http://www.example.org/EmailGateway/"
+                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/EmailGateway/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 
                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                   xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
                   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
     <wsdl:types>
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.example.org/EmailGateway/"
-                    xmlns:tns="http://www.example.org/EmailGateway/">
+                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
+                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">
                     
             <xsd:element name="sendEmail" type="tns:SendEmailType"/>
             <xsd:complexType name="SendEmailType">
@@ -68,7 +68,7 @@
     <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
         <wsdl:operation name="sendEmail">
-            <soap:operation soapAction="http://www.example.org/EmailGateway/sendEmail" />
+            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />
             <wsdl:input>
                 <soap:body use="literal" />
             </wsdl:input>
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
index 6ce6568b62..725c95a2bd 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,6 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="scatours.payment"/>
-   <export namespace="http://www.example.org/Payment"/>
+   <export namespace="http://www.tuscanyscatours.com/Payment"/>
+   <export namespace="http://www.tuscanyscatours.com/Payment/"/>
 </contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
index 399b550334..e2c4062f2e 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
@@ -18,51 +18,51 @@
  * under the License.    
 -->
 <wsdl:definitions name="Payment" 
-                  targetNamespace="http://www.example.org/Payment/"
+                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/Payment/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                   xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
                   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
     <wsdl:types>
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.example.org/Payment/"
-                    xmlns:tns="http://www.example.org/Payment/">
+                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
+                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
 
-            <xsd:complexType name="MakePaymentType">
+            <xsd:complexType name="MakePaymentMemberType">
                 <xsd:sequence>
                     <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
                     <xsd:element name="Amount" type="xsd:float"></xsd:element>
                 </xsd:sequence>
             </xsd:complexType>                    
-            <xsd:element name="makePayment" type="tns:MakePaymentType"/>
+            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
       
-            <xsd:complexType name="MakePaymentResponseType">
+            <xsd:complexType name="MakePaymentMemberResponseType">
                 <xsd:sequence>
                     <xsd:element name="Status" type="xsd:string"></xsd:element>
                 </xsd:sequence>
             </xsd:complexType>
-            <xsd:element name="makePaymentResponse" type="tns:MakePaymentResponseType"/>
+            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
             
         </xsd:schema>
     </wsdl:types>
-    <wsdl:message name="MakePaymentRequest">
-        <wsdl:part name="parameters" element="tns:makePayment"></wsdl:part>
+    <wsdl:message name="MakePaymentMemberRequest">
+        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
     </wsdl:message>
-    <wsdl:message name="MakePaymentResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentResponse"></wsdl:part>
+    <wsdl:message name="MakePaymentMemberResponse">
+        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:portType name="Payment">
-        <wsdl:operation name="makePayment">
-            <wsdl:input message="tns:MakePaymentRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentResponse"></wsdl:output>
+        <wsdl:operation name="makePaymentMember">
+            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
+            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
         </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="PaymentBinding" type="tns:Payment">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePayment">
-            <soap:operation soapAction="http://www.example.org/Payment/makePayment" />
+        <wsdl:operation name="makePaymentMember">
+            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
             <wsdl:input>
                 <soap:body use="literal" />
             </wsdl:input>
@@ -73,7 +73,7 @@
     </wsdl:binding>
     <wsdl:service name="PaymentService">
         <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8083/Payment" />
+            <soap:address location="http://localhost:8080/Payment" />
         </wsdl:port>
     </wsdl:service>
     
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
index 25c10d43a7..8f11d76888 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
@@ -17,29 +17,29 @@
   ~ under the License.
   -->
 <process name="Payment"
-    targetNamespace="http://www.example.org/Payment"
+    targetNamespace="http://www.tuscanyscatours.com/Payment"
     xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

     xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
     xmlns:tns="http://tuscany.apache.org/Payment"    
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pp="http://www.example.org/Payment/"
-    xmlns:ccp="http://www.example.org/CreditCardPayment/"
-    xmlns:eg="http://www.example.org/EmailGateway/"
+    xmlns:pp="http://www.tuscanyscatours.com/Payment/"
+    xmlns:ccp="http://www.tuscanyscatours.com/CreditCardPayment/"
+    xmlns:eg="http://www.tuscanyscatours.com/EmailGateway/"
     queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
     expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
 
   <import location="Payment.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/Payment/"/>     
+          namespace="http://www.tuscanyscatours.com/Payment/"/>     
 
   <import location="CreditCardPayment.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/CreditCardPayment/"/>
+          namespace="http://www.tuscanyscatours.com/CreditCardPayment/"/>
           
   <import location="EmailGateway.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/EmailGateway/"/>          
+          namespace="http://www.tuscanyscatours.com/EmailGateway/"/>          
           
    <partnerLinks>
       <partnerLink name="paymentPartnerLink" partnerLinkType="pp:PaymentLinkType" myRole="forward" />
@@ -48,8 +48,8 @@
    </partnerLinks>
     
    <variables>
-     <variable name="makePaymentRequestMessage" messageType="pp:MakePaymentRequest"/>
-     <variable name="makePaymentResponseMessage" messageType="pp:MakePaymentResponse"/>
+     <variable name="makePaymentMemberRequestMessage" messageType="pp:MakePaymentMemberRequest"/>
+     <variable name="makePaymentMemberResponseMessage" messageType="pp:MakePaymentMemberResponse"/>
      <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
      <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
      <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
@@ -60,8 +60,8 @@
        <receive name="start"
                 partnerLink="paymentPartnerLink"
                 portType="pp:Payment"
-           	    operation="makePayment"
-                variable="makePaymentRequestMessage"
+           	    operation="makePaymentMember"
+                variable="makePaymentMemberRequestMessage"
                 createInstance="yes"/>
 
        <!-- set up call to payments service -->
@@ -69,7 +69,7 @@
           <copy>
               <from>
                   <literal>
-                  <authorize xmlns="http://www.example.org/CreditCardPayment/">
+                  <authorize xmlns="http://www.tuscanyscatours.com/CreditCardPayment/">
                     <CreditCard xmlns="">
                       <CreditCardType>Visa</CreditCardType>
                       <CreditCardNumber>12345678</CreditCardNumber>
@@ -93,11 +93,11 @@
               <to>$authorizeRequestMessage.parameters</to>
           </copy>
           <copy>
-              <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
+              <from>$makePaymentMemberRequestMessage.parameters/CustomerId/text()</from>
               <to>$authorizeRequestMessage.parameters/CreditCard/CardOwner/Name</to>
           </copy>
           <copy>
-              <from>$makePaymentRequestMessage.parameters/Amount/text()</from>
+              <from>$makePaymentMemberRequestMessage.parameters/Amount/text()</from>
               <to>$authorizeRequestMessage.parameters/Amount</to>
           </copy>                    
        </assign>
@@ -114,7 +114,7 @@
           <copy>
               <from>
                   <literal>
-                  <sendEmail xmlns="http://www.example.org/EmailGateway/">
+                  <sendEmail xmlns="http://www.tuscanyscatours.com/EmailGateway/">
                     <Email xmlns="">
                       <To>Default</To>
                       <Title>Payment Confirmation</Title>
@@ -126,7 +126,7 @@
               <to>$sendEmailRequestMessage.parameters</to>
           </copy>
           <copy>
-              <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
+              <from>$makePaymentMemberRequestMessage.parameters/CustomerId/text()</from>
               <to>$sendEmailRequestMessage.parameters/Email/To</to>
           </copy>                   
        </assign>                  
@@ -144,12 +144,12 @@
           <copy>
               <from>
                   <literal> 
-                  <makePaymentResponse xmlns="http://www.example.org/Payment">
+                  <makePaymentMemberResponse xmlns="http://www.tuscanyscatours.com/Payment">
                     <Status xmlns="">OK</Status>
-                  </makePaymentResponse>
+                  </makePaymentMemberResponse>
                   </literal>
               </from>
-              <to>$makePaymentResponseMessage.parameters</to>
+              <to>$makePaymentMemberResponseMessage.parameters</to>
           </copy>
        </assign>
        
@@ -157,8 +157,8 @@
        <reply name="end"  
               partnerLink="paymentPartnerLink"
               portType="pp:Payment" 
-              operation="makePayment"
-              variable="makePaymentResponseMessage">
+              operation="makePaymentMember"
+              variable="makePaymentMemberResponseMessage">
        </reply>
    </sequence>
 </process>
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
index 395bc0d3d4..a69c16a726 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
@@ -37,25 +37,28 @@ public class PaymentTestCase {
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {  
-        
-        creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite", 
-            new SCAContribution("creditcard", "../../shared-contributions/creditcardpayment-contribution/target/test-classes"));        
-        emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite", 
-                new SCAContribution("creditcard", "../../shared-contributions/emailgateway-contribution/target/test-classes"));
-        paymentNode = SCANodeFactory.newInstance().createSCANode("payment.composite", 
-                new SCAContribution("payment", "./target/test-classes"));
-
-        creditCardNode.start();
-        emailGatewayNode.start();
-        paymentNode.start();
+        try {
+            creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite", 
+                new SCAContribution("creditcard", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/test-classes"));        
+            emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite", 
+                    new SCAContribution("creditcard", "../../shared-contributions/emailgateway-contribution/target/test-classes"));
+            paymentNode = SCANodeFactory.newInstance().createSCANode("payment.composite", 
+                    new SCAContribution("payment-bpel", "./target/classes"),
+                    new SCAContribution("payment-bpel-test", "./target/test-classes"));
+    
+            creditCardNode.start();
+            emailGatewayNode.start();
+            paymentNode.start();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
     
     @Test
     public void testPayment() {
         SCAClient client = (SCAClient) paymentNode;
         Payment payment = client.getService(Payment.class, "PaymentClient");
-        //[nash] Following line is disabled  because of NPE problem
-        //System.out.println("Result = " + payment.makePayment("Fred", 100.00f));
+        System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
     }
 
     @AfterClass
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
index 06a99e4326..eaa7498e84 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
@@ -29,9 +29,9 @@ public class PaymentClientImpl implements Payment {
     @Reference
     protected Payment payment;
 
-    public String makePayment(String customerId, float amount) {
+    public String makePaymentMember(String customerId, float amount) {
         // Delegate the external web service
-        return payment.makePayment(customerId, amount);
+        return payment.makePaymentMember(customerId, amount);
     }
 
 }
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..4984ef0252
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+   <import namespace="http://www.tuscanyscatours.com/Payment"/>
+   <import namespace="http://www.tuscanyscatours.com/Payment/"/>
+</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
index 039192527b..b747b0382a 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
@@ -19,8 +19,8 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
            xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:pp="http://www.example.org/Payment" 
-           targetNamespace="http://www.example.org/Payment" 
+           xmlns:pp="http://www.tuscanyscatours.com/Payment" 
+           targetNamespace="http://www.tuscanyscatours.com/Payment" 
            name="payment">
            
     <component name="PaymentClient">
@@ -33,8 +33,8 @@
     <component name="Payment">
         <implementation.bpel process="pp:Payment"/>
         <service name="paymentPartnerLink">
-            <interface.wsdl interface="http://www.example.org/Payment/#wsdl.interface(Payment)" />
-            <binding.ws uri="http://localhost:8083/Payment" wsdlElement="http://www.example.org/Payment/#wsdl.service(PaymentService)"/>
+            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
+            <binding.ws uri="http://localhost:8083/Payment" wsdlElement="http://www.tuscanyscatours.com/Payment/#wsdl.service(PaymentService)"/>
         </service>
         <reference name="creditCardPaymentPartnerLink">
             <binding.ws uri="http://localhost:8081/CreditCardPayment"/>