summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-11-26 21:51:04 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-11-26 21:51:04 +0000
commitc0be84658ad4dc4d9df3b7ddbf7cd18b261312d6 (patch)
tree16474f192e99e296840f1150add3cbca1cf8e2a8 /sandbox
parentea16b5e9a260e41ad8be3c70fe954db9667a6561 (diff)
A bit of tidying in the full-app. Mainly renaming frontend to coordination and correcting the composite names in the full app contributions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@884703 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java2
-rw-r--r--sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite (renamed from sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite)8
-rw-r--r--sandbox/travelsample/contributions/fullapp-coordination/pom.xml (renamed from sandbox/travelsample/contributions/fullapp-frontend/pom.xml)4
-rw-r--r--sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/META-INF/sca-contribution.xml)2
-rw-r--r--sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite (renamed from sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite)10
-rw-r--r--sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite (renamed from sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite)2
-rw-r--r--sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite (renamed from sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite)4
-rw-r--r--sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite (renamed from sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite)2
-rw-r--r--sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite (renamed from sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite)4
-rw-r--r--sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java28
-rw-r--r--sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite4
-rw-r--r--sandbox/travelsample/contributions/pom.xml2
17 files changed, 46 insertions, 36 deletions
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
index 7f40910d82..a33b2b3046 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
@@ -48,7 +48,7 @@ public class CreditCardPaymentTestCase {
public static void setUpBeforeClass() throws Exception {
try {
node =
- SCANodeFactory.newInstance().createSCANode(null, new SCAContribution("creditcard", "./target/classes"));
+ SCANodeFactory.newInstance().createSCANode("creditcard.composite", new SCAContribution("creditcard", "./target/classes"));
node.start();
} catch (Exception ex) {
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
index 45344f051d..9ae204d8f7 100644
--- a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:scatours="http://tuscanyscatours.com/">
- <deployable composite="scatours:bespoketrip" />
+ <deployable composite="scatours:fullapp-bespoketrip" />
<import.java package="com.tuscanyscatours.common" />
<import.java package="com.tuscanyscatours.hotel" />
<import.java package="com.tuscanyscatours.hotel.impl" />
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
index 741081c653..76c91b7887 100644
--- a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
@@ -20,9 +20,9 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- name="bespoketrip">
+ name="fullapp-bespoketrip">
- <component name="Hotel">
+ <component name="HotelPartner">
<implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
<service name="Search">
<binding.ws name="searchws" uri="http://localhost:8086/Hotel/Search"/>
@@ -34,7 +34,7 @@
<service name="Book"/>
</component>
- <component name="Flight">
+ <component name="FlightPartner">
<implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
<service name="Search">
<interface.java interface="com.tuscanyscatours.common.Search"
@@ -48,7 +48,7 @@
<service name="Book"/>
</component>
- <component name="Car">
+ <component name="CarPartner">
<implementation.java class="com.tuscanyscatours.car.impl.CarImpl"/>
<service name="Search">
<binding.ws name="searchws" uri="http://localhost:8086/Car/Search"/>
diff --git a/sandbox/travelsample/contributions/fullapp-frontend/pom.xml b/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
index 93f6c9e255..120e8bd490 100644
--- a/sandbox/travelsample/contributions/fullapp-frontend/pom.xml
+++ b/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
@@ -25,8 +25,8 @@
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-contribution-fullapp-frontend</artifactId>
- <name>Apache Tuscany SCA Tours Full Application Front End Contribution</name>
+ <artifactId>scatours-contribution-fullapp-coordination</artifactId>
+ <name>Apache Tuscany SCA Tours Full Application Coordination Contribution</name>
<dependencies>
<dependency>
diff --git a/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
index 99a98f6136..a6eb8bcce2 100644
--- a/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:scatours="http://tuscanyscatours.com/">
- <deployable composite="scatours:frontend" />
+ <deployable composite="scatours:fullapp-coordination" />
<import.java package="com.tuscanyscatours.common" />
<import.java package="com.tuscanyscatours.currencyconverter" />
<import.java package="com.tuscanyscatours.travelcatalog" />
diff --git a/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
index 6d18947bd1..b3c901085d 100644
--- a/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
- name="frontend">
+ name="fullapp-coordination">
<component name="TravelCatalog">
<implementation.java class="com.tuscanyscatours.travelcatalog.impl.TravelCatalogImpl"/>
@@ -62,10 +62,10 @@
<component name="TripBooking">
<implementation.java class="com.tuscanyscatours.tripbooking.impl.TripBookingImpl"/>
<service name="TripBooking"/>
- <reference name="hotelBook" target="Hotel/Book"/>
- <reference name="flightBook" target="Trip/Book"/>
- <reference name="carBook" target="Car/Book"/>
- <reference name="tripBook" target="Trip/Book"/>
+ <reference name="hotelBook" target="HotelPartner/Book"/>
+ <reference name="flightBook" target="TripPartner/Book"/>
+ <reference name="carBook" target="CarPartner/Book"/>
+ <reference name="tripBook" target="TripPartner/Book"/>
<reference name="cartUpdates" target="ShoppingCart/CartUpdates"/>
</component>
diff --git a/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
index c439cf9a77..dc66ed8db6 100644
--- a/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:scatours="http://tuscanyscatours.com/">
- <deployable composite="scatours:currency" />
+ <deployable composite="scatours:fullapp-currency" />
<import.java package="com.tuscanyscatours.currencyconverter" />
<import.java package="com.tuscanyscatours.currencyconverter.impl" />
</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
index 7336c4c91d..654ff60c41 100644
--- a/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
- name="currency">
+ name="fullapp-currency">
<component name="CurrencyConverter">
<implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
index 7844d200db..3059c49911 100644
--- a/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:scatours="http://tuscanyscatours.com/">
- <deployable composite="scatours:packagedtrip" />
+ <deployable composite="scatours:fullapp-packagedtrip" />
<import.java package="com.tuscanyscatours.common" />
<import.java package="com.tuscanyscatours.trip.impl" />
</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
index 1a03021199..0f8dd33060 100644
--- a/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
@@ -20,9 +20,9 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- name="packagedtrip">
+ name="fullapp-packagedtrip">
- <component name="Trip">
+ <component name="TripPartner">
<implementation.java class="com.tuscanyscatours.trip.impl.TripImpl"/>
<service name="Search">
<binding.ws name="searchws" uri="http://localhost:8085/Trip/Search"/>
diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
index 29769ba852..384887f792 100644
--- a/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:scatours="http://tuscanyscatours.com/">
- <deployable composite="scatours:shoppingcart" />
+ <deployable composite="scatours:fullapp-shoppingcart" />
<import.java package="com.tuscanyscatours.payment" />
<import.java package="com.tuscanyscatours.shoppingcart" />
<import.java package="com.tuscanyscatours.shoppingcart.impl" />
diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
index 97c6e649e2..ed4fce84d6 100644
--- a/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
- name="shoppingcart">
+ name="fullapp-shoppingcart">
<component name="ShoppingCart">
<implementation.java class="com.tuscanyscatours.shoppingcart.impl.ShoppingCartImpl"/>
diff --git a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
index 6832ecaf79..104a78cd92 100644
--- a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:scatours="http://tuscanyscatours.com/">
- <deployable composite="scatours:ui" />
+ <deployable composite="scatours:fullapp-ui" />
<import.java package="com.tuscanyscatours" />
<import.java package="com.tuscanyscatours.impl" />
<import.java package="com.tuscanyscatours.shoppingcart" />
diff --git a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
index 5dd0d01102..bcfa894ca6 100644
--- a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
@@ -20,9 +20,9 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- name="ui">
+ name="fullapp-ui">
- <component name="scatours">
+ <component name="SCAToursUserInterface">
<tuscany:implementation.widget location="scatours.html"/>
<service name="Widget">
<tuscany:binding.http uri="/scatours"/>
diff --git a/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
index 5fd8900fce..d8c79622e6 100644
--- a/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
@@ -31,22 +31,27 @@ import org.junit.Test;
import com.tuscanyscatours.payment.Payment;
public class PaymentTestCase {
- private static SCANode node;
+ private static SCANode node1;
+ private static SCANode node2;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- node =
+ node1 =
SCANodeFactory.newInstance()
- .createSCANode(null,
- new SCAContribution("payment", "./target/classes"),
+ .createSCANode("payment.composite",
+ new SCAContribution("payment", "./target/classes"));
+ node2 =
+ SCANodeFactory.newInstance()
+ .createSCANode("creditcard.composite",
new SCAContribution("creditcard",
"../../contributions/creditcard-payment-jaxb/target/classes"));
- node.start();
+ node1.start();
+ node2.start();
}
@Test
public void testPayment() {
- SCAClient client = (SCAClient)node;
+ SCAClient client = (SCAClient)node1;
Payment payment = client.getService(Payment.class, "Payment");
System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
@@ -66,10 +71,15 @@ public class PaymentTestCase {
@AfterClass
public static void tearDownAfterClass() throws Exception {
- if (node != null) {
- node.stop();
- node = null;
+ if (node1 != null) {
+ node1.stop();
+ node1 = null;
}
+
+ if (node2 != null) {
+ node2.stop();
+ node2 = null;
+ }
}
}
diff --git a/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
index d1ea76db4b..c6710c60a2 100644
--- a/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
@@ -26,8 +26,8 @@
<service name="Payment">
<binding.ws uri="http://localhost:8081/Payment"/>
</service>
- <reference name="creditCardPaymentReference" requires="authentication">
- <binding.ws uri="http://localhost:8083/CreditCardPayment"/>
+ <reference name="creditCardPaymentReference" >
+ <binding.ws uri="http://localhost:8083/CreditCardPayment" requires="authentication"/>
</reference>
<reference name="emailGateway" target="EmailGateway"/>
<reference name="customerRegistry" target="CustomerRegistry"/>
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 5b191e77a4..c6ece86582 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -57,7 +57,7 @@
<module>feed-logger</module>
<module>flight</module>
<module>fullapp-ui</module>
- <module>fullapp-frontend</module>
+ <module>fullapp-coordination</module>
<module>fullapp-currency</module>
<module>fullapp-packagedtrip</module>
<module>fullapp-bespoketrip</module>