Refactor payment-bpel contribution by moving some files into a new contribution payment-bpel-process (TUSCANY-3461)

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

15 files changed, 565 insertions, 6 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/build.xml
index 33aedec1fc..a30dd29ec9 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/build.xml
@@ -81,6 +81,7 @@
         <ant dir="notification-rmi" target="${target}"/>

         <ant dir="notification-ws" target="${target}"/>

         <ant dir="payment-java-policy" target="${target}"/>

+        <ant dir="payment-bpel-process" target="${target}"/> <!--needed by payment-bpel-->

         <ant dir="payment-bpel" target="${target}"/>

         <ant dir="payment-groovy" target="${target}"/>

         <ant dir="payment-spring" target="${target}"/>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml
new file mode 100644
index 0000000000..5e2921995c
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml
@@ -0,0 +1,23 @@
+<!--

+ * 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.

+-->

+

+<project name="scatours-contribution-payment-bpel-process" default="compile">

+    <import file="../../antdefs.xml"/>

+    <target name="wsdljava"/>

+</project>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
new file mode 100644
index 0000000000..20e2520568
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
@@ -0,0 +1,35 @@
+<?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.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.tuscany.sca</groupId>

+        <artifactId>scatours</artifactId>

+        <version>1.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <version>1.0-SNAPSHOT</version>

+    <artifactId>scatours-contribution-payment-bpel-process</artifactId>

+    <name>Apache Tuscany SCA Tours Payment BPEL Process Contribution</name>

+

+    <build>

+        <finalName>${artifactId}</finalName>

+    </build>

+</project>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/CreditCardPayment.wsdl b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/CreditCardPayment.wsdl
new file mode 100644
index 0000000000..22ef6de317
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/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.tuscanyscatours.com/CreditCardPayment/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+                  xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
+                    xmlns:tns="http://www.tuscanyscatours.com/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.tuscanyscatours.com/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/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/EmailGateway.wsdl b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/EmailGateway.wsdl
new file mode 100644
index 0000000000..a097d9b7e4
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/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.tuscanyscatours.com/EmailGateway/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+                  xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
+                    xmlns:tns="http://www.tuscanyscatours.com/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.tuscanyscatours.com/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/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..f32584eee1
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?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 namespace="http://www.tuscanyscatours.com/Payment"/>

+</contribution>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/Payment.wsdl b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/Payment.wsdl
new file mode 100644
index 0000000000..e2c4062f2e
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/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.tuscanyscatours.com/Payment/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+                  xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
+                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
+
+            <xsd:complexType name="MakePaymentMemberType">
+                <xsd:sequence>
+                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>                    
+            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
+      
+            <xsd:complexType name="MakePaymentMemberResponseType">
+                <xsd:sequence>
+                    <xsd:element name="Status" type="xsd:string"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
+            
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="MakePaymentMemberRequest">
+        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="MakePaymentMemberResponse">
+        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="Payment">
+        <wsdl:operation name="makePaymentMember">
+            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
+            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="PaymentBinding" type="tns:Payment">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="makePaymentMember">
+            <soap:operation soapAction="http://www.tuscanyscatours.com/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:8080/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/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/payment.bpel b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/payment.bpel
new file mode 100644
index 0000000000..8f11d76888
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/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.tuscanyscatours.com/Payment"
+    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

