diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-08-27 01:07:30 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-08-27 01:07:30 +0000 |
commit | 47d7bf03613dfd6a2db848df57306c0c2b8c2402 (patch) | |
tree | 47d5bc9c7e565ffc5f1a653c2ba2d3cc2df1a940 /sandbox/travelsample/contributions/payment-java/src | |
parent | e55e032a7fbf42b17461e4fa4ad729b8f58a0f60 (diff) |
Apply the new naming conventions to the fullapp contributions and launchers
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@808241 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java) | 4 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java) | 2 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java) | 4 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java) | 13 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java) | 2 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java) | 3 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java) | 17 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/resources/CreditCardPayment.wsdl (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml) | 8 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/Payment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/resources/definitions.xml (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/definitions.xml) | 3 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite) | 20 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java (renamed from sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java) | 18 |
13 files changed, 46 insertions, 48 deletions
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java index daf56353a3..c97ba8fb9f 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java +++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java @@ -17,9 +17,9 @@ * under the License.
*/
-package scatours.customer;
+package com.tuscanyscatours.customer;
-import payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
/**
* Customer data
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java index 89f56ce6ec..58772c747c 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java +++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java @@ -17,7 +17,7 @@ * under the License.
*/
-package scatours.customer;
+package com.tuscanyscatours.customer;
public class CustomerNotFoundException extends Exception {
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java index cfd79a7f95..38a2759660 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java +++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java @@ -17,11 +17,11 @@ * under the License.
*/
-package scatours.customer;
+package com.tuscanyscatours.customer;
import java.util.Collection;
-import payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
/**
* Customer registry interface
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java index e6328f062c..ac7b71c17f 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java +++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java @@ -17,7 +17,7 @@ * under the License.
*/
-package scatours.customer;
+package com.tuscanyscatours.customer.impl;
import java.util.Collection;
import java.util.HashMap;
@@ -30,10 +30,13 @@ import org.osoa.sca.annotations.Requires; import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardTypeType;
-import payment.creditcard.ObjectFactory;
-import payment.creditcard.PayerType;
+import com.tuscanyscatours.customer.Customer;
+import com.tuscanyscatours.customer.CustomerNotFoundException;
+import com.tuscanyscatours.customer.CustomerRegistry;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
+import com.tuscanyscatours.payment.creditcard.ObjectFactory;
+import com.tuscanyscatours.payment.creditcard.PayerType;
/**
* An in-memory customer registry implementation
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java index d360381327..8c6ca806d2 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java +++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java @@ -17,7 +17,7 @@ * under the License.
*/
-package scatours.emailgateway;
+package com.tuscanyscatours.emailgateway;
import org.osoa.sca.annotations.Remotable;
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java index 060c3dabda..b942eebddf 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java +++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java @@ -17,9 +17,10 @@ * under the License.
*/
-package scatours.emailgateway;
+package com.tuscanyscatours.emailgateway.impl;
import org.osoa.sca.annotations.Service;
+import com.tuscanyscatours.emailgateway.EmailGateway;
@Service(EmailGateway.class)
public class EmailGatewayImpl implements EmailGateway {
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java index 53e896a580..8fb56c67e7 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java +++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java @@ -17,7 +17,7 @@ * under the License.
*/
-package payment;
+package com.tuscanyscatours.payment.impl;
import javax.annotation.security.RolesAllowed;
import javax.annotation.security.RunAs;
@@ -27,13 +27,14 @@ import org.osoa.sca.annotations.Property; import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
-import payment.creditcard.AuthorizeFault_Exception;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
-import scatours.customer.Customer;
-import scatours.customer.CustomerNotFoundException;
-import scatours.customer.CustomerRegistry;
-import scatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.customer.Customer;
+import com.tuscanyscatours.customer.CustomerNotFoundException;
+import com.tuscanyscatours.customer.CustomerRegistry;
+import com.tuscanyscatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.payment.Payment;
+import com.tuscanyscatours.payment.creditcard.AuthorizeFault_Exception;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
/**
* The payment implementation
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/payment-java/src/main/resources/CreditCardPayment.wsdl index d17497d1f6..d17497d1f6 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml index ac556c3518..f8ff7b4623 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/payment-java/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:creditcard="http://creditcard">
- <export.java package="payment.creditcard"/>
- <deployable composite="creditcard:creditcard" />
-</contribution>
\ No newline at end of file + xmlns:scatours="http://tuscanyscatours.com/">
+ <export.java package="com.tuscanyscatours.payment" />
+ <deployable composite="scatours:payment" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl index 3885764899..3885764899 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/Payment.wsdl +++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/definitions.xml b/sandbox/travelsample/contributions/payment-java/src/main/resources/definitions.xml index 9060e75ed2..dc47395e9b 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/definitions.xml +++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/definitions.xml @@ -19,8 +19,7 @@ -->
<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
<!-- Policy Intents Defined by the SCA Runtime -->
<intent name="authorization" constrains="sca:implementation"/>
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite index 45c802ed31..69160e24f8 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite +++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite @@ -18,30 +18,28 @@ * 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"
+ targetNamespace="http://tuscanyscatours.com/"
name="payment">
- <component name="PaymentComponent">
- <implementation.java class="payment.PaymentImpl" />
+ <component name="Payment">
+ <implementation.java class="com.tuscanyscatours.payment.impl.PaymentImpl" />
<service name="Payment">
<binding.ws uri="http://localhost:8081/Payment"/>
</service>
- <reference name="customerRegistry" target="CustomerRegistryComponent"/>
+ <reference name="customerRegistry" target="CustomerRegistry"/>
<reference name="creditCardPayment">
<binding.ws uri="http://localhost:8082/CreditCardPayment"/>
</reference>
- <reference name="emailGateway" target="EmailGatewayComponent"/>
+ <reference name="emailGateway" target="EmailGateway"/>
<property name="transactionFee">0.02</property>
</component>
- <component name="CustomerRegistryComponent">
- <implementation.java class="scatours.customer.CustomerRegistryImpl" />
+ <component name="CustomerRegistry">
+ <implementation.java class="com.tuscanyscatours.customer.impl.CustomerRegistryImpl" />
</component>
- <component name="EmailGatewayComponent">
- <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />
+ <component name="EmailGateway">
+ <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />
</component>
</composite>
\ No newline at end of file diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java index b6c7561a15..631642ea0a 100644 --- a/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java +++ b/sandbox/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java @@ -17,8 +17,9 @@ * under the License.
*/
-package payment;
+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;
@@ -33,21 +34,16 @@ public class PaymentTestCase { @BeforeClass
public static void setUpBeforeClass() throws Exception {
- try {
- node = SCANodeFactory.newInstance().createSCANode(null,
- new SCAContribution("payment", "./target/classes"),
- new SCAContribution("tuscanyscatours", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"));
-
- node.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ node = SCANodeFactory.newInstance().createSCANode(null,
+ new SCAContribution("payment", "./target/classes"),
+ new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb/target/classes"));
+ node.start();
}
@Test
public void testPayment() {
SCAClient client = (SCAClient) node;
- Payment payment = client.getService(Payment.class, "PaymentComponent");
+ Payment payment = client.getService(Payment.class, "Payment");
System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
System.out.println("\n\nFailed Payment - Status = \n\n" + payment.makePaymentMember("c-1", 100.00f));
|