The BPEL payment process now successfully calls the payment service

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

4 files changed, 33 insertions, 5 deletions

diff --git a/sandbox/travelsample/payment-contribution/creditcard.composite b/sandbox/travelsample/payment-contribution/creditcard.composite
index 97ee9a2e69..184304e829 100644
--- a/sandbox/travelsample/payment-contribution/creditcard.composite
+++ b/sandbox/travelsample/payment-contribution/creditcard.composite
@@ -19,20 +19,20 @@
 -->

 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

     xmlns:c="http://creditcard" targetNamespace="http://creditcard" name="creditcard">

-    <component name="CreditCardPayment">

+    <component name="CreditCardPaymentWSClient">

         <implementation.java class="payment.creditcard.impl.CreditCardPaymentImpl" />

         <reference name="creditCardPayment">

-            <binding.ws uri="http://localhost:8080/CreditCardPayment" />

+            <binding.ws uri="http://localhost:8081/CreditCardPayment" />

         </reference>

         <service name="CreditCardPayment">

-            <t:binding.jsonrpc uri="/jsonrpc/CreditCardPayment" />

+            <!--t:binding.jsonrpc uri="/jsonrpc/CreditCardPayment" /-->

             <binding.sca />

         </service>

     </component>

     <component name="CreditCardPaymentWS">

         <implementation.java class="payment.creditcard.ws.impl.CreditCardPaymentWSImpl" />

         <service name="CreditCardPayment">

-            <binding.ws uri="http://localhost:8080/CreditCardPayment" />

+            <binding.ws uri="http://localhost:8081/CreditCardPayment" />

         </service>

     </component>

 </composite>
\ No newline at end of file
diff --git a/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java b/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java
index 7d8fb32f3c..2a9c537775 100644
--- a/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java
@@ -30,6 +30,7 @@ import payment.creditcard.CreditCardPayment;
  */
 @Service(CreditCardPayment.class)
 public class CreditCardPaymentImpl implements CreditCardPayment {
+    
     @Reference
     protected CreditCardPayment creditCardPayment;
 
diff --git a/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java b/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java
index b0fd37f6ea..f0c61cd14d 100644
--- a/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java
+++ b/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java
@@ -31,6 +31,17 @@ import payment.creditcard.CreditCardPayment;
 public class CreditCardPaymentWSImpl implements CreditCardPayment {
 
     public String authorize(CreditCardDetailsType creditCard, float amount) {
+        if (creditCard != null){
+            System.out.println("Checking card: name = " + 
+                               creditCard.getCardOwner().getName() +
+                               " number = " +
+                               creditCard.getCreditCardNumber() +
+                               " for amount " + 
+                               amount);
+        } else {
+            System.out.println("Checking card is null");
+        }
+        
         return "OK";
     }
 
diff --git a/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
index a43bcbbf17..ac5af4e547 100644
--- a/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
@@ -45,11 +45,27 @@ public class CreditCardPaymentTestCase {
     @Test
     public void testCreditCardPayment() {
         SCAClient client = (SCAClient) node;
-        CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");
+        CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPaymentWSClient");
+        
         ObjectFactory objectFactory = new ObjectFactory();
         CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
+        ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa"));
+        PayerType ccOwner = objectFactory.createPayerType();
+        ccOwner.setName("Fred");
+        ccDetails.setCardOwner(ccOwner);
+        
         System.out.println(cc.authorize(ccDetails, 100.00f));
     }
+    
+    @Test
+    public void testWaitForInput() {
+        System.out.println("Press a key to end");
+        try {
+            System.in.read();
+        } catch (Exception ex) {
+        }
+        System.out.println("Shutting down");
+    }    
 
     /**
      * @throws java.lang.Exception