re-org the modules

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

95 files changed, 202 insertions, 160 deletions

diff --git a/sandbox/travelsample/chapter-01/pom.xml b/sandbox/travelsample/chapter-01/pom.xml
index 64308ea187..0bd7127f06 100644
--- a/sandbox/travelsample/chapter-01/pom.xml
+++ b/sandbox/travelsample/chapter-01/pom.xml
@@ -26,7 +26,7 @@
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-01</artifactId>
-    <name>Apache Tuscany SCA Tours Chapter 01</name>
+    <name>Apache Tuscany SCA Tours Chapter 01 Examples</name>
 
     <dependencies>
         <dependency>
diff --git a/sandbox/travelsample/node/build.xml b/sandbox/travelsample/chapter-05/node/build.xml
index ff93d7a224..a70be4e664 100644
--- a/sandbox/travelsample/node/build.xml
+++ b/sandbox/travelsample/chapter-05/node/build.xml
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-node" default="compile">
+<project name="scatours-chapter-05-node" default="compile">
 
     <target name="compile">
         <mkdir dir="target/classes"/>
@@ -31,7 +31,7 @@
         <copy todir="target/classes">
             <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
         </copy>
-        <jar destfile="target/scatours-node.jar" basedir="target/classes">
+        <jar destfile="target/scatours-chapter-05-node.jar" basedir="target/classes">
             <manifest>
                 <attribute name="Main-Class" value="launch.LaunchTutorialAdmin"/>
             </manifest>
@@ -43,7 +43,7 @@
     <target name="run">
         <java classname="launch.LaunchTutorialAdmin" fork="true">
             <classpath>
-                <pathelement location="target/scatours-node.jar"/>
+                <pathelement location="target/scatours-chapter-05-node.jar"/>
                 <fileset refid="tuscany.jars"/>
                 <fileset refid="3rdparty.jars"/>
             </classpath>
diff --git a/sandbox/travelsample/node/pom.xml b/sandbox/travelsample/chapter-05/node/pom.xml
index 77f8073b0b..d42e8b2fa6 100644
--- a/sandbox/travelsample/node/pom.xml
+++ b/sandbox/travelsample/chapter-05/node/pom.xml
@@ -25,8 +25,8 @@
         <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
-    <artifactId>scatours-node</artifactId>
-    <name>Apache Tuscany SCA Tours Node</name>
+    <artifactId>scatours-chapter-05-node</artifactId>
+    <name>Apache Tuscany SCA Tours Chapter 05 Node</name>
 
     <dependencies>
             <dependency>
diff --git a/sandbox/travelsample/chapter-05/node/src/scatours/LaunchNode.java b/sandbox/travelsample/chapter-05/node/src/scatours/LaunchNode.java
new file mode 100644
index 0000000000..777963c13e
--- /dev/null
+++ b/sandbox/travelsample/chapter-05/node/src/scatours/LaunchNode.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;
+import org.apache.tuscany.sca.node.launcher.NodeLauncher;
+
+public class LaunchNode {
+    public static void main(String[] args) throws Exception {
+        LaunchNode.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("payment", "../../shared-contributions/payment-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"));
+            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());
+        }
+    }    
+}
diff --git a/sandbox/travelsample/chapter-05/pom.xml b/sandbox/travelsample/chapter-05/pom.xml
new file mode 100644
index 0000000000..8ea9d0f8cf
--- /dev/null
+++ b/sandbox/travelsample/chapter-05/pom.xml
@@ -0,0 +1,46 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <!--relativePath>../pom.xml</relativePath-->
+    </parent>
+    <artifactId>tuscany-scatours-chapter-05</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Tours Chapter 05 Examples</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>node</module>
+                <module>ui-contribution</module>
+            </modules>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/sandbox/travelsample/ui-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-05/ui-contribution/META-INF/sca-contribution.xml
index 764030c28e..764030c28e 100644
--- a/sandbox/travelsample/ui-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/chapter-05/ui-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/ui-contribution/build.xml b/sandbox/travelsample/chapter-05/ui-contribution/build.xml
index 981e37ca97..0aa96f56de 100644
--- a/sandbox/travelsample/ui-contribution/build.xml
+++ b/sandbox/travelsample/chapter-05/ui-contribution/build.xml
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-ui-contribution" default="compile">
+<project name="scatours-chapter-05-ui-contribution" default="compile">
 
     <target name="compile">
         <mkdir dir="target/classes"/>
