Updates to payment process now that implementation.bpel can support multiple outgoing partner links

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

9 files changed, 277 insertions, 234 deletions

diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties b/sandbox/travelsample/paymentprocess-contribution/log4j.properties
index 7ed0bcaf77..7ed0bcaf77 100644
--- a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties
+++ b/sandbox/travelsample/paymentprocess-contribution/log4j.properties
diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite b/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
index 8af02af425..b75c0b5ca8 100644
--- a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite
+++ b/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
@@ -37,11 +37,11 @@
             <binding.ws uri="http://localhost:8080/PaymentProcess" wsdlElement="http://www.example.org/PaymentProcess/#wsdl.service(PaymentProcessService)"/>
         </service>
         <reference name="creditCardPaymentPartnerLink">
-            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
+            <binding.ws uri="http://localhost:8081/CreditCardPayment"/>
         </reference>
-        <!--reference name="emailGatewayPartnerLink">
+        <reference name="emailGatewayPartnerLink">
             <binding.ws uri="http://localhost:8082/EmailGateway"/>
-        </reference-->       
+        </reference>       
     </component>    
 
 </composite>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/pom.xml b/sandbox/travelsample/paymentprocess-contribution/pom.xml
index 2c8536ae1b..e56584d8eb 100644
--- a/sandbox/travelsample/paymentprocess-contribution/pom.xml
+++ b/sandbox/travelsample/paymentprocess-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-paymentprocess-contribution</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
@@ -77,16 +77,13 @@
         <testSourceDirectory>${basedir}/test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>${basedir}/test/scatours/paymentprocess</directory>
-                <includes>
-                    <include>**.composite</include>
-                    <include>**.properties</include>
-                </includes>
+                <directory>${basedir}/resources</directory>
             </resource>
             <resource>
-                <directory>${basedir}/src/scatours/paymentprocess</directory>
+                <directory>${basedir}</directory>
                 <includes>
-                    <include>**</include>
+                    <include>*.composite</include>
+                    <include>*.properties</include>
                 </includes>
             </resource>
         </resources>
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl b/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
index 4854e7819d..a90c73cdfb 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
@@ -1,117 +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>    

+<?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/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl b/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
index 98956e32fd..d9a5e36bc0 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
@@ -83,7 +83,7 @@
         </wsdl:port>
     </wsdl:service>
     
-    <!--plnk:partnerLinkType name="EmailGatewayLinkType">
+    <plnk:partnerLinkType name="EmailGatewayLinkType">
         <plnk:role name="forward" portType="tns:EmailGateway"/>
-    </plnk:partnerLinkType-->
+    </plnk:partnerLinkType>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..6b09380868
--- /dev/null
+++ b/sandbox/travelsample/paymentprocess-contribution/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.java package="scatours.payment"/>
+</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/PaymentProcess.wsdl b/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
index 9022763fda..868be04723 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/PaymentProcess.wsdl
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
@@ -1,83 +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="PaymentProcess" 

-                  targetNamespace="http://www.example.org/PaymentProcess/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:tns="http://www.example.org/PaymentProcess/" 

-                  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/PaymentProcess/"

-                    xmlns:tns="http://www.example.org/PaymentProcess/">

-

-            <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="PaymentProcess">

-        <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="PaymentProcessBinding" type="tns:PaymentProcess">

-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <wsdl:operation name="makePayment">

-            <soap:operation soapAction="http://www.example.org/PaymentProcess/makePayment" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="PaymentProcessService">

-        <wsdl:port name="PaymentProcessPort" binding="tns:PaymentProcessBinding">

-            <soap:address location="http://localhost:8080/PaymentProcess" />

-        </wsdl:port>

-    </wsdl:service>

-    

-   <plnk:partnerLinkType name="PaymentProcessLinkType">

-       <plnk:role name="forward" portType="tns:PaymentProcess"/>

-   </plnk:partnerLinkType>

