From 8712bd608bbb73cde88ea86e301271f895b0f1ab Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 9 Feb 2009 09:59:40 +0000
Subject: Reorganize code directories and update pom versions

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@742365 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/CreditCardPayment.wsdl                     | 117 ---------------
 .../src/EmailGateway.wsdl                          |  89 -----------
 .../src/META-INF/sca-contribution.xml              |  23 ---
 .../payment-bpel-contribution/src/Payment.wsdl     |  83 -----------
 .../src/main/resources/CreditCardPayment.wsdl      | 117 +++++++++++++++
 .../src/main/resources/EmailGateway.wsdl           |  89 +++++++++++
 .../main/resources/META-INF/sca-contribution.xml   |  23 +++
 .../src/main/resources/Payment.wsdl                |  83 +++++++++++
 .../src/main/resources/payment.bpel                | 164 +++++++++++++++++++++
 .../payment-bpel-contribution/src/payment.bpel     | 164 ---------------------
 .../java/scatours/payment/PaymentTestCase.java     |  68 +++++++++
 .../scatours/payment/client/PaymentClientImpl.java |  37 +++++
 .../src/test/resources/payment.composite           |  47 ++++++
 13 files changed, 628 insertions(+), 476 deletions(-)
 delete mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/CreditCardPayment.wsdl
 delete mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/EmailGateway.wsdl
 delete mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/META-INF/sca-contribution.xml
 delete mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/Payment.wsdl
 create mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
 create mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
 create mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
 create mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
 create mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
 delete mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/payment.bpel
 create mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
 create mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
 create mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite

(limited to 'sandbox/travelsample/chapter-06/payment-bpel-contribution/src')

diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/CreditCardPayment.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/CreditCardPayment.wsdl
deleted file mode 100644
index a90c73cdfb..0000000000
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,117 +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.    
--->
-<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/"
-                    elementFormDefault="unqualified">
-            
-            <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/chapter-06/payment-bpel-contribution/src/EmailGateway.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/EmailGateway.wsdl
deleted file mode 100644
index d9a5e36bc0..0000000000
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/EmailGateway.wsdl
+++ /dev/null
@@ -1,89 +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.    
--->
-<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/chapter-06/payment-bpel-contribution/src/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/META-INF/sca-contribution.xml
deleted file mode 100644
index 6ce6568b62..0000000000
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="scatours.payment"/>
-   <export namespace="http://www.example.org/Payment"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/Payment.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/Payment.wsdl
deleted file mode 100644
index 399b550334..0000000000
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/Payment.wsdl
+++ /dev/null
@@ -1,83 +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.    
--->
-<wsdl:definitions name="Payment" 
-                  targetNamespace="http://www.example.org/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/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/">
-
-            <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:part name="parameters" element="tns:makePayment"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentResponse"></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>
-    </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:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8083/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
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
new file mode 100644
index 0000000000..a90c73cdfb
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
@@ -0,0 +1,117 @@
+<?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/"
+                    elementFormDefault="unqualified">
+            
+            <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/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
new file mode 100644
index 0000000000..d9a5e36bc0
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/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/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
new file mode 100644
index 0000000000..6ce6568b62
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/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">
+   <export.java package="scatours.payment"/>
+   <export namespace="http://www.example.org/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
new file mode 100644
index 0000000000..399b550334
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
@@ -0,0 +1,83 @@
+<?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="Payment" 
+                  targetNamespace="http://www.example.org/Payment/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.example.org/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/">
+
+            <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:part name="parameters" element="tns:makePayment"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="MakePaymentResponse">
+        <wsdl:part name="parameters" element="tns:makePaymentResponse"></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>
+    </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:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="PaymentService">
+        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
+            <soap:address location="http://localhost:8083/Payment" />
+        </wsdl:port>
+    </wsdl:service>
+    
+   <plnk:partnerLinkType name="PaymentLinkType">
+       <plnk:role name="forward" portType="tns:Payment"/>
+   </plnk:partnerLinkType>
+</wsdl:definitions>
\ No newline at end of file
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
new file mode 100644
index 0000000000..25c10d43a7
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
@@ -0,0 +1,164 @@
+<!--
+  ~ 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.
+  -->
+<process name="Payment"
+    targetNamespace="http://www.example.org/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/"
+    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/"/>     
+
+  <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/"/>          
+          
+   <partnerLinks>
+      <partnerLink name="paymentPartnerLink" partnerLinkType="pp:PaymentLinkType" 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="makePaymentRequestMessage" messageType="pp:MakePaymentRequest"/>
+     <variable name="makePaymentResponseMessage" messageType="pp:MakePaymentResponse"/>
+     <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
+     <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
+     <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
+     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/>
+   </variables>
+
+   <sequence>
+       <receive name="start"
+                partnerLink="paymentPartnerLink"
+                portType="pp:Payment"
+           	    operation="makePayment"
+                variable="makePaymentRequestMessage"
+                createInstance="yes"/>
+
+       <!-- set up call to payments service -->
+       <assign name="assign1">
+          <copy>
+              <from>
+                  <literal>
+                  <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/CreditCard/CardOwner/Name</to>
+          </copy>
+          <copy>
+              <from>$makePaymentRequestMessage.parameters/Amount/text()</from>
+              <to>$authorizeRequestMessage.parameters/Amount</to>
+          </copy>                    
+       </assign>
+       
+       <invoke name="invokeCreditCardPayment"
+               operation="authorize"
+               inputVariable="authorizeRequestMessage"
+               outputVariable="authorizeResponseMessage"
+               partnerLink="creditCardPaymentPartnerLink"
+               portType="ccp:CreditCardPayment" />
+       
+       <!-- set up call to email gateway service -->
+       <assign name="assign2">
+          <copy>
+              <from>
+                  <literal>
+                  <sendEmail xmlns="http://www.example.org/EmailGateway/">
+                    <Email xmlns="">
+                      <To>Default</To>
+                      <Title>Payment Confirmation</Title>
+                      <Body>Your payment has been confirmed</Body>
+                    </Email>
+                  </sendEmail>
+                  </literal>
+              </from>
+              <to>$sendEmailRequestMessage.parameters</to>
+          </copy>
+          <copy>
+              <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
+              <to>$sendEmailRequestMessage.parameters/Email/To</to>
+          </copy>                   
+       </assign>                  
+       
+       <!-- call the email gateway to send a confirmation -->
+       <invoke name="invokeEmailGateway"
+               operation="sendEmail"
+               inputVariable="sendEmailRequestMessage"
+               outputVariable="sendEmailResponseMessage"
+               partnerLink="emailGatewayPartnerLink"
+               portType="eg:EmailGateway" />
+       
+       <!-- set up the response -->
+       <assign name="assign3">
+          <copy>
+              <from>
+                  <literal> 
+                  <makePaymentResponse xmlns="http://www.example.org/Payment">
+                    <Status xmlns="">OK</Status>
+                  </makePaymentResponse>
+                  </literal>
+              </from>
+              <to>$makePaymentResponseMessage.parameters</to>
+          </copy>
+       </assign>
+       
+       
+       <reply name="end"  
+              partnerLink="paymentPartnerLink"
+              portType="pp:Payment" 
+              operation="makePayment"
+              variable="makePaymentResponseMessage">
+       </reply>
+   </sequence>
+</process>
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/payment.bpel b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/payment.bpel
deleted file mode 100644
index 25c10d43a7..0000000000
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/payment.bpel
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<process name="Payment"
-    targetNamespace="http://www.example.org/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/"
-    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/"/>     
-
-  <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/"/>          
-          
-   <partnerLinks>
-      <partnerLink name="paymentPartnerLink" partnerLinkType="pp:PaymentLinkType" 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="makePaymentRequestMessage" messageType="pp:MakePaymentRequest"/>
-     <variable name="makePaymentResponseMessage" messageType="pp:MakePaymentResponse"/>
-     <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
-     <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
-     <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
-     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/>
-   </variables>
-
-   <sequence>
-       <receive name="start"
-                partnerLink="paymentPartnerLink"
-                portType="pp:Payment"
-           	    operation="makePayment"
-                variable="makePaymentRequestMessage"
-                createInstance="yes"/>
-
-       <!-- set up call to payments service -->
-       <assign name="assign1">
-          <copy>
-              <from>
-                  <literal>
-                  <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/CreditCard/CardOwner/Name</to>
-          </copy>
-          <copy>
-              <from>$makePaymentRequestMessage.parameters/Amount/text()</from>
-              <to>$authorizeRequestMessage.parameters/Amount</to>
-          </copy>                    
-       </assign>
-       
-       <invoke name="invokeCreditCardPayment"
-               operation="authorize"
-               inputVariable="authorizeRequestMessage"
-               outputVariable="authorizeResponseMessage"
-               partnerLink="creditCardPaymentPartnerLink"
-               portType="ccp:CreditCardPayment" />
-       
-       <!-- set up call to email gateway service -->
-       <assign name="assign2">
-          <copy>
-              <from>
-                  <literal>
-                  <sendEmail xmlns="http://www.example.org/EmailGateway/">
-                    <Email xmlns="">
-                      <To>Default</To>
-                      <Title>Payment Confirmation</Title>
-                      <Body>Your payment has been confirmed</Body>
-                    </Email>
-                  </sendEmail>
-                  </literal>
-              </from>
-              <to>$sendEmailRequestMessage.parameters</to>
-          </copy>
-          <copy>
-              <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
-              <to>$sendEmailRequestMessage.parameters/Email/To</to>
-          </copy>                   
-       </assign>                  
-       
-       <!-- call the email gateway to send a confirmation -->
-       <invoke name="invokeEmailGateway"
-               operation="sendEmail"
-               inputVariable="sendEmailRequestMessage"
-               outputVariable="sendEmailResponseMessage"
-               partnerLink="emailGatewayPartnerLink"
-               portType="eg:EmailGateway" />
-       
-       <!-- set up the response -->
-       <assign name="assign3">
-          <copy>
-              <from>
-                  <literal> 
-                  <makePaymentResponse xmlns="http://www.example.org/Payment">
-                    <Status xmlns="">OK</Status>
-                  </makePaymentResponse>
-                  </literal>
-              </from>
-              <to>$makePaymentResponseMessage.parameters</to>
-          </copy>
-       </assign>
-       
-       
-       <reply name="end"  
-              partnerLink="paymentPartnerLink"
-              portType="pp:Payment" 
-              operation="makePayment"
-              variable="makePaymentResponseMessage">
-       </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
new file mode 100644
index 0000000000..395bc0d3d4
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * 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.    
+ */
+
+package scatours.payment;
+
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+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.Test;
+
+/**
+ * 
+ */
+public class PaymentTestCase {
+    private static SCANode paymentNode;
+    private static SCANode creditCardNode;
+    private static SCANode emailGatewayNode;    
+
+    @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();
+    }
+    
+    @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));
+    }
+
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        paymentNode.stop();
+        creditCardNode.stop();
+        emailGatewayNode.stop();
+    }
+
+}
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
new file mode 100644
index 0000000000..06a99e4326
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
@@ -0,0 +1,37 @@
+/*
+ * 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.    
+ */
+
+package scatours.payment.client;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import scatours.payment.Payment;
+
+@Service(Payment.class)
+public class PaymentClientImpl implements Payment {
+    @Reference
+    protected Payment payment;
+
+    public String makePayment(String customerId, float amount) {
+        // Delegate the external web service
+        return payment.makePayment(customerId, amount);
+    }
+
+}
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
new file mode 100644
index 0000000000..039192527b
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.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/Payment" 
+           targetNamespace="http://www.example.org/Payment" 
+           name="payment">
+           
+    <component name="PaymentClient">
+        <implementation.java class="scatours.payment.client.PaymentClientImpl" />
+        <reference name="payment">
+            <binding.ws uri="http://localhost:8083/Payment" />
+        </reference>
+    </component>
+    
+    <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)"/>
+        </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