@@ -31,7 +31,7 @@
         <copy todir="target/classes">
             <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
         </copy>
-        <jar destfile="target/scatours-ui-contribution.jar" basedir="target/classes">
+        <jar destfile="target/scatours-chapter-05-ui-contribution.jar" basedir="target/classes">
             <manifest>
                 <attribute name="Main-Class" value="launch.LaunchTutorialAdmin"/>
             </manifest>
@@ -43,7 +43,7 @@
     <target name="run">
         <java classname="launch.LaunchTutorialAdmin" fork="true">
             <classpath>
-                <pathelement location="target/scatours-ui-contribution.jar"/>
+                <pathelement location="target/scatours-chapter-05-ui-contribution.jar"/>
                 <fileset refid="tuscany.jars"/>
                 <fileset refid="3rdparty.jars"/>
             </classpath>
diff --git a/sandbox/travelsample/ui-contribution/pom.xml b/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
index 9c4a00a6f3..e840ef994c 100644
--- a/sandbox/travelsample/ui-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
-    <artifactId>scatours-ui-contribution</artifactId>
-    <name>Apache Tuscany SCA Tours User Interface Contribution</name>
+    <artifactId>scatours-chapter-05-ui-contribution</artifactId>
+    <name>Apache Tuscany SCA Tours Chapter 05 User Interface Contribution</name>
 
     <dependencies>
         <dependency>
diff --git a/sandbox/travelsample/ui-contribution/scatours.composite b/sandbox/travelsample/chapter-05/ui-contribution/scatours.composite
index 1bd437a92e..53fac26d3e 100644
--- a/sandbox/travelsample/ui-contribution/scatours.composite
+++ b/sandbox/travelsample/chapter-05/ui-contribution/scatours.composite
@@ -142,9 +142,9 @@
         <implementation.java class="scatours.shoppingcart.ShoppingCartImpl"/>
         <service name="ShoppingCart">
         </service>
-        <reference name="paymentProcess">
+        <!--reference name="paymentProcess">
             <binding.ws uri="http://localhost:8083/PaymentProcess" />
-        </reference> 
+        </reference--> 
     </component>   
     
     <!--component name="PaymentProcessComponent">
