diff options
Diffstat (limited to 'sandbox/travelsample/contributions')
| -rw-r--r-- | sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java | 36 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/emailgateway/pom.xml (renamed from sandbox/travelsample/contributions/emailgateway-contribution/pom.xml) | 4 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java (renamed from sandbox/travelsample/contributions/emailgateway-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java) | 5 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/emailgateway/src/main/resources/EmailGateway.wsdl (renamed from sandbox/travelsample/contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml) | 5 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java (renamed from sandbox/travelsample/contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java) | 20 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java (renamed from sandbox/travelsample/contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/client/EmailGatewayClientImpl.java) | 6 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/emailgateway-contribution/src/main/resources/META-INF/sca-contribution.xml) | 5 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite (renamed from sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/emailgateway.composite) | 4 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/log4j.properties (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/log4j.properties) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/pom.xml (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/pom.xml) | 4 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/main/resources/CreditCardPayment.wsdl (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/main/resources/EmailGateway.wsdl (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/main/resources/Payment.wsdl (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/Payment.wsdl) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.bpel (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.bpel) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.composite (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.composite) | 0 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java) | 37 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java) | 74 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml) | 9 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite) | 2 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/payment-groovy/pom.xml (renamed from sandbox/travelsample/contributions/payment-groovy-contribution/pom.xml) | 8 | ||||
| -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 | ||||
| -rw-r--r-- | sandbox/travelsample/contributions/pom.xml | 2 |
33 files changed, 215 insertions, 284 deletions
diff --git a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java b/sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java deleted file mode 100644 index 6b950e669b..0000000000 --- a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -/*
- * 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;
-
-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";
- }
-
-}
diff --git a/sandbox/travelsample/contributions/emailgateway-contribution/pom.xml b/sandbox/travelsample/contributions/emailgateway/pom.xml index f3ed7db79e..edb7143f7b 100644 --- a/sandbox/travelsample/contributions/emailgateway-contribution/pom.xml +++ b/sandbox/travelsample/contributions/emailgateway/pom.xml @@ -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>
diff --git a/sandbox/travelsample/contributions/emailgateway-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java index 6b950e669b..3f561bfe70 100644 --- a/sandbox/travelsample/contributions/emailgateway-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java +++ b/sandbox/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java @@ -17,11 +17,12 @@ * under the License.
*/
-package scatours.emailgateway;
+package com.tuscanyscatours.emailgateway.impl;
+import com.tuscanyscatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.emailgateway.EmailType;
import org.osoa.sca.annotations.Service;
-
/**
*
*/
diff --git a/sandbox/travelsample/contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contributions/emailgateway/src/main/resources/EmailGateway.wsdl index 44867f794c..44867f794c 100644 --- a/sandbox/travelsample/contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl +++ b/sandbox/travelsample/contributions/emailgateway/src/main/resources/EmailGateway.wsdl diff --git a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml index b963b082cb..6c14befa9d 100644 --- a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml @@ -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 + <export.java package="com.tuscanyscatours.emailgateway" />
+ <export.java package="com.tuscanyscatours.emailgateway.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java b/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java index bb3bd4db40..9d16b30cab 100644 --- a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java +++ b/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java @@ -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 @@ public class EmailGatewayTestCase { @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 @@ public class EmailGatewayTestCase { 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
*/
diff --git a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/client/EmailGatewayClientImpl.java b/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java index 96f2d52c0d..10d4984665 100644 --- a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/client/EmailGatewayClientImpl.java +++ b/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java @@ -17,13 +17,13 @@ * under the License.
*/
-package scatours.emailgateway.client;
+package scatours.emailgateway.client.impl;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
-import scatours.emailgateway.EmailGateway;
-import scatours.emailgateway.EmailType;
+import com.tuscanyscatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.emailgateway.EmailType;
/**
*
diff --git a/sandbox/travelsample/contributions/emailgateway-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml index 5057591679..47a544538e 100644 --- a/sandbox/travelsample/contributions/emailgateway-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml @@ -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 + <import.java package="com.tuscanyscatours.emailgateway" />
+ <import.java package="com.tuscanyscatours.emailgateway.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/emailgateway.composite b/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite index 9cd794dad8..f2ed1f345c 100644 --- a/sandbox/travelsample/contributions/emailgateway-contribution/src/test/resources/emailgateway.composite +++ b/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite @@ -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>
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/log4j.properties b/sandbox/travelsample/contributions/payment-bpel/log4j.properties index 7ed0bcaf77..7ed0bcaf77 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/log4j.properties +++ b/sandbox/travelsample/contributions/payment-bpel/log4j.properties diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/pom.xml b/sandbox/travelsample/contributions/payment-bpel/pom.xml index ca27737521..41cf6fc0b0 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/pom.xml +++ b/sandbox/travelsample/contributions/payment-bpel/pom.xml @@ -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> diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/CreditCardPayment.wsdl index 22ef6de317..22ef6de317 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/EmailGateway.wsdl index a097d9b7e4..a097d9b7e4 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl +++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/EmailGateway.wsdl diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml index b458868b09..b458868b09 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/Payment.wsdl index e2c4062f2e..e2c4062f2e 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/Payment.wsdl +++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/Payment.wsdl diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.bpel b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.bpel index 8f11d76888..8f11d76888 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.bpel +++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.bpel diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.composite index 5c337799a7..5c337799a7 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.composite +++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.composite diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java index 1f6f5b69fa..76ef390d62 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java +++ b/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java @@ -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 @@ public class PaymentTestCase { @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 diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java index eaa7498e84..a38ba51ac5 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java +++ b/sandbox/travelsample/contributions/payment-bpel/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 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 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-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml index 86dd694fa9..fcfc2d7c61 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml @@ -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> diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite index 75001d947b..a5110aacff 100644 --- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite +++ b/sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite @@ -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> diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/pom.xml b/sandbox/travelsample/contributions/payment-groovy/pom.xml index 6afc8eefc9..e9823a01e2 100644 --- a/sandbox/travelsample/contributions/payment-groovy-contribution/pom.xml +++ b/sandbox/travelsample/contributions/payment-groovy/pom.xml @@ -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> 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> diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml index b09248df59..0aec7b4cc5 100644 --- a/sandbox/travelsample/contributions/pom.xml +++ b/sandbox/travelsample/contributions/pom.xml @@ -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>
|