+<?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="PaymentProcess" 
+                  targetNamespace="http://www.example.org/PaymentProcess/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.example.org/PaymentProcess/" 
+                  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/PaymentProcess/"
+                    xmlns:tns="http://www.example.org/PaymentProcess/">
+
+            <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="PaymentProcess">
+        <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="PaymentProcessBinding" type="tns:PaymentProcess">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="makePayment">
+            <soap:operation soapAction="http://www.example.org/PaymentProcess/makePayment" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="PaymentProcessService">
+        <wsdl:port name="PaymentProcessPort" binding="tns:PaymentProcessBinding">
+            <soap:address location="http://localhost:8080/PaymentProcess" />
+        </wsdl:port>
+    </wsdl:service>
+    
+   <plnk:partnerLinkType name="PaymentProcessLinkType">
+       <plnk:role name="forward" portType="tns:PaymentProcess"/>
+   </plnk:partnerLinkType>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel b/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel
index c23780b052..08c6b8f636 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel
@@ -37,25 +37,23 @@
           importType="http://schemas.xmlsoap.org/wsdl/"
           namespace="http://www.example.org/CreditCardPayment/"/>
           
-  <!--import location="EmailGateway.wsdl" 
+  <import location="EmailGateway.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/EmailGateway/"/-->          
+          namespace="http://www.example.org/EmailGateway/"/>          
           
    <partnerLinks>
       <partnerLink name="paymentProcessPartnerLink" partnerLinkType="pp:PaymentProcessLinkType" myRole="forward" />
       <partnerLink name="creditCardPaymentPartnerLink" partnerLinkType="ccp:CreditCardPaymentLinkType" partnerRole="forward" initializePartnerRole="yes" />
-      <!--partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" partnerRole="forward" initializePartnerRole="yes" /-->
+      <partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" partnerRole="forward" initializePartnerRole="yes" />
    </partnerLinks>
     
    <variables>
      <variable name="makePaymentRequestMessage" messageType="pp:MakePaymentRequest"/>
      <variable name="makePaymentResponseMessage" messageType="pp:MakePaymentResponse"/>
-     <variable name="makePaymentResponse" type="pp:MakePaymentResponseType"/>
      <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
      <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
-     <variable name="authorizeRequest" type="ccp:AuthorizeType"/>
-     <!--variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
-     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/-->
+     <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
+     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/>
    </variables>
 
    <sequence>
@@ -112,23 +110,49 @@
                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="assign2">
-          <!--copy>
-              <from><literal><Status>OK</Status></literal></from>
-              <to>$makePaymentResponse</to>
-          </copy-->
+       <assign name="assign3">
           <copy>
-              <from>$authorizeResponseMessage.parameters</from>
+              <from>
+                  <literal> 
+                  <makePaymentResponse xmlns="http://www.example.org/PaymentProcess/">
+                    <Status xmlns="">OK</Status>
+                  </makePaymentResponse>
+                  </literal>
+              </from>
               <to>$makePaymentResponseMessage.parameters</to>
           </copy>
        </assign>
        
-       <!-- email a confirmation -->
        
        <reply name="end"  
               partnerLink="paymentProcessPartnerLink"
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType b/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
index adadee5e91..ecc2f55a47 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
@@ -27,12 +27,12 @@
   </service>
   
   <reference name="creditCardPaymentPartnerLink">
-        <interface.wsdl interface="http://www.example.org/CrecitCardPayment/#wsdl.interface(CreditCardPayment)" />
+        <interface.wsdl interface="http://www.example.org/CreditCardPayment/#wsdl.interface(CreditCardPayment)" />
   </reference>
   
-  <!--reference name="emailGatewayPartnerLink">
+  <reference name="emailGatewayPartnerLink">
         <interface.wsdl interface="http://www.example.org/EmailGateway/#wsdl.interface(EmailGateway)" />
-  </reference-->
+  </reference>
 
 </componentType>              
        
\ No newline at end of file