From c6886a1838049552fdb88f0247c930b304cfd0db Mon Sep 17 00:00:00 2001 From: slaws Date: Mon, 1 Jun 2009 21:50:30 +0000 Subject: Add a spring version of the payment component which has no SCA annotations and uses and internal composition with a local bean to represent the payment and email-gateway wiring. Doesn't quite work yet in the full app as the contribution processing is not picking up the spring context for some reason. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@780847 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/resources/META-INF/sca-contribution.xml | 3 - .../payment-spring-contribution/pom.xml | 173 +++++++++++++++++++++ .../src/main/java/payment/PaymentImpl.java | 64 ++++++++ .../scatours/emailgateway/EmailGatewayImpl.java | 29 ++++ .../src/main/resources/CreditCardPayment.wsdl | 118 ++++++++++++++ .../src/main/resources/EmailGateway.wsdl | 89 +++++++++++ .../main/resources/META-INF/sca-contribution.xml | 25 +++ .../src/main/resources/Payment-context.xml | 34 ++++ .../src/main/resources/Payment.wsdl | 83 ++++++++++ .../src/main/resources/payment.composite | 39 +++++ .../src/test/java/payment/PaymentTestCase.java | 80 ++++++++++ .../java/payment/client/PaymentClientImpl.java | 37 +++++ .../test/resources/META-INF/sca-contribution.xml | 24 +++ .../src/test/resources/payment-client.composite | 33 ++++ sandbox/travelsample/contributions/pom.xml | 1 + .../main/resources/META-INF/sca-contribution.xml | 1 - .../launchers/fullapp-launcher/pom.xml | 14 ++ .../src/main/java/scatours/LaunchFullAppNode.java | 1 + 18 files changed, 844 insertions(+), 4 deletions(-) create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/pom.xml create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/payment/PaymentImpl.java create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/EmailGateway.wsdl create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment-context.xml create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment.wsdl create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml create mode 100644 sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml index 698ca3ecfb..b051a2572c 100644 --- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -30,9 +30,6 @@ - - - \ No newline at end of file diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml b/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml new file mode 100644 index 0000000000..cd89efbb42 --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml @@ -0,0 +1,173 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-sca + 1.5 + + + scatours-payment-spring-contribution + Apache Tuscany SCA Tours Payment Spring Contribution + + + + org.apache.tuscany.sca + tuscany-host-embedded + 1.5 + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.5 + runtime + + + + org.apache.tuscany.sca + tuscany-binding-jsonrpc-runtime + 1.5 + runtime + + + + org.apache.tuscany.sca + tuscany-binding-ws-axis2 + 1.5 + runtime + + + + org.apache.tuscany.sca + tuscany-host-jetty + 1.5 + runtime + + + + org.apache.tuscany.sca + tuscany-implementation-spring + 1.5 + runtime + + + + org.apache.tuscany.sca + tuscany-implementation-spring-runtime + 1.5 + runtime + + + + junit + junit + 4.5 + test + + + + + ${artifactId} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.0 + + + add-source + generate-sources + + add-source + + + + target/jaxws-source + + + + + + + org.codehaus.mojo + jaxws-maven-plugin + 1.9 + + + payment + generate-sources + + wsimport + + + payment + ${basedir}/src/main/resources + + Payment.wsdl + + ${project.build.directory}/jaxws-source + ${project.build.directory}/jaxws-source/stale/payment.stale + false + true + + + + payment.creditcard + process-sources + + wsimport + + + payment.creditcard + ${basedir}/src/main/resources + + CreditCardPayment.wsdl + + ${project.build.directory}/jaxws-source + ${project.build.directory}/jaxws-source/stale/creditcard.stale + false + true + + + + scatours.emailgateway + process-sources + + wsimport + + + scatours.emailgateway + ${basedir}/src/main/resources + + EmailGateway.wsdl + + ${project.build.directory}/jaxws-source + ${project.build.directory}/jaxws-source/stale/emailgateway.stale + false + true + + + + + + + diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/payment/PaymentImpl.java new file mode 100644 index 0000000000..48f829ae0f --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/payment/PaymentImpl.java @@ -0,0 +1,64 @@ +/* + * 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 payment.creditcard.CreditCardDetailsType; +import payment.creditcard.CreditCardPayment; +import payment.creditcard.CreditCardTypeType; +import payment.creditcard.ObjectFactory; +import payment.creditcard.PayerType; +import scatours.emailgateway.EmailGateway; +import scatours.emailgateway.EmailType; + +public class PaymentImpl implements Payment { + + private CreditCardPayment creditCardPayment; + private EmailGateway emailGateway; + + public void setCreditCardPayment(CreditCardPayment creditCardPayment) { + this.creditCardPayment = creditCardPayment; + } + + public void setEmailGateway(EmailGateway emailGateway) { + this.emailGateway = emailGateway; + } + + public String makePaymentMember(String customerId, float amount) { + + ObjectFactory objectFactory = new ObjectFactory(); + CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType(); + ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa")); + PayerType ccOwner = objectFactory.createPayerType(); + ccOwner.setName(customerId); + ccDetails.setCardOwner(ccOwner); + + String status = creditCardPayment.authorize(ccDetails, amount); + + scatours.emailgateway.ObjectFactory emailFactory = new scatours.emailgateway.ObjectFactory(); + EmailType email = emailFactory.createEmailType(); + email.setTitle("Payment Received"); + email.setTo(customerId); + + emailGateway.sendEmail(email); + + return status; + } + +} diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java new file mode 100644 index 0000000000..644519a5e7 --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java @@ -0,0 +1,29 @@ +/* + * 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.emailgateway; + +public class EmailGatewayImpl implements EmailGateway { + + public String sendEmail(EmailType email) { + System.out.println("Sending mail to " + email.getTo()); + return "SENT"; + } + +} diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl new file mode 100644 index 0000000000..8224cd126f --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/EmailGateway.wsdl new file mode 100644 index 0000000000..a097d9b7e4 --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/EmailGateway.wsdl @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..3f466760b0 --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment-context.xml b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment-context.xml new file mode 100644 index 0000000000..e786e15d55 --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment-context.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment.wsdl new file mode 100644 index 0000000000..e2c4062f2e --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment.wsdl @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite new file mode 100644 index 0000000000..22087afd29 --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java new file mode 100644 index 0000000000..e236c00230 --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java @@ -0,0 +1,80 @@ +/* + * 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 java.io.IOException; + +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-contribution/target/classes"), + new SCAContribution("creditcard-test", "../creditcard-payment-jaxb-contribution/target/test-classes")); + + creditCardNode.start(); + + emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite", + new SCAContribution("creditcard", "../emailgateway-contribution/target/classes"), + new SCAContribution("creditcard-test", "../emailgateway-contribution/target/test-classes")); + + emailGatewayNode.start(); + + paymentNode = SCANodeFactory.newInstance().createSCANode(null, + new SCAContribution("payment-spring", "./target/classes"), + new SCAContribution("payment-spring-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(); + } + +} diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java new file mode 100644 index 0000000000..556a699ad8 --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/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 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); + } + +} diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..3f85e563ed --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite new file mode 100644 index 0000000000..14c6a00951 --- /dev/null +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite @@ -0,0 +1,33 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml index 58456a4b39..4842c3c952 100644 --- a/sandbox/travelsample/contributions/pom.xml +++ b/sandbox/travelsample/contributions/pom.xml @@ -70,6 +70,7 @@ trip-contribution scatours-contribution payment-java-contribution + payment-spring-contribution diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml index 8599fe70b0..f325b98b4e 100644 --- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -19,6 +19,5 @@ --> - \ No newline at end of file diff --git a/sandbox/travelsample/launchers/fullapp-launcher/pom.xml b/sandbox/travelsample/launchers/fullapp-launcher/pom.xml index b2104f6291..1f259a9d68 100644 --- a/sandbox/travelsample/launchers/fullapp-launcher/pom.xml +++ b/sandbox/travelsample/launchers/fullapp-launcher/pom.xml @@ -130,6 +130,20 @@ tuscany-implementation-bpel-ode 1.5 runtime + + + + org.apache.tuscany.sca + tuscany-implementation-spring + 1.5 + runtime + + + + org.apache.tuscany.sca + tuscany-implementation-spring-runtime + 1.5 + runtime diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java index 054061a14b..4ef76d1807 100644 --- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java +++ b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java @@ -44,6 +44,7 @@ public class LaunchFullAppNode { new SCAContribution("tripbooking", "../../contributions/tripbooking-contribution/target/classes"), new SCAContribution("travelcatalog", "../../contributions/travelcatalog-contribution/target/classes"), new SCAContribution("payment", "../../contributions/payment-java-contribution/target/classes"), + //new SCAContribution("payment", "../../contributions/payment-spring-contribution/target/classes"), new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"), new SCAContribution("shoppingcart", "../../contributions/shoppingcart-contribution/target/classes"), new SCAContribution("scatours", "../../contributions/scatours-contribution/target/classes"), -- cgit v1.2.3