From 7d9e691b83c7669f559337a5a2768b13ce176bd3 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 21 Feb 2009 13:31:55 +0000
Subject: 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
---
 .../java/scatours/payment/PaymentTestCase.java     | 29 ++++++++++++----------
 .../scatours/payment/client/PaymentClientImpl.java |  4 +--
 .../test/resources/META-INF/sca-contribution.xml   | 23 +++++++++++++++++
 .../src/test/resources/payment.composite           |  8 +++---
 4 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml

(limited to 'sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test')

diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
index 395bc0d3d4..a69c16a726 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
@@ -37,25 +37,28 @@ public class PaymentTestCase {
 
     @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();
+        try {
+            creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite", 
+                new SCAContribution("creditcard", "../../shared-contributions/creditcard-payment-jaxb-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-bpel", "./target/classes"),
+                    new SCAContribution("payment-bpel-test", "./target/test-classes"));
+    
+            creditCardNode.start();
+            emailGatewayNode.start();
+            paymentNode.start();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
     
     @Test
     public void testPayment() {
         SCAClient client = (SCAClient) paymentNode;
         Payment payment = client.getService(Payment.class, "PaymentClient");
-        //[nash] Following line is disabled  because of NPE problem
-        //System.out.println("Result = " + payment.makePayment("Fred", 100.00f));
+        System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
     }
 
     @AfterClass
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
index 06a99e4326..eaa7498e84 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
@@ -29,9 +29,9 @@ public class PaymentClientImpl implements Payment {
     @Reference
     protected Payment payment;
 
-    public String makePayment(String customerId, float amount) {
+    public String makePaymentMember(String customerId, float amount) {
         // Delegate the external web service
-        return payment.makePayment(customerId, amount);
+        return payment.makePaymentMember(customerId, amount);
     }
 
 }
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..4984ef0252
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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">
+   <import namespace="http://www.tuscanyscatours.com/Payment"/>
+   <import namespace="http://www.tuscanyscatours.com/Payment/"/>
+</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
index 039192527b..b747b0382a 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
@@ -19,8 +19,8 @@
 -->
 <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/Payment" 
-           targetNamespace="http://www.example.org/Payment" 
+           xmlns:pp="http://www.tuscanyscatours.com/Payment" 
+           targetNamespace="http://www.tuscanyscatours.com/Payment" 
            name="payment">
            
     <component name="PaymentClient">
@@ -33,8 +33,8 @@
     <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)"/>
+            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
+            <binding.ws uri="http://localhost:8083/Payment" wsdlElement="http://www.tuscanyscatours.com/Payment/#wsdl.service(PaymentService)"/>
         </service>
         <reference name="creditCardPaymentPartnerLink">
             <binding.ws uri="http://localhost:8081/CreditCardPayment"/>
-- 
cgit v1.2.3