13 files changed, 197 insertions, 65 deletions
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomain.java b/sandbox/travelsample/launchers/fullapp-domain/build.xml
index 9fae5de58a..9ad84ef602 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomain.java
+++ b/sandbox/travelsample/launchers/fullapp-domain/build.xml
@@ -1,37 +1,36 @@
-/*
- * 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 org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-
-public class LaunchFullAppDomain {
-    public static void main(String[] args) throws Exception {
-        LaunchFullAppDomain.launchFromFileSystemDir();
-    }
-
-    public static void launchFromFileSystemDir(){
-
-        try {
-        	DomainManagerLauncher.main(null);
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-}
+<!--
+ * 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 name="scatours-launcher-fullapp-domain" default="run">
+    <property environment="env"/> 
+
+    <target name="run">
+        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"
+              dir="target/classes" fork="true">
+            <classpath>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="clean">
+        <delete dir="./target"/>
+    </target>
+
+</project>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/pom.xml b/sandbox/travelsample/launchers/fullapp-domain/pom.xml
new file mode 100644
index 0000000000..b9c343a523
--- /dev/null
+++ b/sandbox/travelsample/launchers/fullapp-domain/pom.xml
@@ -0,0 +1,93 @@
+<?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.6-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent><version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-launcher-fullapp-domain</artifactId>
+    <name>Apache Tuscany SCA Tours Full App Domain Launcher</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-currency</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-frontend</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-payment-java</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-ui</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+    </build>
+
+</project>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/cloud.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
index a0c2ba9e75..812736e620 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/cloud.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
@@ -21,7 +21,7 @@
            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
            xmlns="http://www.osoa.org/xmlns/sca/1.0" 
            xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:ns2="http://scatours/cloud">
+           xmlns:ns2="http://tuscany.apache.org/cloud">
       
   <include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />
   <include name="ns2:frontend" uri="http://tuscany.apache.org/cloud" />
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
index c793a36126..51f48a93f1 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="bespoketrip">
 
     <component name="bespoketrip">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite
index 46e7091c8d..93e1727266 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite
@@ -19,13 +19,13 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:c="http://creditcard"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="creditcard">
 
     <component name="creditcard">
-        <t:implementation.node uri="fullapp-creditcard" composite="c:creditcard"/>
+        <t:implementation.node uri="fullapp-creditcard" composite="s:creditcard"/>
         <service name="Node">
             <binding.sca uri="http://localhost:8082"/>
             <binding.ws uri="http://localhost:8082"/>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
index e625c77cea..808d2843bd 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="currency">
 
     <component name="currency">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite
index ef71edc684..75c95daf4b 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="frontend">
 
     <component name="frontend">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
index 2ee42cfc58..a6ec78b56c 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="packagedtrip">
 
     <component name="packagedtrip">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite
index af57963673..a73d034805 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="payment">
 
     <component name="payment">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
index 8b92721c24..dce5fe829e 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="shoppingcart">
 
     <component name="shoppingcart">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
index 4841ab5246..d72432daff 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
@@ -19,8 +19,8 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:s="http://scatours"
+		targetNamespace="http://tuscany.apache.org/cloud"
+		xmlns:s="http://tuscanyscatours.com/"
 		name="ui">
 
     <component name="ui">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/domain.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
index e1ebe1f1f4..636397c705 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/domain.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
@@ -21,10 +21,9 @@
            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
            xmlns="http://www.osoa.org/xmlns/sca/1.0" 
            xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:ns2="http://scatours"
-           xmlns:ns3="http://creditcard">
+           xmlns:ns2="http://tuscanyscatours.com/">
        
-  <include name="ns3:creditcard" uri="fullapp-creditcard" />         
+  <include name="ns2:creditcard" uri="fullapp-creditcard" />         
   <include name="ns2:payment" uri="fullapp-payment" />    
   <include name="ns2:shoppingcart" uri="fullapp-shoppingcart" />
   <include name="ns2:currency" uri="fullapp-currency" />
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
new file mode 100644
index 0000000000..59fea4eec2
--- /dev/null
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
@@ -0,0 +1,41 @@
+<?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.    
+-->
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+  <contribution location="file:../../../../contributions/common/target/scatours-contribution-common.jar"  uri="common"/>
+  <contribution location="file:../../../../contributions/currency/target/scatours-contribution-currency.jar"  uri="currency"/>
+  <contribution location="file:../../../../contributions/hotel/target/scatours-contribution-hotel.jar"  uri="hotel"/>
+  <contribution location="file:../../../../contributions/flight/target/scatours-contribution-flight.jar"  uri="flight"/>
+  <contribution location="file:../../../../contributions/car/target/scatours-contribution-car.jar"  uri="car"/>
+  <contribution location="file:../../../../contributions/trip/target/scatours-contribution-trip.jar"  uri="trip"/>
+  <contribution location="file:../../../../contributions/tripbooking/target/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
+  <contribution location="file:../../../../contributions/travelcatalog/target/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
+  <contribution location="file:../../../../contributions/payment-java/target/scatours-contribution-payment-java.jar"  uri="fullapp-payment"/>
+  <contribution location="file:../../../../contributions/creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb.jar"  uri="fullapp-creditcard"/>
+  <contribution location="file:../../../../contributions/shoppingcart/target/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
+  <contribution location="file:../../../../contributions/scatours/target/scatours-contribution-scatours.jar"  uri="scatours"/>
+  <contribution location="file:../../../../contributions/fullapp-ui/target/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
+  <contribution location="file:../../../../contributions/fullapp-frontend/target/scatours-contribution-fullapp-frontend.jar"  uri="fullapp-frontend"/>
+  <contribution location="file:../../../../contributions/fullapp-currency/target/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
+  <contribution location="file:../../../../contributions/fullapp-packagedtrip/target/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
+  <contribution location="file:../../../../contributions/fullapp-bespoketrip/target/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
+  <contribution location="file:../../../../contributions/fullapp-shoppingcart/target/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
+  <contribution location="file:./cloud" uri="http://tuscany.apache.org/cloud"/>  
+</workspace>
+\ No newline at end of file