diff --git a/sandbox/travelsample/ui-contribution/scatours.html b/sandbox/travelsample/chapter-05/ui-contribution/scatours.html
index f4206548c0..f4206548c0 100644
--- a/sandbox/travelsample/ui-contribution/scatours.html
+++ b/sandbox/travelsample/chapter-05/ui-contribution/scatours.html
diff --git a/sandbox/travelsample/ui-contribution/scatours.odg b/sandbox/travelsample/chapter-05/ui-contribution/scatours.odg
index 8ca8fbf133..8ca8fbf133 100644
--- a/sandbox/travelsample/ui-contribution/scatours.odg
+++ b/sandbox/travelsample/chapter-05/ui-contribution/scatours.odg
diff --git a/sandbox/travelsample/ui-contribution/scatours.png b/sandbox/travelsample/chapter-05/ui-contribution/scatours.png
index f68cd84704..f68cd84704 100644
--- a/sandbox/travelsample/ui-contribution/scatours.png
+++ b/sandbox/travelsample/chapter-05/ui-contribution/scatours.png
diff --git a/sandbox/travelsample/ui-contribution/style.css b/sandbox/travelsample/chapter-05/ui-contribution/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/ui-contribution/style.css
+++ b/sandbox/travelsample/chapter-05/ui-contribution/style.css
diff --git a/sandbox/travelsample/paymentprocess-contribution/log4j.properties b/sandbox/travelsample/chapter-06/paymentprocess-contribution/log4j.properties
index 7ed0bcaf77..7ed0bcaf77 100644
--- a/sandbox/travelsample/paymentprocess-contribution/log4j.properties
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/log4j.properties
diff --git a/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite b/sandbox/travelsample/chapter-06/paymentprocess-contribution/paymentprocesstest.composite
index f45dc01a57..f45dc01a57 100644
--- a/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/paymentprocesstest.composite
diff --git a/sandbox/travelsample/paymentprocess-contribution/pom.xml b/sandbox/travelsample/chapter-06/paymentprocess-contribution/pom.xml
index c1a9712a66..c1a9712a66 100644
--- a/sandbox/travelsample/paymentprocess-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/pom.xml
diff --git a/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/CreditCardPayment.wsdl
index a90c73cdfb..a90c73cdfb 100644
--- a/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/EmailGateway.wsdl
index d9a5e36bc0..d9a5e36bc0 100644
--- a/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/EmailGateway.wsdl
diff --git a/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
index 8146abbceb..8146abbceb 100644
--- a/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/PaymentProcess.wsdl
index c4157cf475..c4157cf475 100644
--- a/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/PaymentProcess.wsdl
diff --git a/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/paymentprocess.bpel
index 08c6b8f636..08c6b8f636 100644
--- a/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/paymentprocess.bpel
diff --git a/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/paymentprocess.componentType
index ecc2f55a47..ecc2f55a47 100644
--- a/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/resources/paymentprocess.componentType
diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessClientImpl.java b/sandbox/travelsample/chapter-06/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessClientImpl.java
index 8d9c2f918c..8d9c2f918c 100644
--- a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessClientImpl.java
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessClientImpl.java
diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessTestCase.java b/sandbox/travelsample/chapter-06/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessTestCase.java
index f1b4bc6aba..f1b4bc6aba 100644
--- a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessTestCase.java
+++ b/sandbox/travelsample/chapter-06/paymentprocess-contribution/test/scatours/paymentprocess/PaymentProcessTestCase.java
diff --git a/sandbox/travelsample/node/src/scatours/LaunchNode.java b/sandbox/travelsample/node/src/scatours/LaunchNode.java
deleted file mode 100644
index 007406061e..0000000000
--- a/sandbox/travelsample/node/src/scatours/LaunchNode.java
+++ /dev/null
@@ -1,122 +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;
-
-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 static void main(String[] args) throws Exception {
-        LaunchNode.launchFromFileSystemDir();
-    }
-
-    // OK for development but you must launch the node from this module 
-    public static void launchFromFileSystemJar(){
-        SCANode node = null; 
-        
-        try {
-            node = SCANodeFactory.newInstance().createSCANode("scatours.composite", 
-                                                               new SCAContribution("common", "../common-contribution/target/scatours-common-contribution.jar"),
-                                                               new SCAContribution("currency", "../currency-contribution/target/scatours-currency-contribution.jar"),
-                                                               new SCAContribution("hotel", "../hotel-contribution/target/scatours-hotel-contribution.jar"),
-                                                               new SCAContribution("flight", "../flight-contribution/target/scatours-flight-contribution.jar"),
-                                                               new SCAContribution("car", "../car-contribution/target/scatours-car-contribution.jar"),
-                                                               new SCAContribution("tripbooking", "../tripbooking-contribution/target/scatours-tripbooking-contribution.jar"),
-                                                               new SCAContribution("travelcatalog", "../travelcatalog-contribution/target/scatours-travelcatalog-contribution.jar"),
-                                                               new SCAContribution("scatours", "../scatours-contribution/target/scatours-scatours-contribution.jar"),
-                                                               new SCAContribution("ui", "../ui-contribution/target/scatours-ui-contribution.jar"));
-
-            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());
-        }
-    }
-    
-    // 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", "../common-contribution/target/classes"),
-                                                               new SCAContribution("currency", "../currency-contribution/target/classes"),
-                                                               new SCAContribution("hotel", "../hotel-contribution/target/classes"),
-                                                               new SCAContribution("flight", "../flight-contribution/target/classes"),
-                                                               new SCAContribution("car", "../car-contribution/target/classes"),
-                                                               new SCAContribution("trip", "../trip-contribution/target/classes"),
-                                                               new SCAContribution("tripbooking", "../tripbooking-contribution/target/classes"),
-                                                               new SCAContribution("travelcatalog", "../travelcatalog-contribution/target/classes"),
-                                                               new SCAContribution("payment", "../payment-contribution/target/classes"),
-                                                               new SCAContribution("emailgateway", "../emailgateway-contribution/target/classes"),
-                                                               new SCAContribution("paymentprocess", "../paymentprocess-contribution/target/classes"),
-                                                               new SCAContribution("shoppingcart", "../shoppingcart-contribution/target/classes"),
-                                                               new SCAContribution("scatours", "../scatours-contribution/target/classes"),
-                                                               new SCAContribution("ui", "../ui-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());
-        }
-    }    
-    
-    // OK for samples but you can only load one contribution 
-    public static void launchFromClasspath(){
-        SCANode node = null; 
-        
-        try {
-            node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("scatours.composite", null);
-            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());
-        }
-    }    
-    
-    // have to be running the domain in this case
-    public static void launchFromDomain()throws Exception {  
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/SCAToursNode"});
-    }
-}
diff --git a/sandbox/travelsample/pom.xml b/sandbox/travelsample/pom.xml
index 29576a5214..54ef35775a 100644
--- a/sandbox/travelsample/pom.xml
+++ b/sandbox/travelsample/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <artifactId>tuscany-scatours</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Tours Sample</name>
+    <name>Apache Tuscany SCA Tours Assembly Examples</name>
 
     <profiles>
         <profile>
