Fix up the BPEL payment component to run in the wider application and take advantage of the BPEL resolved fix in 1.x

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

3 files changed, 19 insertions, 28 deletions

diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
index 764030c28e..4064565d41 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -28,7 +28,8 @@
    <import.java package="scatours.trip"/>
    <import.java package="scatours.tripbooking"/>
    <import.java package="scatours.travelcatalog"/>
-   <import.java package="payment.creditcard.ws.impl"/>
+   <import.java package="payment.creditcard"/>
+   <import.java package="payment"/>
    <import.java package="scatours.emailgateway"/>
    <import.java package="scatours.paymentprocess"/>
    <import.java package="scatours.shoppingcart"/>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite
index 53fac26d3e..ae8d4b7ff6 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite
@@ -142,37 +142,26 @@
         <implementation.java class="scatours.shoppingcart.ShoppingCartImpl"/>
         <service name="ShoppingCart">
         </service>
-        <!--reference name="paymentProcess">
-            <binding.ws uri="http://localhost:8083/PaymentProcess" />
-        </reference--> 
+        <reference name="payment">
+            <binding.ws uri="http://localhost:8080/Payment" />
+        </reference> 
     </component>   
     
-    <!--component name="PaymentProcessComponent">
-        <implementation.bpel process="pp:PaymentProcess"/>
-        <service name="paymentProcessPartnerLink">
-            <interface.wsdl interface="http://www.example.org/PaymentProcess/#wsdl.interface(PaymentProcess)" />
-            <binding.ws uri="http://localhost:8080/PaymentProcess" wsdlElement="http://www.example.org/PaymentProcess/#wsdl.service(PaymentProcessService)"/>
+    <component name="PaymentComponent">
+        <implementation.java class="payment.PaymentImpl" />
+        <service name="Payment">
+            <binding.ws uri="http://localhost:8080/Payment" />
         </service>
-        <reference name="creditCardPaymentPartnerLink">
-            <binding.ws uri="http://localhost:8081/CreditCardPayment"/>
+        <reference name="creditCardPayment">
+            <binding.ws uri="http://localhost:8080/CreditCardPayment" />
         </reference>
-        <reference name="emailGatewayPartnerLink">
-            <binding.ws uri="http://localhost:8082/EmailGateway"/>
-        </reference>       
-    </component>  
-           
-    <component name="CreditCardPaymentWS">
-        <implementation.java class="payment.creditcard.ws.impl.CreditCardPaymentWSImpl" />
-        <service name="CreditCardPayment">
-            <binding.ws uri="http://localhost:8081/CreditCardPayment" />
-        </service>
-    </component> 
+    </component>
     
-    <component name="EmailGateway">
-        <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />
-        <service name="EmailGateway">
-            <binding.ws uri="http://localhost:8082/EmailGateway" />
+    <component name="CreditCardPaymentComponent">
+        <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />
+        <service name="CreditCardPayment">
+            <binding.ws uri="http://localhost:8080/CreditCardPayment" />
         </service>
-    </component-->  
+    </component>     
 
 </composite>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html
index f4206548c0..b8e27e87fc 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html
+++ b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html
@@ -322,7 +322,8 @@
     function checkout() {        
         scaToursCart.checkout(cartId);
         
-        document.getElementById('searchResponse').innerHTML = "";
+        document.getElementById('packagedTripItems').innerHTML = "";
+        document.getElementById('bespokeTripItems').innerHTML = "";
         document.getElementById('cartItems').innerHTML = "Thank you for shopping with SCA Tours";
         document.getElementById('cartPrice').innerHTML = "";
         searchResponseItems = null;