Fix up the BPEL payment component to run in the wider application and take advantage of the BPEL resolved fix in 1.x

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@746503 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 71 insertions, 5 deletions

diff --git a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchNode.java b/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
index 777963c13e..e87b0ca44e 100644
--- a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchNode.java
+++ b/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
@@ -24,11 +24,10 @@ import java.io.IOException;
 import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
 
-public class LaunchNode {
+public class LaunchBPELExampleNode {
     public static void main(String[] args) throws Exception {
-        LaunchNode.launchFromFileSystemDir();
+        LaunchBPELExampleNode.launchFromFileSystemDir();
     }
     
     // OK for development but you must launch the node from this module 
@@ -45,11 +44,12 @@ public class LaunchNode {
                                                                new SCAContribution("trip", "../../shared-contributions/trip-contribution/target/classes"),
                                                                new SCAContribution("tripbooking", "../../shared-contributions/tripbooking-contribution/target/classes"),
                                                                new SCAContribution("travelcatalog", "../../shared-contributions/travelcatalog-contribution/target/classes"),
-                                                               new SCAContribution("payment", "../../shared-contributions/payment-contribution/target/classes"),
+                                                               new SCAContribution("creditcardpayment", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/classes"),
                                                                new SCAContribution("emailgateway", "../../shared-contributions/emailgateway-contribution/target/classes"),
                                                                new SCAContribution("shoppingcart", "../../shared-contributions/shoppingcart-contribution/target/classes"),
                                                                new SCAContribution("scatours", "../../shared-contributions/scatours-contribution/target/classes"),
-                                                               new SCAContribution("ui", "../ui-contribution/target/classes"));
+                                                               new SCAContribution("payment", "../payment-bpel-contribution/target/classes"),
+                                                               new SCAContribution("ui", "../ui-bpel-contribution/target/classes"));
             node.start();
             
             System.out.println("Node started - Press enter to shutdown.");
diff --git a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java b/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
new file mode 100644
index 0000000000..45c9be4bce
--- /dev/null
+++ b/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
@@ -0,0 +1,66 @@
+/*
+ * 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;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+
+public class LaunchSpringExampleNode {
+    public static void main(String[] args) throws Exception {
+        LaunchSpringExampleNode.launchFromFileSystemDir();
+    }
+    
+    // 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", "../../shared-contributions/common-contribution/target/classes"),
+                                                               new SCAContribution("currency", "../../shared-contributions/currency-contribution/target/classes"),
+                                                               new SCAContribution("hotel", "../../shared-contributions/hotel-contribution/target/classes"),
+                                                               new SCAContribution("flight", "../../shared-contributions/flight-contribution/target/classes"),
+                                                               new SCAContribution("car", "../../shared-contributions/car-contribution/target/classes"),
+                                                               new SCAContribution("trip", "../../shared-contributions/trip-contribution/target/classes"),
+                                                               new SCAContribution("tripbooking", "../../shared-contributions/tripbooking-contribution/target/classes"),
+                                                               new SCAContribution("travelcatalog", "../../shared-contributions/travelcatalog-contribution/target/classes"),
+                                                               new SCAContribution("creditcardpayment", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/classes"),
+                                                               new SCAContribution("emailgateway", "../../shared-contributions/emailgateway-contribution/target/classes"),
+                                                               new SCAContribution("shoppingcart", "../../shared-contributions/shoppingcart-contribution/target/classes"),
+                                                               new SCAContribution("scatours", "../../shared-contributions/scatours-contribution/target/classes"),
+                                                               new SCAContribution("payment", "../payment-spring-annotation-contribution/target/classes"),
+                                                               new SCAContribution("ui", "../ui-spring-contribution/target/classes"));
+            node.start();
+            
+            System.out.println("Node started - Press enter to shutdown.");
+            try {
+                System.in.read();
+            } catch (IOException e) {}
+            
+            node.stop();
+            
+        } catch (Exception ex) {
+            System.out.println(ex.toString());
+        }
+    }     
+}