diff options
Diffstat (limited to '')
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/CreditCardPayment.wsdl) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/main/resources/EmailGateway.wsdl (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/EmailGateway.wsdl) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/META-INF/sca-contribution.xml) | 8 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/main/resources/Payment.wsdl (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/Payment.wsdl) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment.composite (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/payment.composite) | 9 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/payment/PaymentImpl.groovy) | 2 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/PaymentTestCase.java) | 168 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/client/PaymentClientImpl.java) | 74 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/test/resources/META-INF/sca-contribution.xml) | 6 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/src/test/resources/payment-client.composite) | 11 |
10 files changed, 127 insertions, 151 deletions
diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl index 1813c77436..1813c77436 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/EmailGateway.wsdl index a097d9b7e4..a097d9b7e4 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/EmailGateway.wsdl +++ b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/EmailGateway.wsdl diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml index 151dcf9649..36e2990be1 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml @@ -18,7 +18,7 @@ * under the License. --> <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:scatours="http://scatours" > - <export.java package="payment"/> - <deployable composite="scatours:payment" /> -</contribution>
\ No newline at end of file + xmlns:tours="http://tuscanyscatours.com/"> + <export.java package="com.tuscanyscatours.payment" /> + <deployable composite="tours:payment" /> +</contribution> diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/Payment.wsdl index 2519d7642e..2519d7642e 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/Payment.wsdl +++ b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/Payment.wsdl diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment.composite index c9b6ac6ca6..3f8e741430 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/payment.composite +++ b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment.composite @@ -18,22 +18,21 @@ * under the License. --> <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scatours" + targetNamespace="http://tuscanyscatours.com/" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:c="http://scatours" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="payment"> <component name="PaymentComponent"> <t:implementation.script script="payment/PaymentImpl.groovy"/> <service name="Payment"> - <interface.java interface="payment.Payment" /> + <interface.java interface="com.tuscanyscatours.payment.Payment" /> <binding.ws uri="http://localhost:8081/Payment"/> </service> <reference name="emailGateway"> - <interface.java interface="scatours.emailgateway.EmailGateway" /> + <interface.java interface="com.tuscanyscatours.emailgateway.EmailGateway" /> <binding.ws uri="http://localhost:8088/EmailGateway"/> </reference> <property name="transactionFee" type="xsd:float">0.02</property> </component> -</composite>
\ No newline at end of file +</composite> diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/payment/PaymentImpl.groovy b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy index f061e5145d..854fbd2f4a 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/main/resources/payment/PaymentImpl.groovy +++ b/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy @@ -21,7 +21,7 @@ def makePaymentMember(customerId, amount) { def finalAmount = amount + transactionFee;
- scatours.emailgateway.EmailType email = new scatours.emailgateway.EmailType();
+ com.tuscanyscatours.emailgateway.EmailType email = new com.tuscanyscatours.emailgateway.EmailType();
email.setTo(customerId);
email.setTitle("Payment " + finalAmount + " Received");
diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java index 9a1629f693..39fffb0b9c 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/PaymentTestCase.java +++ b/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java @@ -1,94 +1,74 @@ -/* - * 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 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 { - try { - creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite", - new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"), - new SCAContribution("creditcard-test", "../creditcard-payment-jaxb/target/test-classes")); - - creditCardNode.start(); - - emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite", - new SCAContribution("emailgateway", "../emailgateway-contribution/target/classes"), - new SCAContribution("emailgateway-test", "../emailgateway-contribution/target/test-classes")); - - emailGatewayNode.start(); - - paymentNode = SCANodeFactory.newInstance().createSCANode(null, - new SCAContribution("payment-groovy", "./target/classes"), - new SCAContribution("payment-groovy-test", "./target/test-classes")); - - - paymentNode.start(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - @Test - public void testPayment() { - SCAClient client = (SCAClient) paymentNode; - Payment payment = client.getService(Payment.class, "PaymentClient"); - System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f)); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - paymentNode.stop(); - creditCardNode.stop(); - emailGatewayNode.stop(); - } - - - - @Test - //@Ignore - public void testWaitForInput() { -/* - System.out.println("Press a key to end"); - try { - System.in.read(); - } catch (Exception ex) { - } - System.out.println("Shutting down"); -*/ - } - -} +/*
+ * 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 com.tuscanyscatours.payment.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", "../creditcard-payment-jaxb/target/classes"));
+
+ creditCardNode.start();
+
+ emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite",
+ new SCAContribution("emailgateway", "../emailgateway/target/classes"),
+ new SCAContribution("emailgateway-test", "../emailgateway/target/test-classes"));
+
+ emailGatewayNode.start();
+
+ paymentNode = SCANodeFactory.newInstance().createSCANode(null,
+ new SCAContribution("payment-groovy", "./target/classes"),
+ new SCAContribution("payment-groovy-test", "./target/test-classes"));
+
+ paymentNode.start();
+ }
+
+ @Test
+ public void testPayment() {
+ SCAClient client = (SCAClient) paymentNode;
+ Payment payment = client.getService(Payment.class, "PaymentClient");
+ System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ paymentNode.stop();
+ creditCardNode.stop();
+ emailGatewayNode.stop();
+ }
+
+}
diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java index 556a699ad8..a38ba51ac5 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/client/PaymentClientImpl.java +++ b/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java @@ -1,37 +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 payment.client; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import payment.Payment; - -@Service(Payment.class) -public class PaymentClientImpl implements Payment { - @Reference - protected Payment payment; - - public String makePaymentMember(String customerId, float amount) { - // Delegate the external web service - return payment.makePaymentMember(customerId, amount); - } - -} +/*
+ * 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.impl;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.payment.Payment;
+
+@Service(Payment.class)
+public class PaymentClientImpl implements Payment {
+ @Reference
+ protected Payment payment;
+
+ public String makePaymentMember(String customerId, float amount) {
+ // Delegate the external web service
+ return payment.makePaymentMember(customerId, amount);
+ }
+
+}
diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml index 634181b91f..378e09009b 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml @@ -18,6 +18,6 @@ * under the License. --> <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:scatours="http://scatours" > - <deployable composite="scatours:paymentClient" /> -</contribution>
\ No newline at end of file + xmlns:tours="http://tuscanyscatours.com/" > + <deployable composite="tours:paymentClient" /> +</contribution> diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite index 4b9a98369c..353c1cea04 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/resources/payment-client.composite +++ b/sandbox/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite @@ -18,18 +18,15 @@ * under the License. --> <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scatours" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:c="http://scatours" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://tuscanyscatours.com/" name="paymentClient"> <component name="PaymentClient"> - <implementation.java class="payment.client.PaymentClientImpl" /> + <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" /> <reference name="payment"> - <interface.java interface="payment.Payment" /> + <interface.java interface="com.tuscanyscatours.payment.Payment" /> <binding.ws uri="http://localhost:8081/Payment" /> </reference> </component> -</composite>
\ No newline at end of file +</composite> |