summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-05-24 19:52:46 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-05-24 19:52:46 +0000
commitd93ed035d7750c1cd8ed4ea2fec726a569e5645a (patch)
tree8171715268c176e290d1821322c8965cdbb7d25c /sandbox
parentf5aeea6bc0441c541a21373773bf9a219acf7bd4 (diff)
activate composites in payment and credit card payment and use the contributions in the databinding sample. Still some problem when running these contributions in full app mode that causes a wire configuration problem.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@778220 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml2
-rw-r--r--sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite (renamed from sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite)66
-rw-r--r--sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java12
-rw-r--r--sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml22
-rw-r--r--sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite2
-rw-r--r--sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite21
-rw-r--r--sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odgbin11477 -> 11880 bytes
-rw-r--r--sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.pngbin11061 -> 16554 bytes
-rw-r--r--sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java50
-rw-r--r--sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite15
-rw-r--r--sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java15
-rw-r--r--sandbox/travelsample/contributions/pom.xml2
-rw-r--r--sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java2
-rw-r--r--sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java36
-rw-r--r--sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/IntroducingLauncher.java3
-rw-r--r--sandbox/travelsample/launchers/pom.xml1
-rw-r--r--sandbox/travelsample/pom.xml14
19 files changed, 94 insertions, 177 deletions
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml
index 283b016065..40e9c62f37 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml
@@ -26,7 +26,7 @@
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-creditcard-payment-jaxb-contribution</artifactId>
- <name>Apache Tuscany SCA Tours Credit Card Payment Contribution</name>
+ <name>Apache Tuscany SCA Tours Credit Card Payment Contribution JAXB</name>
<dependencies>
<dependency>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
index 45d954fcbb..ac556c3518 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -17,6 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<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
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite
index 21964035ec..df37a189db 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://creditcard"
- xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:c="http://creditcard"
- name="creditcard">
-
- <component name="CreditCardPaymentComponent">
- <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />
- <service name="CreditCardPayment">
- <binding.ws uri="http://localhost:8081/CreditCardPayment" />
- <binding.sca/>
- </service>
- </component>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://creditcard"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:c="http://creditcard"
+ name="creditcard">
+
+ <component name="CreditCardPaymentComponent">
+ <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />
+ <service name="CreditCardPayment">
+ <binding.ws uri="http://localhost:8082/CreditCardPayment" />
+ <binding.sca/>
+ </service>
+ </component>
+
</composite> \ No newline at end of file
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
index 2cbcf08d3a..30fe2ca3da 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
@@ -20,6 +20,7 @@
package payment.creditcard;
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,9 +39,14 @@ public class CreditCardPaymentTestCase {
*/
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANodeFromClassLoader("creditcard.composite", CreditCardPayment.class.getClassLoader());
- node.start();
+ try {
+ node = SCANodeFactory.newInstance().createSCANode(null,
+ new SCAContribution("creditcard", "./target/classes"));
+
+ node.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
}
@Test
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 18c9e05b2a..0000000000
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="payment.creditcard"/>
-</contribution> \ No newline at end of file
diff --git a/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite b/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite
index bcb1a83c0c..047780dbaf 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite
+++ b/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite
@@ -27,7 +27,7 @@
<implementation.java class="payment.creditcard.impl.CreditCardPaymentImpl" />
<service name="CreditCardPayment">
<interface.wsdl interface="http://www.example.org/CreditCardPayment/#wsdl.interface(CreditCardPayment)"/>
- <binding.ws uri="http://localhost:8081/CreditCardPayment" />
+ <binding.ws uri="http://localhost:8082/CreditCardPayment" />
<binding.sca/>
</service>
</component>
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
index b0a975c0b7..2a877cff01 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
@@ -143,25 +143,8 @@
<service name="ShoppingCart">
</service>
<reference name="payment">
- <binding.ws uri="http://localhost:8080/Payment" />
+ <binding.ws uri="http://localhost:8081/Payment" />
</reference>
- </component>
-
- <!--component name="PaymentComponent">
- <implementation.java class="payment.PaymentImpl" />
- <service name="Payment">
- <binding.ws uri="http://localhost:8080/Payment" />
- </service>
- <reference name="creditCardPayment">
- <binding.ws uri="http://localhost:8080/CreditCardPayment" />
- </reference>
- </component>
-
- <component name="CreditCardPaymentComponent">
- <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />
- <service name="CreditCardPayment">
- <binding.ws uri="http://localhost:8080/CreditCardPayment" />
- </service>
- </component-->
+ </component>
</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg
index 8ca8fbf133..8466377374 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg
+++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg
Binary files differ
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png
index f68cd84704..563bf4ea91 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png
+++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png
Binary files differ
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
deleted file mode 100644
index ab2b114ee9..0000000000
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
+++ /dev/null
@@ -1,50 +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 payment.creditcard;
-
-import javax.annotation.security.RolesAllowed;
-
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Service;
-
-@Service(CreditCardPayment.class)
-@Requires("{http://www.osoa.org/xmlns/sca/1.0}authorization")
-@RolesAllowed("Admin")
-public class CreditCardPaymentImpl implements CreditCardPayment {
-
- public String authorize(CreditCardDetailsType creditCard, float amount) throws AuthorizeFault_Exception {
- if (creditCard != null) {
- System.out.println("Checking card: name = " + creditCard.getCardOwner().getName()
- + " number = "
- + creditCard.getCreditCardNumber()
- + " for amount "
- + amount);
- } else {
- System.out.println("Checking card is null");
- ObjectFactory factory = new ObjectFactory();
- AuthorizeFault fault = factory.createAuthorizeFault();
- fault.setErrorCode("001 - Invalid card");
- AuthorizeFault_Exception ex = new AuthorizeFault_Exception("Invalid card", fault);
- throw ex;
- }
-
- return "OK";
- }
-}
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
index d3de0083f7..12b9852bf0 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -17,6 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<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
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite
index a3eb5c79cd..53fcefc241 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite
@@ -25,22 +25,23 @@
<component name="PaymentComponent">
<implementation.java class="payment.PaymentImpl" />
+ <service name="Payment">
+ <binding.ws uri="http://localhost:8081/Payment"/>
+ </service>
<reference name="customerRegistry" target="CustomerRegistryComponent"/>
- <reference name="creditCardPayment" target="CreditCardPaymentComponent"/>
+ <reference name="creditCardPayment">
+ <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
+ </reference>
<reference name="emailGateway" target="EmailGatewayComponent"/>
<property name="transactionFeeRate">0.02</property>
</component>
-
+
<component name="CustomerRegistryComponent">
<implementation.java class="scatours.customer.CustomerRegistryImpl" />
</component>
-
+
<component name="EmailGatewayComponent">
<implementation.java class="scatours.emailgateway.EmailGatewayImpl" />
</component>
- <component name="CreditCardPaymentComponent">
- <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />
- </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-contribution/src/test/java/payment/PaymentTestCase.java
index 45c42fadd0..39671b33ca 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
@@ -20,6 +20,7 @@
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;
@@ -37,13 +38,19 @@ public class PaymentTestCase {
*/
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANodeFromClassLoader("payment.composite", Payment.class.getClassLoader());
- node.start();
+ 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();
+ }
}
@Test
- public void testCreditCardPayment() {
+ public void testPayment() {
SCAClient client = (SCAClient) node;
Payment payment = client.getService(Payment.class, "PaymentComponent");
System.out.println(payment.makePaymentMember("c-0", 100.00f));
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 398aff072c..45858dd52c 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -40,10 +40,12 @@
<module>car-contribution</module>
<module>common-contribution</module>
<module>creditcard-payment-jaxb-contribution</module>
+ <module>creditcard-payment-sdo-contribution</module>
<module>currency-contribution</module>
<module>currency-corba-contribution</module>
<module>currency-rmi-contribution</module>
<module>currency-ws-contribution</module>
+ <module>databinding-client-contribution</module>
<module>emailgateway-contribution</module>
<module>flight-contribution</module>
<module>fullapp-ui-contribution</module>
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java b/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
index 25355ad38c..d81b950047 100644
--- a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
+++ b/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
@@ -94,6 +94,6 @@ public class SCAToursImpl implements SCAToursSearch, SCAToursBooking, SCAToursCa
public void checkout(String cartId){
// need to get the user id from the context here
- carts.get(cartId).checkout("Fred");
+ carts.get(cartId).checkout("c-0");
}
}
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
index d125eadac9..51c373ae82 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
+++ b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
@@ -32,31 +32,33 @@ public class LaunchFullAppNode {
// OK for development but you must launch the node from this module
public static void launchFromFileSystemDir(){
- SCANode node = null;
try {
- node = SCANodeFactory.newInstance().createSCANode("scatours.composite",
- new SCAContribution("common", "../../contributions/common-contribution/target/classes"),
- new SCAContribution("currency", "../../contributions/currency-contribution/target/classes"),
- new SCAContribution("hotel", "../../contributions/hotel-contribution/target/classes"),
- new SCAContribution("flight", "../../contributions/flight-contribution/target/classes"),
- new SCAContribution("car", "../../contributions/car-contribution/target/classes"),
- new SCAContribution("trip", "../../contributions/trip-contribution/target/classes"),
- new SCAContribution("tripbooking", "../../contributions/tripbooking-contribution/target/classes"),
- new SCAContribution("travelcatalog", "../../contributions/travelcatalog-contribution/target/classes"),
- new SCAContribution("payment", "../../contributions/payment-java-contribution/target/classes"),
- new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"),
- new SCAContribution("shoppingcart", "../../contributions/shoppingcart-contribution/target/classes"),
- new SCAContribution("scatours", "../../contributions/scatours-contribution/target/classes"),
- new SCAContribution("ui", "../../contributions/fullapp-ui-contribution/target/classes"));
- node.start();
+ SCANode node1 = SCANodeFactory.newInstance().createSCANode(null,
+ new SCAContribution("common", "../../contributions/common-contribution/target/classes"),
+ new SCAContribution("currency", "../../contributions/currency-contribution/target/classes"),
+ new SCAContribution("hotel", "../../contributions/hotel-contribution/target/classes"),
+ new SCAContribution("flight", "../../contributions/flight-contribution/target/classes"),
+ new SCAContribution("car", "../../contributions/car-contribution/target/classes"),
+ new SCAContribution("trip", "../../contributions/trip-contribution/target/classes"),
+ new SCAContribution("tripbooking", "../../contributions/tripbooking-contribution/target/classes"),
+ new SCAContribution("travelcatalog", "../../contributions/travelcatalog-contribution/target/classes"),
+ new SCAContribution("payment", "../../contributions/payment-java-contribution/target/classes"),
+ new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"),
+ new SCAContribution("shoppingcart", "../../contributions/shoppingcart-contribution/target/classes"),
+ new SCAContribution("scatours", "../../contributions/scatours-contribution/target/classes"),
+ new SCAContribution("ui", "../../contributions/fullapp-ui-contribution/target/classes"));
+
+ node1.start();
+ System.out.println("Point your browser at - http://L3AW203:8080/scatours/ ");
System.out.println("Node started - Press enter to shutdown.");
+
try {
System.in.read();
} catch (IOException e) {}
- node.stop();
+ node1.stop();
} catch (Exception ex) {
System.out.println(ex.toString());
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/IntroducingLauncher.java b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/IntroducingLauncher.java
index 47796a16da..aea94317c8 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/IntroducingLauncher.java
+++ b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/IntroducingLauncher.java
@@ -19,9 +19,6 @@
package scatours;
-import java.io.IOException;
-import java.math.BigDecimal;
-
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index 9fd73338c1..b7c6632864 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -39,6 +39,7 @@
<module>currency-converter-corba-launcher</module>
<module>currency-converter-rmi-launcher</module>
<module>currency-converter-ws-launcher</module>
+ <module>databinding-launcher</module>
<module>interaction-launcher</module>
<module>introducing-launcher</module>
<module>jumpstart-launcher</module>
diff --git a/sandbox/travelsample/pom.xml b/sandbox/travelsample/pom.xml
index 36ad2c607c..8c0d544b52 100644
--- a/sandbox/travelsample/pom.xml
+++ b/sandbox/travelsample/pom.xml
@@ -40,20 +40,6 @@
<module>launchers</module>
<module>services</module>
<module>clients</module>
- <!--
- <module>shared-contributions</module>
- <module>chapter-01</module>
- <module>chapter-02</module>
- <module>chapter-05</module>
- <module>chapter-06</module>
- <module>chapter-09</module>
- -->
- <!--module>chapter-03</module-->
- <!--module>chapter-04</module-->
- <!--module>chapter-07</module-->
- <!--module>chapter-08</module-->
- <!--module>chapter-10</module-->
- <!--module>chapter-11</module-->
</modules>
</profile>