The BPEL payment process now successfully calls the payment service

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

6 files changed, 41 insertions, 40 deletions

diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl
index 272d6aaf44..4854e7819d 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl
@@ -28,9 +28,10 @@
     <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/">

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

+                    elementFormDefault="unqualified">

             

-            <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 +39,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 +82,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">

diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl
index d9a5e36bc0..98956e32fd 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl
@@ -83,7 +83,7 @@
         </wsdl:port>
     </wsdl:service>
     
-    <plnk:partnerLinkType name="EmailGatewayLinkType">
+    <!--plnk:partnerLinkType name="EmailGatewayLinkType">
         <plnk:role name="forward" portType="tns:EmailGateway"/>
-    </plnk:partnerLinkType>
+    </plnk:partnerLinkType-->
 </wsdl:definitions>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel
index f1faf982aa..c23780b052 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel
@@ -22,6 +22,7 @@
     xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
     xmlns:tns="http://tuscany.apache.org/PaymentProcess"    
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:pp="http://www.example.org/PaymentProcess/"
     xmlns:ccp="http://www.example.org/CreditCardPayment/"
     xmlns:eg="http://www.example.org/EmailGateway/"
@@ -36,14 +37,14 @@
           importType="http://schemas.xmlsoap.org/wsdl/"
           namespace="http://www.example.org/CreditCardPayment/"/>
           
-  <import location="EmailGateway.wsdl" 
+  <!--import location="EmailGateway.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/EmailGateway/"/>          
+          namespace="http://www.example.org/EmailGateway/"/-->          
           
    <partnerLinks>
       <partnerLink name="paymentProcessPartnerLink" partnerLinkType="pp:PaymentProcessLinkType" myRole="forward" />
       <partnerLink name="creditCardPaymentPartnerLink" partnerLinkType="ccp:CreditCardPaymentLinkType" partnerRole="forward" initializePartnerRole="yes" />
-      <partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" partnerRole="forward" initializePartnerRole="yes" />
+      <!--partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" partnerRole="forward" initializePartnerRole="yes" /-->
    </partnerLinks>
     
    <variables>
@@ -53,8 +54,8 @@
      <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
      <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
      <variable name="authorizeRequest" type="ccp:AuthorizeType"/>
-     <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
-     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/>
+     <!--variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
+     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/-->
    </variables>
 
    <sequence>
@@ -70,40 +71,39 @@
           <copy>
               <from>
                   <literal>
-                    <ccp:Authorize>
-                        <ccp:CreditCard>
-                            <ccp:CreditCardType>Visa</ccp:CreditCardType>
-                            <ccp:CreditCardNumber>12345678</ccp:CreditCardNumber>
-                            <ccp:ExpMonth>2</ccp:ExpMonth>
-                            <ccp:ExpYear>2010</ccp:ExpYear>
-                            <ccp:CardOwner>
-                                <ccp:Name>Empty</ccp:Name>
-                                <ccp:Address>
-                                    <ccp:Street>1 The Road</ccp:Street>
-                                    <ccp:City>Winchester</ccp:City>
-                                    <ccp:State>Hampshire</ccp:State>
-                                    <ccp:ZipCode>AB1 2CD</ccp:ZipCode>
-                                    <ccp:HomePhone>12345678</ccp:HomePhone>
-                                </ccp:Address>
-                            </ccp:CardOwner>
-                        </ccp:CreditCard>                    
-                        <ccp:Amount>0.0</ccp:Amount>
-                    </ccp:Authorize>
+                  <authorize xmlns="http://www.example.org/CreditCardPayment/">
+                    <CreditCard xmlns="">
+                      <CreditCardType>Visa</CreditCardType>
+                      <CreditCardNumber>12345678</CreditCardNumber>
+                      <ExpMonth>2</ExpMonth>
+                      <ExpYear>2010</ExpYear>
+                      <CardOwner>
+                        <Name>Empty</Name>
+                        <Address>
+                           <Street>1 The Road</Street>
+                           <City>Winchester</City>
+                           <State>Hampshire</State>
+                           <ZipCode>AB1 2CD</ZipCode>
+                           <HomePhone>12345678</HomePhone>
+                        </Address>
+                      </CardOwner>                      
+                    </CreditCard>
+                    <Amount xmlns="">0.0</Amount>
+                  </authorize>
                   </literal>
               </from>
               <to>$authorizeRequestMessage.parameters</to>
           </copy>
           <copy>
               <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
-              <to>$authorizeRequestMessage.parameters/ccp:CreditCard/ccp:CardOwner/ccp:Name</to>
+              <to>$authorizeRequestMessage.parameters/CreditCard/CardOwner/Name</to>
           </copy>
           <copy>
               <from>$makePaymentRequestMessage.parameters/Amount/text()</from>
-              <to>$authorizeRequestMessage.parameters/ccp:Amount</to>
+              <to>$authorizeRequestMessage.parameters/Amount</to>
           </copy>                    
        </assign>
        
-       
        <invoke name="invokeCreditCardPayment"
                operation="authorize"
                inputVariable="authorizeRequestMessage"
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType
index 3fc519d8ea..adadee5e91 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType
@@ -30,9 +30,9 @@
         <interface.wsdl interface="http://www.example.org/CrecitCardPayment/#wsdl.interface(CreditCardPayment)" />
   </reference>
   
-  <reference name="emailGatewayPartnerLink">
+  <!--reference name="emailGatewayPartnerLink">
         <interface.wsdl interface="http://www.example.org/EmailGateway/#wsdl.interface(EmailGateway)" />
-  </reference>
+  </reference-->
 
 </componentType>              
        
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties
index 4e13380e0b..7ed0bcaf77 100644
--- a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties
+++ b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties
@@ -23,7 +23,7 @@ log4j.category.org.mortbay=OFF
 log4j.category.org.hibernate.type=OFF
 log4j.category.org.objectweb=OFF
 log4j.category.org.apache.ode.axis2=OFF
-log4j.category.org.apache.ode.bpel.engine=OFF
+log4j.category.org.apache.ode.bpel.engine=DEBUG
 log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
 log4j.category.org.apache.ode.bpel.epr=OFF
 log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite
index a06bc12c03..8af02af425 100644
--- a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite
+++ b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite
@@ -37,11 +37,11 @@
             <binding.ws uri="http://localhost:8080/PaymentProcess" wsdlElement="http://www.example.org/PaymentProcess/#wsdl.service(PaymentProcessService)"/>
         </service>
         <reference name="creditCardPaymentPartnerLink">
-            <binding.ws uri="http://localhost:8081/CreditCardPayment"/>
+            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
         </reference>
-        <reference name="emailGatewayPartnerLink">
+        <!--reference name="emailGatewayPartnerLink">
             <binding.ws uri="http://localhost:8082/EmailGateway"/>
-        </reference>        
+        </reference-->       
     </component>    
 
 </composite>
\ No newline at end of file