From 3d78e7e023933818a502e19f066e08482caa67aa Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 24 Nov 2008 08:24:41 +0000
Subject: More updates the BPEL component in the payment process

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@720132 13f79535-47bb-0310-9956-ffa450edef68
---
 .../wsdl/EmailGateway.wsdl                         |  37 +++----
 .../wsdl/CreditCardPayment.wsdl                    |  48 +++++----
 .../paymentprocesstest.composite                   |  40 -------
 .../paymentprocess-contribution/pom.xml            |  32 ++++--
 .../scatours/paymentprocess/CreditCardPayment.wsdl | 116 +++++++++++++++++++++
 .../src/scatours/paymentprocess/EmailGateway.wsdl  |  89 ++++++++++++++++
 .../scatours/paymentprocess/PaymentProcess.wsdl    |  39 +++----
 .../src/scatours/paymentprocess/deploy.xml         |   6 ++
 .../scatours/paymentprocess/paymentprocess.bpel    |  93 +++++++++++++----
 .../paymentprocess/paymentprocess.componentType    |   4 +-
 .../paymentprocess/PaymentProcessTestCase.java     |   2 +-
 .../test/scatours/paymentprocess/log4j.properties  |  36 +++++++
 .../paymentprocess/paymentprocesstest.composite    |  47 +++++++++
 13 files changed, 456 insertions(+), 133 deletions(-)
 delete mode 100644 sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
 create mode 100644 sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl
 create mode 100644 sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl
 create mode 100644 sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties
 create mode 100644 sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite

(limited to 'sandbox/travelsample')

diff --git a/sandbox/travelsample/emailgateway-contribution/wsdl/EmailGateway.wsdl b/sandbox/travelsample/emailgateway-contribution/wsdl/EmailGateway.wsdl
index ed5762410d..c103ad947d 100644
--- a/sandbox/travelsample/emailgateway-contribution/wsdl/EmailGateway.wsdl
+++ b/sandbox/travelsample/emailgateway-contribution/wsdl/EmailGateway.wsdl
@@ -29,20 +29,21 @@
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
                     targetNamespace="http://www.example.org/EmailGateway/"
                     xmlns:tns="http://www.example.org/EmailGateway/">
-            <xsd:element name="sendEmail">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Email" type="tns:EmailType"></xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="sendEmailResponse">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Status" type="xsd:string"></xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
+                    
+            <xsd:element name="sendEmail" type="tns:SendEmailType"/>
+            <xsd:complexType name="SendEmailType">
+                <xsd:sequence>
+                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>
+            <xsd:complexType name="SendEmailResponseType">
+                <xsd:sequence>
+                    <xsd:element name="Status" type="xsd:string"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
             <xsd:complexType name="EmailType">
                 <xsd:sequence>
                     <xsd:element name="To" type="xsd:string"/>
@@ -52,16 +53,16 @@
             </xsd:complexType>
         </xsd:schema>
     </wsdl:types>
-    <wsdl:message name="sendEmailRequest">
+    <wsdl:message name="SendEmailRequest">
         <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>
     </wsdl:message>
-    <wsdl:message name="sendEmailResponse">
+    <wsdl:message name="SendEmailResponse">
         <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:portType name="EmailGateway">
         <wsdl:operation name="sendEmail">
-            <wsdl:input message="tns:sendEmailRequest"></wsdl:input>
-            <wsdl:output message="tns:sendEmailResponse"></wsdl:output>
+            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>
+            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>
         </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
diff --git a/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl b/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
index c80c37cdf7..14ab0b3bbb 100644
--- a/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
@@ -26,23 +26,25 @@
                   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/">