+    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:tns="http://tuscany.apache.org/Payment"    
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:pp="http://www.tuscanyscatours.com/Payment/"
+    xmlns:ccp="http://www.tuscanyscatours.com/CreditCardPayment/"
+    xmlns:eg="http://www.tuscanyscatours.com/EmailGateway/"
+    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+  <import location="Payment.wsdl" 
+          importType="http://schemas.xmlsoap.org/wsdl/"
+          namespace="http://www.tuscanyscatours.com/Payment/"/>     
+
+  <import location="CreditCardPayment.wsdl" 
+          importType="http://schemas.xmlsoap.org/wsdl/"
+          namespace="http://www.tuscanyscatours.com/CreditCardPayment/"/>
+          
+  <import location="EmailGateway.wsdl" 
+          importType="http://schemas.xmlsoap.org/wsdl/"
+          namespace="http://www.tuscanyscatours.com/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="makePaymentMemberRequestMessage" messageType="pp:MakePaymentMemberRequest"/>
+     <variable name="makePaymentMemberResponseMessage" messageType="pp:MakePaymentMemberResponse"/>
+     <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
+     <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
+     <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
+     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/>
+   </variables>
+
+   <sequence>
+       <receive name="start"
+                partnerLink="paymentPartnerLink"
+                portType="pp:Payment"
+           	    operation="makePaymentMember"
+                variable="makePaymentMemberRequestMessage"
+                createInstance="yes"/>
+
+       <!-- set up call to payments service -->
+       <assign name="assign1">
+          <copy>
+              <from>
+                  <literal>
+                  <authorize xmlns="http://www.tuscanyscatours.com/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>$makePaymentMemberRequestMessage.parameters/CustomerId/text()</from>
+              <to>$authorizeRequestMessage.parameters/CreditCard/CardOwner/Name</to>
+          </copy>
+          <copy>
+              <from>$makePaymentMemberRequestMessage.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.tuscanyscatours.com/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>$makePaymentMemberRequestMessage.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> 
+                  <makePaymentMemberResponse xmlns="http://www.tuscanyscatours.com/Payment">
+                    <Status xmlns="">OK</Status>
+                  </makePaymentMemberResponse>
+                  </literal>
+              </from>
+              <to>$makePaymentMemberResponseMessage.parameters</to>
+          </copy>
+       </assign>
+       
+       
+       <reply name="end"  
+              partnerLink="paymentPartnerLink"
+              portType="pp:Payment" 
+              operation="makePaymentMember"
+              variable="makePaymentMemberResponseMessage">
+       </reply>
+   </sequence>
+</process>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
index b458868b09..e95a8bf0a3 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
@@ -18,8 +18,7 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-             xmlns:pp="http://www.tuscanyscatours.com/Payment" >
-   <export namespace="http://www.tuscanyscatours.com/Payment"/>
-   <export namespace="http://www.tuscanyscatours.com/Payment/"/>
-   <deployable composite="pp:payment" />
-</contribution>
\ No newline at end of file
+              xmlns:pp="http://www.tuscanyscatours.com/Payment">
+   <import namespace="http://www.tuscanyscatours.com/Payment"/>
+   <deployable composite="pp:payment"/>
+</contribution>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
index 84d628ec5d..b38f2a9e9c 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
@@ -58,6 +58,8 @@ public class PaymentTestCase {
         paymentNode =
             SCANodeFactory.newInstance()
                 .createSCANode(null,
+                               new SCAContribution("payment-bpel-process",
+                                                   "../payment-bpel-process/target/classes"),
                                new SCAContribution("payment-bpel", "./target/classes"),
                                new SCAContribution("payment-bpel-test", "./target/test-classes"));
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/pom.xml
index 33a68c2550..68708e55e1 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/pom.xml
@@ -87,6 +87,7 @@
                 <module>payment-spring</module>

                 <module>payment-spring-policy</module>

                 <module>payment-spring-scatag</module>

+                <module>payment-bpel-process</module>

                 <module>payment-bpel</module>

                 <module>payment-groovy</module>

                 <module>policy-client</module>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
index 102944b9da..3aedf801c6 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
@@ -265,6 +265,11 @@
         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>scatours-contribution-payment-bpel-process</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>scatours-contribution-payment-groovy</artifactId>

             <version>${pom.version}</version>

         </dependency>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
index 0a35eef5ff..41115063a7 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
@@ -56,6 +56,19 @@
             <includes>
                 <include>org.apache.tuscany.sca:scatours-contribution-*</include>
             </includes>
+            <excludes>
+                <exclude>org.apache.tuscany.sca:scatours-contribution-payment-bpel-process</exclude>
+            </excludes>
+           <scope>runtime</scope>
+        </dependencySet>
+
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>contributions/scatours-contribution-payment-bpel-process</outputDirectory>
+            <unpack>true</unpack>
+            <includes>
+                <include>org.apache.tuscany.sca:scatours-contribution-payment-bpel-process</include>
+            </includes>
             <scope>runtime</scope>
         </dependencySet>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
index 0208f058a6..b1624a07bb 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
@@ -31,6 +31,7 @@ public class PaymentLauncher {
 
     public static void main(String[] args) throws Exception {
         SCANode node = SCANodeFactory.newInstance().createSCANode(null, 
+                                                                  locate("payment-bpel-process"),
         		                                                  locate("payment-bpel"),
         		                                                  locate("creditcard-payment-jaxb"),
         		                                                  locate("emailgateway"));
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java b/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
index 828ee58bf3..0cae436c82 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
+++ b/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
@@ -46,7 +46,11 @@ public class LauncherUtil {
                 // Try to use the contribution jar under the contributions folder of the distribution
                 file = new File("../contributions/scatours-contribution-" + name + ".jar");
                 if (!file.exists()) {
-                    throw new IllegalArgumentException("Contribution " + name + " cannot be located.");
+                    // Try to use the contribution subfolder under the contributions folder of the distribution
+                    file = new File("../contributions/scatours-contribution-" + name);
+                    if (!file.exists()) {
+                        throw new IllegalArgumentException("Contribution " + name + " cannot be located.");
+                    }
                 }
             }
         }