@@ -36,26 +36,18 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>calendar-contribution</module>
-                <module>common-contribution</module>
-                <module>currency-contribution</module>
-                <module>hotel-contribution</module>
-                <module>flight-contribution</module>
-                <module>car-contribution</module>
-                <module>trip-contribution</module>
-                <module>payment-contribution</module>
-                <module>paymentprocess-contribution</module>
-                <module>emailgateway-contribution</module>
-                <module>travelcatalog-contribution</module>
-                <module>tripbooking-contribution</module>
-                <module>shoppingcart-contribution</module>
-                <module>scatours-contribution</module>
-                <module>ui-contribution</module>
-
-                <module>domain</module>
-                <module>node</module>
-
-                <module>gettingstarted</module>
+                <module>shared-contributions</module>
+                <module>chapter-01</module>
+                <!--module>chapter-02</module-->
+                <!--module>chapter-03</module-->
+                <!--module>chapter-04</module-->
+                <module>chapter-05</module>
+                <!--module>chapter-06</module-->
+                <!--module>chapter-07</module-->
+                <!--module>chapter-08</module-->
+                <!--module>chapter-09</module-->
+                <!--module>chapter-10</module-->
+                <!--module>chapter-11</module-->
             </modules>
         </profile>
 
diff --git a/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/calendar-contribution/META-INF/sca-contribution.xml
index 327ce07643..327ce07643 100644
--- a/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/calendar-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/calendar-contribution/pom.xml b/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml
index ac4004355c..ac4004355c 100644
--- a/sandbox/travelsample/calendar-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml
diff --git a/sandbox/travelsample/calendar-contribution/src/main/java/calendar/Calendar.java b/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/Calendar.java
index 90736b92b4..90736b92b4 100644
--- a/sandbox/travelsample/calendar-contribution/src/main/java/calendar/Calendar.java
+++ b/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/Calendar.java
diff --git a/sandbox/travelsample/calendar-contribution/src/main/java/calendar/CalendarImpl.java b/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
index 343926da65..343926da65 100644
--- a/sandbox/travelsample/calendar-contribution/src/main/java/calendar/CalendarImpl.java
+++ b/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
diff --git a/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite b/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/resources/calendar.composite
index b72c450446..b72c450446 100644
--- a/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite
+++ b/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/resources/calendar.composite
diff --git a/sandbox/travelsample/calendar-contribution/src/test/java/calendar/CalendarTestCase.java b/sandbox/travelsample/shared-contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
index fee00fbb0a..fee00fbb0a 100644
--- a/sandbox/travelsample/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
+++ b/sandbox/travelsample/shared-contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
diff --git a/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite b/sandbox/travelsample/shared-contributions/calendar-contribution/src/test/resources/calendar.composite
index b72c450446..b72c450446 100644
--- a/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite
+++ b/sandbox/travelsample/shared-contributions/calendar-contribution/src/test/resources/calendar.composite
diff --git a/sandbox/travelsample/car-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/car-contribution/META-INF/sca-contribution.xml
index f9c448e8ee..f9c448e8ee 100644
--- a/sandbox/travelsample/car-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/car-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/car-contribution/pom.xml b/sandbox/travelsample/shared-contributions/car-contribution/pom.xml
index 06c29b25db..06c29b25db 100644
--- a/sandbox/travelsample/car-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/car-contribution/pom.xml
diff --git a/sandbox/travelsample/car-contribution/src/scatours/car/CarImpl.java b/sandbox/travelsample/shared-contributions/car-contribution/src/scatours/car/CarImpl.java
index 059365a9ab..059365a9ab 100644
--- a/sandbox/travelsample/car-contribution/src/scatours/car/CarImpl.java
+++ b/sandbox/travelsample/shared-contributions/car-contribution/src/scatours/car/CarImpl.java
diff --git a/sandbox/travelsample/car-contribution/src/scatours/car/CarInfo.java b/sandbox/travelsample/shared-contributions/car-contribution/src/scatours/car/CarInfo.java
index 2538c51e09..2538c51e09 100644
--- a/sandbox/travelsample/car-contribution/src/scatours/car/CarInfo.java
+++ b/sandbox/travelsample/shared-contributions/car-contribution/src/scatours/car/CarInfo.java
diff --git a/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/common-contribution/META-INF/sca-contribution.xml
index c2b9fd12c7..c2b9fd12c7 100644
--- a/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/common-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/common-contribution/build.xml b/sandbox/travelsample/shared-contributions/common-contribution/build.xml
index b4fbc726cf..b4fbc726cf 100644
--- a/sandbox/travelsample/common-contribution/build.xml
+++ b/sandbox/travelsample/shared-contributions/common-contribution/build.xml
diff --git a/sandbox/travelsample/common-contribution/pom.xml b/sandbox/travelsample/shared-contributions/common-contribution/pom.xml
index e0b024b666..e0b024b666 100644
--- a/sandbox/travelsample/common-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/common-contribution/pom.xml
diff --git a/sandbox/travelsample/common-contribution/src/scatours/common/Book.java b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/Book.java
index f42db4341b..f42db4341b 100644
--- a/sandbox/travelsample/common-contribution/src/scatours/common/Book.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/Book.java
diff --git a/sandbox/travelsample/common-contribution/src/scatours/common/Search.java b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/Search.java
index 705753972e..705753972e 100644
--- a/sandbox/travelsample/common-contribution/src/scatours/common/Search.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/Search.java
diff --git a/sandbox/travelsample/common-contribution/src/scatours/common/SearchCallback.java b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/SearchCallback.java
index 4bc88fd623..4bc88fd623 100644
--- a/sandbox/travelsample/common-contribution/src/scatours/common/SearchCallback.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/SearchCallback.java
diff --git a/sandbox/travelsample/common-contribution/src/scatours/common/TripItem.java b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/TripItem.java
index e991668cbc..e991668cbc 100644
--- a/sandbox/travelsample/common-contribution/src/scatours/common/TripItem.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/TripItem.java
diff --git a/sandbox/travelsample/common-contribution/src/scatours/common/TripLeg.java b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/TripLeg.java
index 1af33aa6f9..1af33aa6f9 100644
--- a/sandbox/travelsample/common-contribution/src/scatours/common/TripLeg.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/TripLeg.java
diff --git a/sandbox/travelsample/currency-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/currency-contribution/META-INF/sca-contribution.xml
index 549a3bc7a3..549a3bc7a3 100644
--- a/sandbox/travelsample/currency-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/currency-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/currency-contribution/pom.xml b/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml
index 738c3d7f61..738c3d7f61 100644
--- a/sandbox/travelsample/currency-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml
diff --git a/sandbox/travelsample/currency-contribution/src/scatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/shared-contributions/currency-contribution/src/scatours/currencyconverter/CurrencyConverter.java
index 9b3851721f..9b3851721f 100644
--- a/sandbox/travelsample/currency-contribution/src/scatours/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/shared-contributions/currency-contribution/src/scatours/currencyconverter/CurrencyConverter.java
diff --git a/sandbox/travelsample/currency-contribution/src/scatours/currencyconverter/CurrencyConverterImpl.java b/sandbox/travelsample/shared-contributions/currency-contribution/src/scatours/currencyconverter/CurrencyConverterImpl.java
index eddc59f555..eddc59f555 100644
--- a/sandbox/travelsample/currency-contribution/src/scatours/currencyconverter/CurrencyConverterImpl.java
+++ b/sandbox/travelsample/shared-contributions/currency-contribution/src/scatours/currencyconverter/CurrencyConverterImpl.java
diff --git a/sandbox/travelsample/emailgateway-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/emailgateway-contribution/META-INF/sca-contribution.xml
index d77df2fd7e..d77df2fd7e 100644
--- a/sandbox/travelsample/emailgateway-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/emailgateway-contribution/emailgatewaytest.composite b/sandbox/travelsample/shared-contributions/emailgateway-contribution/emailgatewaytest.composite
index 5be71b4d66..5be71b4d66 100644
--- a/sandbox/travelsample/emailgateway-contribution/emailgatewaytest.composite
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/emailgatewaytest.composite
diff --git a/sandbox/travelsample/emailgateway-contribution/pom.xml b/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml
index 118a06d942..118a06d942 100644
--- a/sandbox/travelsample/emailgateway-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml
diff --git a/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java
index 6e971c3267..6e971c3267 100644
--- a/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java
diff --git a/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayClientImpl.java b/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayClientImpl.java
index a6b76c525f..a6b76c525f 100644
--- a/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayClientImpl.java
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayClientImpl.java
diff --git a/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java b/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java
index 00cca75f0e..c471e024e3 100644
--- a/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java
@@ -59,11 +59,12 @@ public class EmailGatewayTestCase {
     //@Ignore
     public void testWaitForInput() {
         System.out.println("Press a key to end");
-        try {
+ /*       try {
             System.in.read();
         } catch (Exception ex) {
         }
         System.out.println("Shutting down");
+*/
     }
 
     /**
diff --git a/sandbox/travelsample/emailgateway-contribution/wsdl/EmailGateway.wsdl b/sandbox/travelsample/shared-contributions/emailgateway-contribution/wsdl/EmailGateway.wsdl
index c103ad947d..c103ad947d 100644
--- a/sandbox/travelsample/emailgateway-contribution/wsdl/EmailGateway.wsdl
+++ b/sandbox/travelsample/shared-contributions/emailgateway-contribution/wsdl/EmailGateway.wsdl
diff --git a/sandbox/travelsample/flight-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/flight-contribution/META-INF/sca-contribution.xml
index 394be817a9..394be817a9 100644
--- a/sandbox/travelsample/flight-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/flight-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/flight-contribution/pom.xml b/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml
index 8782ab83d3..8782ab83d3 100644
--- a/sandbox/travelsample/flight-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml
diff --git a/sandbox/travelsample/flight-contribution/src/scatours/flight/FlightImpl.java b/sandbox/travelsample/shared-contributions/flight-contribution/src/scatours/flight/FlightImpl.java
index 72c1c7201c..72c1c7201c 100644
--- a/sandbox/travelsample/flight-contribution/src/scatours/flight/FlightImpl.java
+++ b/sandbox/travelsample/shared-contributions/flight-contribution/src/scatours/flight/FlightImpl.java
diff --git a/sandbox/travelsample/flight-contribution/src/scatours/flight/FlightInfo.java b/sandbox/travelsample/shared-contributions/flight-contribution/src/scatours/flight/FlightInfo.java
index fb5fb9fef5..fb5fb9fef5 100644
--- a/sandbox/travelsample/flight-contribution/src/scatours/flight/FlightInfo.java
+++ b/sandbox/travelsample/shared-contributions/flight-contribution/src/scatours/flight/FlightInfo.java
diff --git a/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/hotel-contribution/META-INF/sca-contribution.xml
index 765c8d1cc3..765c8d1cc3 100644
--- a/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/hotel-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/hotel-contribution/pom.xml b/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml
index 4b49632937..4b49632937 100644
--- a/sandbox/travelsample/hotel-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml
diff --git a/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelImpl.java b/sandbox/travelsample/shared-contributions/hotel-contribution/src/scatours/hotel/HotelImpl.java
index a9a6d1bbde..a9a6d1bbde 100644
--- a/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelImpl.java
+++ b/sandbox/travelsample/shared-contributions/hotel-contribution/src/scatours/hotel/HotelImpl.java
diff --git a/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelInfo.java b/sandbox/travelsample/shared-contributions/hotel-contribution/src/scatours/hotel/HotelInfo.java
index 3b0d11d16e..3b0d11d16e 100644
--- a/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelInfo.java
+++ b/sandbox/travelsample/shared-contributions/hotel-contribution/src/scatours/hotel/HotelInfo.java
diff --git a/sandbox/travelsample/payment-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/payment-contribution/META-INF/sca-contribution.xml
index d22f4816ab..d22f4816ab 100644
--- a/sandbox/travelsample/payment-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/payment-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/payment-contribution/creditcard.composite b/sandbox/travelsample/shared-contributions/payment-contribution/creditcard.composite
index 184304e829..184304e829 100644
--- a/sandbox/travelsample/payment-contribution/creditcard.composite
+++ b/sandbox/travelsample/shared-contributions/payment-contribution/creditcard.composite
diff --git a/sandbox/travelsample/payment-contribution/pom.xml b/sandbox/travelsample/shared-contributions/payment-contribution/pom.xml
index 98a1166a66..98a1166a66 100644
--- a/sandbox/travelsample/payment-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/payment-contribution/pom.xml
diff --git a/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java b/sandbox/travelsample/shared-contributions/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java
index 2a9c537775..2a9c537775 100644
--- a/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/shared-contributions/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java b/sandbox/travelsample/shared-contributions/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java
index f0c61cd14d..f0c61cd14d 100644
--- a/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java
+++ b/sandbox/travelsample/shared-contributions/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java
diff --git a/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/shared-contributions/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
index 48378e6cd0..656197dcb9 100644
--- a/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/shared-contributions/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
@@ -61,12 +61,14 @@ public class CreditCardPaymentTestCase {
     @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");
+*/
     }    
 
     /**
diff --git a/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl b/sandbox/travelsample/shared-contributions/payment-contribution/wsdl/CreditCardPayment.wsdl
index b40c341389..b40c341389 100644
--- a/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/shared-contributions/payment-contribution/wsdl/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/shared-contributions/pom.xml b/sandbox/travelsample/shared-contributions/pom.xml
new file mode 100644
index 0000000000..39dde3875f
--- /dev/null
+++ b/sandbox/travelsample/shared-contributions/pom.xml
@@ -0,0 +1,57 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <!--relativePath>../pom.xml</relativePath-->
+    </parent>
+    <artifactId>tuscany-scatours-common-contributions</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Tours Common Contributions</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>calendar-contribution</module>
+                <module>car-contribution</module>
+                <module>common-contribution</module>
+                <module>currency-contribution</module>
+                <module>emailgateway-contribution</module>
+                <module>flight-contribution</module>
+                <module>hotel-contribution</module>
+                <module>payment-contribution</module>   
+                <module>shoppingcart-contribution</module>   
+                <module>travelcatalog-contribution</module>         
+                <module>tripbooking-contribution</module>
+                <module>trip-contribution</module>
+                <module>scatours-contribution</module>
+            </modules>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/sandbox/travelsample/scatours-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/scatours-contribution/META-INF/sca-contribution.xml
index 368e95ebd0..368e95ebd0 100644
--- a/sandbox/travelsample/scatours-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/scatours-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/scatours-contribution/pom.xml b/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml
index 500d23f4b8..500d23f4b8 100644
--- a/sandbox/travelsample/scatours-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml
diff --git a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursBooking.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursBooking.java
index ac39443e9c..ac39443e9c 100644
--- a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursBooking.java
+++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursBooking.java
diff --git a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursCart.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursCart.java
index 61e32ec4a2..61e32ec4a2 100644
--- a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursCart.java
+++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursCart.java
diff --git a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java
index c0f7bec6ea..c0f7bec6ea 100644
--- a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java
+++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java
diff --git a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursSearch.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursSearch.java
index f0f435fc06..f0f435fc06 100644
--- a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursSearch.java
+++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursSearch.java
diff --git a/sandbox/travelsample/shoppingcart-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/META-INF/sca-contribution.xml
index f4010d04b1..f4010d04b1 100644
--- a/sandbox/travelsample/shoppingcart-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shoppingcart-contribution/pom.xml b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml
index 79621c1370..79621c1370 100644
--- a/sandbox/travelsample/shoppingcart-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml
diff --git a/sandbox/travelsample/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCart.java b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCart.java
index f7595c71fe..f7595c71fe 100644
--- a/sandbox/travelsample/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCart.java
+++ b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCart.java
diff --git a/sandbox/travelsample/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCartImpl.java b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCartImpl.java
index 4fc9306785..5b6bc4007c 100644
--- a/sandbox/travelsample/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCartImpl.java
+++ b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCartImpl.java
@@ -43,8 +43,8 @@ import scatours.paymentprocess.PaymentProcess;
 @Service(interfaces={ShoppingCart.class})
 public class ShoppingCartImpl implements ShoppingCart{
     
-    @Reference
-    protected PaymentProcess paymentProcess;   
+ //   @Reference
+ //   protected PaymentProcess paymentProcess;   
 
     @ConversationID
     protected String cartId;
@@ -83,7 +83,7 @@ public class ShoppingCartImpl implements ShoppingCart{
         // get the total for all the trips
         float amount = (float)0.0;
         
-        paymentProcess.makePayment(customerId, amount);
+        //paymentProcess.makePayment(customerId, amount);
     }  
     
 }
diff --git a/sandbox/travelsample/travelcatalog-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/META-INF/sca-contribution.xml
index 286b9c2a05..286b9c2a05 100644
--- a/sandbox/travelsample/travelcatalog-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/travelcatalog-contribution/pom.xml b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml
index c82a50c012..c82a50c012 100644
--- a/sandbox/travelsample/travelcatalog-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml
diff --git a/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java
index 2369baaff1..2369baaff1 100644
--- a/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java
+++ b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java
diff --git a/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogSearch.java b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogSearch.java
index df22724de2..df22724de2 100644
--- a/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogSearch.java
+++ b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogSearch.java
diff --git a/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/trip-contribution/META-INF/sca-contribution.xml
index 8a4f6abf02..8a4f6abf02 100644
--- a/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/trip-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/trip-contribution/pom.xml b/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml
index e858b5cf1e..e858b5cf1e 100644
--- a/sandbox/travelsample/trip-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml
diff --git a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java b/sandbox/travelsample/shared-contributions/trip-contribution/src/scatours/trip/TripImpl.java
index 9d51c8078b..9d51c8078b 100644
--- a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java
+++ b/sandbox/travelsample/shared-contributions/trip-contribution/src/scatours/trip/TripImpl.java
diff --git a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripInfo.java b/sandbox/travelsample/shared-contributions/trip-contribution/src/scatours/trip/TripInfo.java
index 343a3d2cef..343a3d2cef 100644
--- a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripInfo.java
+++ b/sandbox/travelsample/shared-contributions/trip-contribution/src/scatours/trip/TripInfo.java
diff --git a/sandbox/travelsample/tripbooking-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/tripbooking-contribution/META-INF/sca-contribution.xml
index 2accecffaa..2accecffaa 100644
--- a/sandbox/travelsample/tripbooking-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/tripbooking-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/tripbooking-contribution/build.xml b/sandbox/travelsample/shared-contributions/tripbooking-contribution/build.xml
index b4fbc726cf..b4fbc726cf 100644
--- a/sandbox/travelsample/tripbooking-contribution/build.xml
+++ b/sandbox/travelsample/shared-contributions/tripbooking-contribution/build.xml
diff --git a/sandbox/travelsample/tripbooking-contribution/pom.xml b/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml
index b0e7b2fef7..b0e7b2fef7 100644
--- a/sandbox/travelsample/tripbooking-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml
diff --git a/sandbox/travelsample/tripbooking-contribution/src/scatours/tripbooking/TripBooking.java b/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/scatours/tripbooking/TripBooking.java
index 2255b29d35..2255b29d35 100644
--- a/sandbox/travelsample/tripbooking-contribution/src/scatours/tripbooking/TripBooking.java
+++ b/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/scatours/tripbooking/TripBooking.java
diff --git a/sandbox/travelsample/tripbooking-contribution/src/scatours/tripbooking/TripBookingImpl.java b/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/scatours/tripbooking/TripBookingImpl.java
index fd199fd19f..fd199fd19f 100644
--- a/sandbox/travelsample/tripbooking-contribution/src/scatours/tripbooking/TripBookingImpl.java
+++ b/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/scatours/tripbooking/TripBookingImpl.java