-            <xsd:element name="authorize">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-                        <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="authorizeResponse">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Status" type="xsd:string"></xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+                    targetNamespace="http://www.example.org/CreditCardPayment/"
+                    xmlns:tns="http://www.example.org/CreditCardPayment/">
+            
+            <xsd:element name="Authorize" type="tns:AuthorizeType"/>
+            <xsd:complexType name="AuthorizeType">
+                <xsd:sequence>
+                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:element name="AuthorizeResponse" type="tns:AuthorizeResponseType"/>
+            <xsd:complexType name="AuthorizeResponseType">
+                <xsd:sequence>
+                    <xsd:element name="Status" type="xsd:string"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
             <xsd:complexType name="CreditCardDetailsType">
                 <xsd:sequence>
                     <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
@@ -78,16 +80,16 @@
             </xsd:complexType>
         </xsd:schema>
     </wsdl:types>
-    <wsdl:message name="authorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
+    <wsdl:message name="AuthorizeRequest">
+        <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:message name="AuthorizeResponse">
+        <wsdl:part name="parameters" element="tns:AuthorizeResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:portType name="CreditCardPayment">
         <wsdl:operation name="authorize">
-            <wsdl:input message="tns:authorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:authorizeResponse"></wsdl:output>
+            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
+            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
         </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
