3 files changed, 86 insertions, 20 deletions
diff --git a/sandbox/travelsample/chapter-06/paymentprocess-contribution/paymentprocesstest.composite b/sandbox/travelsample/chapter-06/payment-bpel-contribution/test/payment.composite
index f45dc01a57..039192527b 100644
--- a/sandbox/travelsample/chapter-06/paymentprocess-contribution/paymentprocesstest.composite
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/test/payment.composite
@@ -19,22 +19,22 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
            xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:pp="http://www.example.org/PaymentProcess" 
-           targetNamespace="http://www.example.org/PaymentProcess" 
-           name="paymentprocess">
+           xmlns:pp="http://www.example.org/Payment" 
+           targetNamespace="http://www.example.org/Payment" 
+           name="payment">
            
-    <component name="PaymentProcessClient">
-        <implementation.java class="scatours.paymentprocess.PaymentProcessClientImpl" />
-        <reference name="paymentProcess">
-            <binding.ws uri="http://localhost:8083/PaymentProcess" />
+    <component name="PaymentClient">
+        <implementation.java class="scatours.payment.client.PaymentClientImpl" />
+        <reference name="payment">
+            <binding.ws uri="http://localhost:8083/Payment" />
         </reference>
     </component>
     
-    <component name="PaymentProcess">
-        <implementation.bpel process="pp:PaymentProcess"/>
-        <service name="paymentProcessPartnerLink">
-            <interface.wsdl interface="http://www.example.org/PaymentProcess/#wsdl.interface(PaymentProcess)" />
-            <binding.ws uri="http://localhost:8083/PaymentProcess" wsdlElement="http://www.example.org/PaymentProcess/#wsdl.service(PaymentProcessService)"/>
+    <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"/>
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/test/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/chapter-06/payment-bpel-contribution/test/scatours/payment/PaymentTestCase.java
new file mode 100644
index 0000000000..e5cf0e43eb
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/test/scatours/payment/PaymentTestCase.java
@@ -0,0 +1,67 @@
+/*
+ * 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");
+        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/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessClientImpl.java b/sandbox/travelsample/chapter-06/payment-bpel-contribution/test/scatours/payment/client/PaymentClientImpl.java
index 8d9c2f918c..06a99e4326 100644
--- a/sandbox/travelsample/chapter-06/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessClientImpl.java
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/test/scatours/payment/client/PaymentClientImpl.java
@@ -17,22 +17,21 @@
  * under the License.    
  */
 
-package scatours.paymentprocess;
+package scatours.payment.client;
 
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
-/**
- * 
- */
-@Service(PaymentProcess.class)
-public class PaymentProcessClientImpl implements PaymentProcess {
+import scatours.payment.Payment;
+
+@Service(Payment.class)
+public class PaymentClientImpl implements Payment {
     @Reference
-    protected PaymentProcess paymentProcess;
+    protected Payment payment;
 
     public String makePayment(String customerId, float amount) {
         // Delegate the external web service
-        return paymentProcess.makePayment(customerId, amount);
+        return payment.makePayment(customerId, amount);
     }
 
 }