You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2009/09/14 21:14:56 UTC
svn commit: r814783 - in /tuscany/sandbox/travelsample/contributions: ./
emailgateway-contribution/ emailgateway/ emailgateway/src/main/java/com/
emailgateway/src/main/java/com/tuscanyscatours/
emailgateway/src/main/java/com/tuscanyscatours/emailgatewa...
Author: nash
Date: Mon Sep 14 19:14:55 2009
New Revision: 814783
URL: http://svn.apache.org/viewvc?rev=814783&view=rev
Log:
Apply new naming convention to the payment-bpel, payment-groovy and emailgateway contributions
Added:
tuscany/sandbox/travelsample/contributions/emailgateway/
- copied from r814729, tuscany/sandbox/travelsample/contributions/emailgateway-contribution/
tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/com/
tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/
tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/
tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/
tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java
tuscany/sandbox/travelsample/contributions/payment-bpel/
- copied from r814729, tuscany/sandbox/travelsample/contributions/payment-bpel-contribution/
tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/
tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
tuscany/sandbox/travelsample/contributions/payment-groovy/
- copied from r814729, tuscany/sandbox/travelsample/contributions/payment-groovy-contribution/
tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/
tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/
tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/
tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/
tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
Removed:
tuscany/sandbox/travelsample/contributions/emailgateway-contribution/
tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/EmailGatewayClientImpl.java
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/EmailGatewayImpl.java
tuscany/sandbox/travelsample/contributions/payment-bpel-contribution/
tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/PaymentClientImpl.java
tuscany/sandbox/travelsample/contributions/payment-groovy-contribution/
tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/payment/
Modified:
tuscany/sandbox/travelsample/contributions/emailgateway/pom.xml
tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite
tuscany/sandbox/travelsample/contributions/payment-bpel/pom.xml
tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
tuscany/sandbox/travelsample/contributions/payment-groovy/pom.xml
tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy
tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
tuscany/sandbox/travelsample/contributions/pom.xml
Modified: tuscany/sandbox/travelsample/contributions/emailgateway/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/pom.xml?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/pom.xml Mon Sep 14 19:14:55 2009
@@ -26,7 +26,7 @@
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<version>1.0-SNAPSHOT</version>
- <artifactId>scatours-emailgateway-contribution</artifactId>
+ <artifactId>scatours-contribution-emailgateway</artifactId>
<name>Apache Tuscany SCA Tours Email Gateway Contribution</name>
<dependencies>
@@ -118,7 +118,7 @@
<goal>wsimport</goal>
</goals>
<configuration>
- <packageName>scatours.emailgateway</packageName>
+ <packageName>com.tuscanyscatours.emailgateway</packageName>
<wsdlDirectory>${basedir}/src/main/resources
</wsdlDirectory>
<wsdlFiles>
Added: tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java?rev=814783&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java (added)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java Mon Sep 14 19:14:55 2009
@@ -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 com.tuscanyscatours.emailgateway.impl;
+
+import com.tuscanyscatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.emailgateway.EmailType;
+import org.osoa.sca.annotations.Service;
+
+/**
+ *
+ */
+@Service(EmailGateway.class)
+public class EmailGatewayImpl implements EmailGateway {
+
+ public String sendEmail(EmailType email) {
+ System.out.println("Sending mail to " + email.getTo());
+ return "SENT";
+ }
+
+}
Modified: tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml Mon Sep 14 19:14:55 2009
@@ -18,5 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <export.java package="scatours.emailgateway"/>
-</contribution>
\ No newline at end of file
+ <export.java package="com.tuscanyscatours.emailgateway" />
+ <export.java package="com.tuscanyscatours.emailgateway.impl" />
+</contribution>
Modified: tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java (original)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java Mon Sep 14 19:14:55 2009
@@ -19,7 +19,11 @@
package scatours.emailgateway;
+import com.tuscanyscatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.emailgateway.EmailType;
+import com.tuscanyscatours.emailgateway.ObjectFactory;
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;
@@ -38,7 +42,9 @@
@BeforeClass
public static void setUpBeforeClass() throws Exception {
SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANodeFromClassLoader("emailgateway.composite", EmailGateway.class.getClassLoader());
+ node = factory.createSCANode("emailgateway.composite",
+ new SCAContribution("emailgateway", "./target/classes"),
+ new SCAContribution("emailgateway-test", "./target/test-classes"));
node.start();
}
@@ -54,18 +60,6 @@
System.out.println(cc.sendEmail(email));
}
- @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");
-*/
- }
-
/**
* @throws java.lang.Exception
*/
Added: tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java?rev=814783&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java (added)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java Mon Sep 14 19:14:55 2009
@@ -0,0 +1,41 @@
+/*
+ * 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.client.impl;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.emailgateway.EmailType;
+
+/**
+ *
+ */
+@Service(EmailGateway.class)
+public class EmailGatewayClientImpl implements EmailGateway {
+ @Reference
+ protected EmailGateway emailGateway;
+
+ public String sendEmail(EmailType email) {
+ // Delegate the external web service
+ return emailGateway.sendEmail(email);
+ }
+
+}
Modified: tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml Mon Sep 14 19:14:55 2009
@@ -18,5 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="scatours.emailgateway"/>
-</contribution>
\ No newline at end of file
+ <import.java package="com.tuscanyscatours.emailgateway" />
+ <import.java package="com.tuscanyscatours.emailgateway.impl" />
+</contribution>
Modified: tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite (original)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite Mon Sep 14 19:14:55 2009
@@ -23,13 +23,13 @@
targetNamespace="http://creditcard"
name="emailgateway">
<component name="EmailGatewayClient">
- <implementation.java class="scatours.emailgateway.client.EmailGatewayClientImpl" />
+ <implementation.java class="scatours.emailgateway.client.impl.EmailGatewayClientImpl" />
<reference name="emailGateway">
<binding.ws uri="http://localhost:8088/EmailGateway" />
</reference>
</component>
<component name="EmailGateway">
- <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />
+ <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />
<service name="EmailGateway">
<binding.ws uri="http://localhost:8088/EmailGateway" />
</service>
Modified: tuscany/sandbox/travelsample/contributions/payment-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-bpel/pom.xml?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-bpel/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/payment-bpel/pom.xml Mon Sep 14 19:14:55 2009
@@ -26,7 +26,7 @@
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<version>1.0-SNAPSHOT</version>
- <artifactId>scatours-payment-bpel-contribution</artifactId>
+ <artifactId>scatours-contribution-payment-bpel</artifactId>
<name>Apache Tuscany SCA Tours Payment BPEL Contribution</name>
<dependencies>
@@ -127,7 +127,7 @@
<goal>wsimport</goal>
</goals>
<configuration>
- <packageName>scatours.payment</packageName>
+ <packageName>com.tuscanyscatours.payment</packageName>
<wsdlDirectory>${basedir}/src/main/resources
</wsdlDirectory>
<wsdlFiles>
Modified: tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java Mon Sep 14 19:14:55 2009
@@ -19,6 +19,7 @@
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;
@@ -37,28 +38,22 @@
@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-bpel", "./target/classes"),
- new SCAContribution("payment-bpel-test", "./target/test-classes"));
-
+ 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-bpel", "./target/classes"),
+ new SCAContribution("payment-bpel-test", "./target/test-classes"));
- paymentNode.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ paymentNode.start();
}
@Test
Added: tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java?rev=814783&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java (added)
+++ tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java Mon Sep 14 19:14:55 2009
@@ -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.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);
+ }
+
+}
Modified: tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml Mon Sep 14 19:14:55 2009
@@ -18,8 +18,7 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:pp="http://www.tuscanyscatours.com/Payment" >
- <import namespace="http://www.tuscanyscatours.com/Payment"/>
- <import namespace="http://www.tuscanyscatours.com/Payment/"/>
- <deployable composite="pp:paymentClient" />
-</contribution>
\ No newline at end of file
+ xmlns:pp="http://www.tuscanyscatours.com/Payment">
+ <import.java package="com.tuscanyscatours.payment" />
+ <deployable composite="pp:paymentClient" />
+</contribution>
Modified: tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite (original)
+++ tuscany/sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite Mon Sep 14 19:14:55 2009
@@ -24,7 +24,7 @@
name="paymentClient">
<component name="PaymentClient">
- <implementation.java class="scatours.payment.client.PaymentClientImpl" />
+ <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" />
<reference name="payment">
<binding.ws uri="http://localhost:8080/Payment" />
</reference>
Modified: tuscany/sandbox/travelsample/contributions/payment-groovy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-groovy/pom.xml?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-groovy/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/payment-groovy/pom.xml Mon Sep 14 19:14:55 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
- <artifactId>scatours-payment-groovy-contribution</artifactId>
+ <artifactId>scatours-contribution-payment-groovy</artifactId>
<name>Apache Tuscany SCA Tours Payment Groovy Contribution</name>
<dependencies>
@@ -112,7 +112,7 @@
<goal>wsimport</goal>
</goals>
<configuration>
- <packageName>payment</packageName>
+ <packageName>com.tuscanyscatours.payment</packageName>
<wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
<wsdlFiles>
<wsdlFile>Payment.wsdl</wsdlFile>
@@ -130,7 +130,7 @@
<goal>wsimport</goal>
</goals>
<configuration>
- <packageName>payment.creditcard</packageName>
+ <packageName>com.tuscanyscatours.payment.creditcard</packageName>
<wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
<wsdlFiles>
<wsdlFile>CreditCardPayment.wsdl</wsdlFile>
@@ -148,7 +148,7 @@
<goal>wsimport</goal>
</goals>
<configuration>
- <packageName>scatours.emailgateway</packageName>
+ <packageName>com.tuscanyscatours.emailgateway</packageName>
<wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
<wsdlFiles>
<wsdlFile>EmailGateway.wsdl</wsdlFile>
Modified: tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml Mon Sep 14 19:14:55 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment.composite?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment.composite (original)
+++ tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment.composite Mon Sep 14 19:14:55 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy (original)
+++ tuscany/sandbox/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy Mon Sep 14 19:14:55 2009
@@ -21,7 +21,7 @@
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");
Added: tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java?rev=814783&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java (added)
+++ tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java Mon Sep 14 19:14:55 2009
@@ -0,0 +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 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();
+ }
+
+}
Added: tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java?rev=814783&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java (added)
+++ tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java Mon Sep 14 19:14:55 2009
@@ -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.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);
+ }
+
+}
Modified: tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml Mon Sep 14 19:14:55 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite?rev=814783&r1=814729&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite (original)
+++ tuscany/sandbox/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite Mon Sep 14 19:14:55 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/pom.xml?rev=814783&r1=814782&r2=814783&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/pom.xml Mon Sep 14 19:14:55 2009
@@ -82,7 +82,7 @@
<module>payment-java-policy</module>
<module>payment-spring</module>
<module>payment-spring-scatag</module>
- <module>payment-bpel-contribution</module>
+ <module>payment-bpel</module>
<module>payment-groovy-contribution</module>
<module>policy-client</module>
</modules>