diff --git a/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite b/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
deleted file mode 100644
index 3b11f0a368..0000000000
--- a/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:c="http://paymentprocess" 
-           xmlns:pp="http://tuscany.apache.org/PaymentProcess"
-           targetNamespace="http://paymentprocess" 
-           name="paymentprocess">
-    <component name="PaymentProcessClient">
-        <implementation.java class="scatours.paymentprocess.PaymentProcessClientImpl" />
-        <reference name="paymentProcess">
-            <binding.ws uri="http://localhost:8080/PaymentProcess" />
-        </reference>
-    </component>
-    <component name="PaymentProcess">
-        <implementation.bpel process="pp:PaymentProcess"/>
-        <service name="paymentProcessPartnerLink">
-            <interface.wsdl interface="http://www.example.org/PaymentProcess/#wsdl.interface(PaymentProcess)" />
-            <binding.ws uri="http://localhost:8080/PaymentProcess" wsdlElement="http://www.example.org/PaymentProcess/#wsdl.service(PaymentProcessService)"/>
-        </service>
-    </component>    
-
-</composite>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/pom.xml b/sandbox/travelsample/paymentprocess-contribution/pom.xml
index 2549201b9c..2c8536ae1b 100644
--- a/sandbox/travelsample/paymentprocess-contribution/pom.xml
+++ b/sandbox/travelsample/paymentprocess-contribution/pom.xml
@@ -77,16 +77,17 @@
         <testSourceDirectory>${basedir}/test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>${basedir}</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                    <exclude>**/.*/**</exclude>
-                    <exclude>pom.xml</exclude>
-                    <exclude>build.xml</exclude>
-                    <exclude>target/**</exclude>
-                    <exclude>src/**</exclude>
-                    <exclude>test/**</exclude>
-                </excludes>
+                <directory>${basedir}/test/scatours/paymentprocess</directory>
+                <includes>
+                    <include>**.composite</include>
+                    <include>**.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/scatours/paymentprocess</directory>
+                <includes>
+                    <include>**</include>
+                </includes>
             </resource>
         </resources>
     <plugins>
@@ -135,6 +136,17 @@
                 </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>
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl
new file mode 100644
index 0000000000..272d6aaf44
--- /dev/null
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl
@@ -0,0 +1,116 @@
+<?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.    
+-->
+<wsdl:definitions name="CreditCardPayment" 
+                  targetNamespace="http://www.example.org/CreditCardPayment/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.example.org/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/">
+            
+            <xsd:element name="Authorize" type="tns:AuthorizeType"/>
+            <xsd:complexType name="AuthorizeType">
+                <xsd:sequence>
+                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:element name="AuthorizeResponse" type="tns:AuthorizeResponseType"/>
+            <xsd:complexType name="AuthorizeResponseType">
+                <xsd:sequence>
+                    <xsd:element name="Status" type="xsd:string"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:complexType name="CreditCardDetailsType">
+                <xsd:sequence>
+                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
+                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
+                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:simpleType name="CreditCardTypeType">
+                <xsd:restriction base="xsd:token">
+                    <xsd:enumeration value="Visa" />
+                    <xsd:enumeration value="MasterCard" />
+                    <xsd:enumeration value="Discover" />
+                    <xsd:enumeration value="Amex" />
+                </xsd:restriction>
+            </xsd:simpleType>
+            <xsd:complexType name="PayerType">
+                <xsd:sequence>
+                    <xsd:element name="Name" type="xsd:string" />
+                    <xsd:element name="Address" type="tns:AddressType" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="AddressType">
+                <xsd:sequence>
+                    <xsd:element name="Street" type="xsd:string" />
+                    <xsd:element name="City" type="xsd:string" />
+                    <xsd:element name="State" type="xsd:string" />
+                    <xsd:element name="ZipCode" type="xsd:string" />
+                    <xsd:element name="HomePhone" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="AuthorizeRequest">
+        <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:message>
+    <wsdl:portType name="CreditCardPayment">
+        <wsdl:operation name="authorize">
+            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
+            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <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" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="CreditCardPaymentService">
+        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
+            <soap:address location="http://localhost:8081/CreditCardPayment" />
+        </wsdl:port>
+    </wsdl:service>
+    
+    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
+        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
+    </plnk:partnerLinkType>    
+</wsdl:definitions>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl
new file mode 100644
index 0000000000..d9a5e36bc0
--- /dev/null
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl
@@ -0,0 +1,89 @@
+<?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.    
+-->
+<wsdl:definitions name="EmailGateway" 
+                  targetNamespace="http://www.example.org/EmailGateway/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.example.org/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/">
+                    
+            <xsd:element name="sendEmail" type="tns:SendEmailType"/>
+            <xsd:complexType name="SendEmailType">
+                <xsd:sequence>
+                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>
+            <xsd:complexType name="SendEmailResponseType">
+                <xsd:sequence>
+                    <xsd:element name="Status" type="xsd:string"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:complexType name="EmailType">
+                <xsd:sequence>
+                    <xsd:element name="To" type="xsd:string"/>
+                    <xsd:element name="Title" type="xsd:string"/>
+                    <xsd:element name="Body" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="SendEmailRequest">
+        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="SendEmailResponse">
+        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="EmailGateway">
+        <wsdl:operation name="sendEmail">
+            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>
+            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <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" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="EmailGatewayService">
+        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">
+            <soap:address location="http://localhost:8082/EmailGateway" />
+        </wsdl:port>
+    </wsdl:service>
+    
+    <plnk:partnerLinkType name="EmailGatewayLinkType">
+        <plnk:role name="forward" portType="tns:EmailGateway"/>
+    </plnk:partnerLinkType>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/PaymentProcess.wsdl b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/PaymentProcess.wsdl
index 5efd6251cd..9022763fda 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/PaymentProcess.wsdl
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/PaymentProcess.wsdl
@@ -29,33 +29,34 @@
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
                     targetNamespace="http://www.example.org/PaymentProcess/"
                     xmlns:tns="http://www.example.org/PaymentProcess/">
-            <xsd:element name="makePayment">
-                <xsd:complexType>
-                    <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>
-            <xsd:element name="makePaymentResponse">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Status" type="xsd:string"></xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
+
+            <xsd:complexType name="MakePaymentType">
+                <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:complexType name="MakePaymentResponseType">
+                <xsd:sequence>
+                    <xsd:element name="Status" type="xsd:string"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:element name="makePaymentResponse" type="tns:MakePaymentResponseType"/>
+            
         </xsd:schema>
     </wsdl:types>
-    <wsdl:message name="makePaymentRequest">
+    <wsdl:message name="MakePaymentRequest">
         <wsdl:part name="parameters" element="tns:makePayment"></wsdl:part>
     </wsdl:message>
-    <wsdl:message name="makePaymentResponse">
+    <wsdl:message name="MakePaymentResponse">
         <wsdl:part name="parameters" element="tns:makePaymentResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:portType name="PaymentProcess">
         <wsdl:operation name="makePayment">
-            <wsdl:input message="tns:makePaymentRequest"></wsdl:input>
-            <wsdl:output message="tns:makePaymentResponse"></wsdl:output>
+            <wsdl:input message="tns:MakePaymentRequest"></wsdl:input>
+            <wsdl:output message="tns:MakePaymentResponse"></wsdl:output>
         </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="PaymentProcessBinding" type="tns:PaymentProcess">
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/deploy.xml b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/deploy.xml
index 007fede130..b3dc960034 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/deploy.xml
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/deploy.xml
@@ -27,5 +27,11 @@
 		<provide partnerLink="paymentProcessPartnerLink">
 			<service name="tus:paymentProcessPartnerLink" port="PaymentProcess"/>
 		</provide>
+        <invoke partnerLink="creditCardPaymentPartnerLink">
+            <service name="wns:creditCardPaymentPartnerLink" port="CreditCardPayment"/>
+        </invoke>	
+        <invoke partnerLink="emailGatewayPartnerLink">
+            <service name="wns:emailGatewayPartnerLink" port="EmailGateway"/>
+        </invoke>   	
 	</process>
 </deploy>
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel
index 43986b1e2d..f1faf982aa 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 <process name="PaymentProcess"
-    targetNamespace="http://tuscany.apache.org/PaymentProcess"
+    targetNamespace="http://www.example.org/PaymentProcess"
     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/PaymentProcess"    
@@ -30,28 +30,31 @@
 
   <import location="PaymentProcess.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/PaymentProcess/"/>
+          namespace="http://www.example.org/PaymentProcess/"/>     
 
-  <!--import location="CreditCardPayment.wsdl" 
+  <import location="CreditCardPayment.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
           namespace="http://www.example.org/CreditCardPayment/"/>
           
   <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" myRole="forward" />
-      <partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" myRole="forward" /-->
+      <partnerLink name="creditCardPaymentPartnerLink" partnerLinkType="ccp:CreditCardPaymentLinkType" partnerRole="forward" initializePartnerRole="yes" />
+      <partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" partnerRole="forward" initializePartnerRole="yes" />
    </partnerLinks>
     
    <variables>
-     <variable name="paymentProcessMessage" messageType="pp:makePaymentRequest"/>
-     <variable name="paymentProcessResponseMessage" messageType="pp:makePaymentResponse"/>
-     <!--variable name="creditCardMessage" messageType="ccp:authorizeRequest"/>
-     <variable name="emailMessage" messageType="eg:sendEmailRequest"/-->
+     <variable name="makePaymentRequestMessage" messageType="pp:MakePaymentRequest"/>
+     <variable name="makePaymentResponseMessage" messageType="pp:MakePaymentResponse"/>
+     <variable name="makePaymentResponse" type="pp:MakePaymentResponseType"/>
+     <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"/>
    </variables>
 
    <sequence>
@@ -59,29 +62,79 @@
                 partnerLink="paymentProcessPartnerLink"
                 portType="pp:PaymentProcess"
            	    operation="makePayment"
-                variable="paymentProcessMessage"
+                variable="makePaymentRequestMessage"
                 createInstance="yes"/>
 
-       <!--assign name="assign1">
+       <!-- set up call to payments service -->
+       <assign name="assign1">
+          <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>
+                  </literal>
+              </from>
+              <to>$authorizeRequestMessage.parameters</to>
+          </copy>
           <copy>
-              <from>$paymentProcessMessage.parameters.CustomerId</from>
-              <to>$emailMessage.parameters.Email.To</to>
+              <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
+              <to>$authorizeRequestMessage.parameters/ccp:CreditCard/ccp:CardOwner/ccp:Name</to>
           </copy>
-       </assign-->
+          <copy>
+              <from>$makePaymentRequestMessage.parameters/Amount/text()</from>
+              <to>$authorizeRequestMessage.parameters/ccp:Amount</to>
+          </copy>                    
+       </assign>
        
-       <!-- execute -->
        
+       <invoke name="invokeCreditCardPayment"
+               operation="authorize"
+               inputVariable="authorizeRequestMessage"
+               outputVariable="authorizeResponseMessage"
+               partnerLink="creditCardPaymentPartnerLink"
+               portType="ccp:CreditCardPayment" />
+       
+       <!-- set up call to email gateway service -->
+       
+       <!-- call the email gateway to send a confirmation -->
+       
+       
+       <!-- set up the response -->
        <assign name="assign2">
+          <!--copy>
+              <from><literal><Status>OK</Status></literal></from>
+              <to>$makePaymentResponse</to>
+          </copy-->
           <copy>
-              <from><literal>OK</literal></from>
-              <to>$paymentProcessResponseMessage.parameters.Status</to>
+              <from>$authorizeResponseMessage.parameters</from>
+              <to>$makePaymentResponseMessage.parameters</to>
           </copy>
        </assign>
        
+       <!-- email a confirmation -->
+       
        <reply name="end"  
               partnerLink="paymentProcessPartnerLink"
               portType="pp:PaymentProcess" 
               operation="makePayment"
-              variable="paymentProcessResponseMessage"/>
+              variable="makePaymentResponseMessage">
+       </reply>
    </sequence>
 </process>
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType
index a7f95a012c..3fc519d8ea 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType
+++ b/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType
@@ -26,13 +26,13 @@
         <interface.wsdl interface="http://www.example.org/PaymentProcess/#wsdl.interface(PaymentProcess)" />
   </service>
   
-  <!--reference name="creditCardPaymentPartnerLink">
+  <reference name="creditCardPaymentPartnerLink">
         <interface.wsdl interface="http://www.example.org/CrecitCardPayment/#wsdl.interface(CreditCardPayment)" />
   </reference>
   
   <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/PaymentProcessTestCase.java b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessTestCase.java
index 793e1eb887..2a120d99d0 100644
--- a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessTestCase.java
+++ b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessTestCase.java
@@ -46,7 +46,7 @@ public class PaymentProcessTestCase {
     public void testPaymentProcess() {
         SCAClient client = (SCAClient) node;
         PaymentProcess pp = client.getService(PaymentProcess.class, "PaymentProcessClient");
-        System.out.println(pp.makePayment("Fred", 100.00f));
+        System.out.println("Result = " + pp.makePayment("Fred", 100.00f));
     }
 
     /**
diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties
new file mode 100644
index 0000000000..4e13380e0b
--- /dev/null
+++ b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties
@@ -0,0 +1,36 @@
+#
+#    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.
+#
+
+# Set root logger level to WARN and its only appender to CONSOLE
+log4j.rootLogger=OFF, CONSOLE
+
+# log4j properties to work with commandline tools.
+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.daohib.bpel.CorrelatorDaoImpl=OFF
+log4j.category.org.apache.ode.bpel.epr=OFF
+log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
+log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
+log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG
+
+# Console appender
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n
diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite
new file mode 100644
index 0000000000..a06bc12c03
--- /dev/null
+++ b/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite
@@ -0,0 +1,47 @@
+<?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.    
+-->
+<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/PaymentProcess" 
+           targetNamespace="http://www.example.org/PaymentProcess" 
+           name="paymentprocess">
+           
+    <component name="PaymentProcessClient">
+        <implementation.java class="scatours.paymentprocess.PaymentProcessClientImpl" />
+        <reference name="paymentProcess">
+            <binding.ws uri="http://localhost:8080/PaymentProcess" />
+        </reference>
+    </component>
+    
+    <component name="PaymentProcess">
+        <implementation.bpel process="pp:PaymentProcess"/>
+        <service name="paymentProcessPartnerLink">
+            <interface.wsdl interface="http://www.example.org/PaymentProcess/#wsdl.interface(PaymentProcess)" />
+            <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"/>
+        </reference>
+        <reference name="emailGatewayPartnerLink">
+            <binding.ws uri="http://localhost:8082/EmailGateway"/>
+        </reference>        
+    </component>    
+
+</composite>
\ No newline at end of file
-- 
cgit v1.2.3