Reorganize code directories and update pom versions

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

8 files changed, 152 insertions, 0 deletions

diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/CreditCardPayment.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
index a90c73cdfb..a90c73cdfb 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/EmailGateway.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
index d9a5e36bc0..d9a5e36bc0 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/EmailGateway.wsdl
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
index 6ce6568b62..6ce6568b62 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/Payment.wsdl b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
index 399b550334..399b550334 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/Payment.wsdl
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/payment.bpel b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
index 25c10d43a7..25c10d43a7 100644
--- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/payment.bpel
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
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
new file mode 100644
index 0000000000..395bc0d3d4
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * 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");
+        //[nash] Following line is disabled  because of NPE problem
+        //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/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
new file mode 100644
index 0000000000..06a99e4326
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
@@ -0,0 +1,37 @@
+/*
+ * 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.client;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import scatours.payment.Payment;
+
+@Service(Payment.class)
+public class PaymentClientImpl implements Payment {
+    @Reference
+    protected Payment payment;
+
+    public String makePayment(String customerId, float amount) {
+        // Delegate the external web service
+        return payment.makePayment(customerId, amount);
+    }
+
+}
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
new file mode 100644
index 0000000000..039192527b
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
@@ -0,0 +1,47 @@
+<?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.    
+-->
+<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" 
+           name="payment">
+           
+    <component name="PaymentClient">
+        <implementation.java class="scatours.payment.client.PaymentClientImpl" />
+        <reference name="payment">
+            <binding.ws uri="http://localhost:8083/Payment" />
+        </reference>
+    </component>
+    
+    <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"/>
+        </reference>
+        <reference name="emailGatewayPartnerLink">
+            <binding.ws uri="http://localhost:8082/EmailGateway"/>
+        </reference>       
+    </component>    
+
+</composite>
\ No newline at end of file