From cede3c5b59b2c7b9a220d9135646861f0524008b Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 18:20:12 +0000
Subject: Reverse the commit for revision r946311

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946324 13f79535-47bb-0310-9956-ffa450edef68
---
 .../domainconfig/fullapp/pom.xml                   |  4 +--
 .../fullapp/src/main/resources/cloud.composite     | 35 ++++++++++++++++++
 .../resources/cloud/fullapp-bespoketrip.composite  | 36 +++++++++++++++++++
 .../resources/cloud/fullapp-coordination.composite | 36 +++++++++++++++++++
 .../resources/cloud/fullapp-creditcard.composite   | 36 +++++++++++++++++++
 .../resources/cloud/fullapp-currency.composite     | 36 +++++++++++++++++++
 .../resources/cloud/fullapp-packagedtrip.composite | 35 ++++++++++++++++++
 .../main/resources/cloud/fullapp-payment.composite | 36 +++++++++++++++++++
 .../resources/cloud/fullapp-shoppingcart.composite | 36 +++++++++++++++++++
 .../src/main/resources/cloud/fullapp-ui.composite  | 33 +++++++++++++++++
 .../fullapp/src/main/resources/domain.composite    | 37 +++++++++++++++++++
 .../src/main/resources/fullapp/cloud.composite     | 35 ------------------
 .../fullapp/cloud/fullapp-bespoketrip.composite    | 36 -------------------
 .../fullapp/cloud/fullapp-coordination.composite   | 36 -------------------
 .../fullapp/cloud/fullapp-creditcard.composite     | 36 -------------------
 .../fullapp/cloud/fullapp-currency.composite       | 36 -------------------
 .../fullapp/cloud/fullapp-packagedtrip.composite   | 35 ------------------
 .../fullapp/cloud/fullapp-payment.composite        | 36 -------------------
 .../fullapp/cloud/fullapp-shoppingcart.composite   | 36 -------------------
 .../resources/fullapp/cloud/fullapp-ui.composite   | 33 -----------------
 .../src/main/resources/fullapp/domain.composite    | 37 -------------------
 .../resources/fullapp/workspace-distribution.xml   | 42 ----------------------
 .../src/main/resources/fullapp/workspace.xml       | 42 ----------------------
 .../src/main/resources/workspace-distribution.xml  | 42 ++++++++++++++++++++++
 .../fullapp/src/main/resources/workspace.xml       | 42 ++++++++++++++++++++++
 .../domainconfig/introducing/pom.xml               |  4 +--
 .../introducing/src/main/resources/cloud.composite | 26 ++++++++++++++
 .../src/main/resources/cloud/ClientNode.composite  | 32 +++++++++++++++++
 .../src/main/resources/cloud/ToursNode.composite   | 32 +++++++++++++++++
 .../src/main/resources/cloud/TripsNode.composite   | 32 +++++++++++++++++
 .../src/main/resources/domain.composite            | 26 ++++++++++++++
 .../src/main/resources/introducing/cloud.composite | 26 --------------
 .../introducing/cloud/ClientNode.composite         | 32 -----------------
 .../introducing/cloud/ToursNode.composite          | 32 -----------------
 .../introducing/cloud/TripsNode.composite          | 32 -----------------
 .../main/resources/introducing/domain.composite    | 26 --------------
 .../introducing/workspace-distribution.xml         | 30 ----------------
 .../src/main/resources/introducing/workspace.xml   | 30 ----------------
 .../src/main/resources/workspace-distribution.xml  | 30 ++++++++++++++++
 .../introducing/src/main/resources/workspace.xml   | 30 ++++++++++++++++
 .../launchers/fullapp-domain/build.xml             |  2 +-
 .../launchers/introducing-domain/build.xml         |  2 +-
 42 files changed, 654 insertions(+), 654 deletions(-)
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-bespoketrip.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-coordination.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-creditcard.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-currency.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-packagedtrip.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-payment.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-shoppingcart.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-ui.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/domain.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace-distribution.xml
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace.xml
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace.xml
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/domain.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ClientNode.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ToursNode.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/TripsNode.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/domain.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace-distribution.xml
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace.xml
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-distribution.xml
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace.xml

(limited to 'sca-java-1.x/branches')

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
index 2cbf5348b1..8ac5c0a7fc 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
@@ -48,12 +48,12 @@
                             <tasks>
                                 <mkdir dir="target/jar-classes/fullapp"/>
                                 <copy todir="target/jar-classes/fullapp">
-                                    <fileset dir="src/main/resources/fullapp">
+                                    <fileset dir="src/main/resources">
                                         <exclude name="workspace*.xml"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="target/jar-classes/fullapp">
-                                    <fileset dir="src/main/resources/fullapp">
+                                    <fileset dir="src/main/resources">
                                         <include name="workspace-distribution.xml"/>
                                     </fileset>
                                     <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud.composite
new file mode 100644
index 0000000000..284376538a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud.composite
@@ -0,0 +1,35 @@
+<?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 name="cloud.composite"
+           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://tuscany.apache.org/cloud">
+      
+  <include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:coordination" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:packagedtrip" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:bespoketrip" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:currency" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:shoppingcart" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:payment" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:creditcard" uri="http://tuscany.apache.org/cloud" />
+  
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
new file mode 100644
index 0000000000..b6d9d51cbc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        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">
+        <t:implementation.node uri="fullapp-bespoketrip" composite="s:fullapp-bespoketrip"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8086"/>
+            <binding.ws uri="http://localhost:8086"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8086"/>
+        </service>
+    </component>
+     
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
new file mode 100644
index 0000000000..b42457154f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
+		name="coordination">
+
+    <component name="coordination">
+        <t:implementation.node uri="fullapp-coordination" composite="s:fullapp-coordination"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8084"/>
+            <binding.ws uri="http://localhost:8084"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8084"/>
+        </service>
+    </component>
+     
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
new file mode 100644
index 0000000000..5c66ff2796
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        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="s:creditcard"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8082"/>
+            <binding.ws uri="http://localhost:8082"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8082"/>
+        </service>
+    </component>
+     
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
new file mode 100644
index 0000000000..185112122c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        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">
+        <t:implementation.node uri="fullapp-currency" composite="s:fullapp-currency"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8083"/>
+            <binding.ws uri="http://localhost:8083"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8083"/>
+        </service>
+    </component>
+     
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
new file mode 100644
index 0000000000..323700b4a0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
@@ -0,0 +1,35 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        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">
+        <t:implementation.node uri="fullapp-packagedtrip" composite="s:fullapp-packagedtrip"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8085"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8085"/>
+        </service>
+    </component>
+     
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
new file mode 100644
index 0000000000..b27b57fad5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        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">
+        <t:implementation.node uri="fullapp-payment" composite="s:payment"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8081"/>
+            <binding.ws uri="http://localhost:8081"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8081"/>
+        </service>
+    </component>
+     
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
new file mode 100644
index 0000000000..7bec251965
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        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">
+        <t:implementation.node uri="fullapp-shoppingcart" composite="s:fullapp-shoppingcart"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8087"/>
+            <binding.ws uri="http://localhost:8087"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8087"/>
+        </service>
+    </component>
+     
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
new file mode 100644
index 0000000000..e86bef1c56
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
@@ -0,0 +1,33 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+		targetNamespace="http://tuscany.apache.org/cloud"
+		xmlns:s="http://tuscanyscatours.com/"
+		name="ui">
+
+    <component name="ui">
+        <t:implementation.node uri="fullapp-ui" composite="s:fullapp-ui"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8080"/>
+        </service>
+    </component>
+     
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite
new file mode 100644
index 0000000000..c54cfa3416
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite
@@ -0,0 +1,37 @@
+<?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 name="domain.composite"
+           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://tuscanyscatours.com/">
+       
+  <include name="ns2:payment" uri="fullapp-payment" />
+  <!-- The include for ns2:creditcard was moved after the include for ns2:payment as a
+     workaround for TUSCANY-3561. See the comments in TUSCANY-3562 for more details. -->
+  <include name="ns2:creditcard" uri="fullapp-creditcard" />         
+  <include name="ns2:fullapp-shoppingcart" uri="fullapp-shoppingcart" />
+  <include name="ns2:fullapp-currency" uri="fullapp-currency" />
+  <include name="ns2:fullapp-packagedtrip" uri="fullapp-packagedtrip" /> 
+  <include name="ns2:fullapp-bespoketrip" uri="fullapp-bespoketrip" />
+  <include name="ns2:fullapp-coordination" uri="fullapp-coordination" />         
+  <include name="ns2:fullapp-ui" uri="fullapp-ui" /> 
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud.composite
deleted file mode 100644
index 284376538a..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud.composite
+++ /dev/null
@@ -1,35 +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.    
--->
-<composite name="cloud.composite"
-           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://tuscany.apache.org/cloud">
-      
-  <include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />
-  <include name="ns2:coordination" uri="http://tuscany.apache.org/cloud" />
-  <include name="ns2:packagedtrip" uri="http://tuscany.apache.org/cloud" />
-  <include name="ns2:bespoketrip" uri="http://tuscany.apache.org/cloud" />
-  <include name="ns2:currency" uri="http://tuscany.apache.org/cloud" />
-  <include name="ns2:shoppingcart" uri="http://tuscany.apache.org/cloud" />
-  <include name="ns2:payment" uri="http://tuscany.apache.org/cloud" />
-  <include name="ns2:creditcard" uri="http://tuscany.apache.org/cloud" />
-  
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-bespoketrip.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-bespoketrip.composite
deleted file mode 100644
index b6d9d51cbc..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-bespoketrip.composite
+++ /dev/null
@@ -1,36 +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.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-        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">
-        <t:implementation.node uri="fullapp-bespoketrip" composite="s:fullapp-bespoketrip"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8086"/>
-            <binding.ws uri="http://localhost:8086"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8086"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-coordination.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-coordination.composite
deleted file mode 100644
index b42457154f..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-coordination.composite
+++ /dev/null
@@ -1,36 +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.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-        targetNamespace="http://tuscany.apache.org/cloud"
-        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-        xmlns:s="http://tuscanyscatours.com/"
-		name="coordination">
-
-    <component name="coordination">
-        <t:implementation.node uri="fullapp-coordination" composite="s:fullapp-coordination"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8084"/>
-            <binding.ws uri="http://localhost:8084"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8084"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-creditcard.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-creditcard.composite
deleted file mode 100644
index 5c66ff2796..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-creditcard.composite
+++ /dev/null
@@ -1,36 +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.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-        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="s:creditcard"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8082"/>
-            <binding.ws uri="http://localhost:8082"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8082"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-currency.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-currency.composite
deleted file mode 100644
index 185112122c..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-currency.composite
+++ /dev/null
@@ -1,36 +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.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-        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">
-        <t:implementation.node uri="fullapp-currency" composite="s:fullapp-currency"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8083"/>
-            <binding.ws uri="http://localhost:8083"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8083"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-packagedtrip.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-packagedtrip.composite
deleted file mode 100644
index 323700b4a0..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-packagedtrip.composite
+++ /dev/null
@@ -1,35 +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.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-        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">
-        <t:implementation.node uri="fullapp-packagedtrip" composite="s:fullapp-packagedtrip"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8085"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8085"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-payment.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-payment.composite
deleted file mode 100644
index b27b57fad5..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-payment.composite
+++ /dev/null
@@ -1,36 +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.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-        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">
-        <t:implementation.node uri="fullapp-payment" composite="s:payment"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8081"/>
-            <binding.ws uri="http://localhost:8081"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8081"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-shoppingcart.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-shoppingcart.composite
deleted file mode 100644
index 7bec251965..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-shoppingcart.composite
+++ /dev/null
@@ -1,36 +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.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-        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">
-        <t:implementation.node uri="fullapp-shoppingcart" composite="s:fullapp-shoppingcart"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8087"/>
-            <binding.ws uri="http://localhost:8087"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8087"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-ui.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-ui.composite
deleted file mode 100644
index e86bef1c56..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-ui.composite
+++ /dev/null
@@ -1,33 +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.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:s="http://tuscanyscatours.com/"
-		name="ui">
-
-    <component name="ui">
-        <t:implementation.node uri="fullapp-ui" composite="s:fullapp-ui"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8080"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/domain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/domain.composite
deleted file mode 100644
index c54cfa3416..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/domain.composite
+++ /dev/null
@@ -1,37 +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.    
--->
-<composite name="domain.composite"
-           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://tuscanyscatours.com/">
-       
-  <include name="ns2:payment" uri="fullapp-payment" />
-  <!-- The include for ns2:creditcard was moved after the include for ns2:payment as a
-     workaround for TUSCANY-3561. See the comments in TUSCANY-3562 for more details. -->
-  <include name="ns2:creditcard" uri="fullapp-creditcard" />         
-  <include name="ns2:fullapp-shoppingcart" uri="fullapp-shoppingcart" />
-  <include name="ns2:fullapp-currency" uri="fullapp-currency" />
-  <include name="ns2:fullapp-packagedtrip" uri="fullapp-packagedtrip" /> 
-  <include name="ns2:fullapp-bespoketrip" uri="fullapp-bespoketrip" />
-  <include name="ns2:fullapp-coordination" uri="fullapp-coordination" />         
-  <include name="ns2:fullapp-ui" uri="fullapp-ui" /> 
-
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace-distribution.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace-distribution.xml
deleted file mode 100644
index a7a3b01895..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace-distribution.xml
+++ /dev/null
@@ -1,42 +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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-  <contribution location="file:../contributions/scatours-contribution-common.jar"  uri="common"/>
-  <contribution location="file:../contributions/scatours-contribution-currency.jar"  uri="currency"/>
-  <contribution location="file:../contributions/scatours-contribution-hotel.jar"  uri="hotel"/>
-  <contribution location="file:../contributions/scatours-contribution-flight.jar"  uri="flight"/>
-  <contribution location="file:../contributions/scatours-contribution-car.jar"  uri="car"/>
-  <contribution location="file:../contributions/scatours-contribution-trip.jar"  uri="trip"/>
-  <contribution location="file:../contributions/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
-  <contribution location="file:../contributions/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
-  <!-- the following line should be payment-spring-policy but this doesn't work when using the domain manager (TUSCANY-3476) -->
-  <contribution location="file:../contributions/scatours-contribution-payment-java-policy.jar"  uri="fullapp-payment"/>
-  <contribution location="file:../contributions/scatours-contribution-creditcard-payment-jaxb-policy.jar"  uri="fullapp-creditcard"/>
-  <contribution location="file:../contributions/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
-  <contribution location="file:../contributions/scatours-contribution-scatours.jar"  uri="scatours"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
-  <contribution location="file:../domainconfig/fullapp/cloud" uri="http://tuscany.apache.org/cloud"/>  
-</workspace>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace.xml
deleted file mode 100644
index 8f1efcd1fd..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace.xml
+++ /dev/null
@@ -1,42 +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.    
--->
-<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"/>
-  <!-- the following line should be payment-spring-policy but this doesn't work when using the domain manager (TUSCANY-3476) -->
-  <contribution location="file:../../contributions/payment-java-policy/target/scatours-contribution-payment-java-policy.jar"  uri="fullapp-payment"/>
-  <contribution location="file:../../contributions/creditcard-payment-jaxb-policy/target/scatours-contribution-creditcard-payment-jaxb-policy.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-coordination/target/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>
-  <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:../../domainconfig/fullapp/target/classes/cloud" uri="http://tuscany.apache.org/cloud"/>  
-</workspace>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace-distribution.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
new file mode 100644
index 0000000000..a7a3b01895
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
@@ -0,0 +1,42 @@
+<?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/scatours-contribution-common.jar"  uri="common"/>
+  <contribution location="file:../contributions/scatours-contribution-currency.jar"  uri="currency"/>
+  <contribution location="file:../contributions/scatours-contribution-hotel.jar"  uri="hotel"/>
+  <contribution location="file:../contributions/scatours-contribution-flight.jar"  uri="flight"/>
+  <contribution location="file:../contributions/scatours-contribution-car.jar"  uri="car"/>
+  <contribution location="file:../contributions/scatours-contribution-trip.jar"  uri="trip"/>
+  <contribution location="file:../contributions/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
+  <contribution location="file:../contributions/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
+  <!-- the following line should be payment-spring-policy but this doesn't work when using the domain manager (TUSCANY-3476) -->
+  <contribution location="file:../contributions/scatours-contribution-payment-java-policy.jar"  uri="fullapp-payment"/>
+  <contribution location="file:../contributions/scatours-contribution-creditcard-payment-jaxb-policy.jar"  uri="fullapp-creditcard"/>
+  <contribution location="file:../contributions/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
+  <contribution location="file:../contributions/scatours-contribution-scatours.jar"  uri="scatours"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
+  <contribution location="file:../domainconfig/fullapp/cloud" uri="http://tuscany.apache.org/cloud"/>  
+</workspace>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace.xml
new file mode 100644
index 0000000000..8f1efcd1fd
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace.xml
@@ -0,0 +1,42 @@
+<?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"/>
+  <!-- the following line should be payment-spring-policy but this doesn't work when using the domain manager (TUSCANY-3476) -->
+  <contribution location="file:../../contributions/payment-java-policy/target/scatours-contribution-payment-java-policy.jar"  uri="fullapp-payment"/>
+  <contribution location="file:../../contributions/creditcard-payment-jaxb-policy/target/scatours-contribution-creditcard-payment-jaxb-policy.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-coordination/target/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>
+  <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:../../domainconfig/fullapp/target/classes/cloud" uri="http://tuscany.apache.org/cloud"/>  
+</workspace>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
index 9df2fe06f9..046a92980d 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
@@ -48,12 +48,12 @@
                             <tasks>
                                 <mkdir dir="target/jar-classes/introducing"/>
                                 <copy todir="target/jar-classes/introducing">
-                                    <fileset dir="src/main/resources/introducing">
+                                    <fileset dir="src/main/resources">
                                         <exclude name="workspace*.xml"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="target/jar-classes/introducing">
-                                    <fileset dir="src/main/resources/introducing">
+                                    <fileset dir="src/main/resources">
                                         <include name="workspace-distribution.xml"/>
                                     </fileset>
                                     <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud.composite
new file mode 100644
index 0000000000..5d400e1be8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud.composite
@@ -0,0 +1,26 @@
+<?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 local="true" name="cloud"
+  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">
+  <include name="ns2:ToursNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
+  <include name="ns2:TripsNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
+  <include name="ns2:ClientNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
new file mode 100644
index 0000000000..adf8f0e9cb
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
@@ -0,0 +1,32 @@
+<?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" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://client.scatours/" targetNamespace="http://tuscany.apache.org/cloud" name="ClientNode">
+
+	<component name="ClientNode">
+		<t:implementation.node uri="introducing-client" composite="c:Client" />
+		<service name="Node">
+            <binding.sca uri="http://localhost:8083" />
+			<binding.ws uri="http://localhost:8083" />
+			<t:binding.http uri="http://localhost:8083" />
+			<t:binding.jsonrpc uri="http://localhost:8083" />
+			<t:binding.atom uri="http://localhost:8083" />
+		</service>
+	</component>
+</composite>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
new file mode 100644
index 0000000000..6e8f7fadb6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
@@ -0,0 +1,32 @@
+<?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" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://tuscanyscatours.com/" targetNamespace="http://tuscany.apache.org/cloud" name="ToursNode">
+
+	<component name="ToursNode">
+		<t:implementation.node uri="introducing-tours" composite="c:Tours" />
+		<service name="Node">
+            <binding.sca uri="http://localhost:8081" />
+			<binding.ws uri="http://localhost:8081" />
+			<t:binding.http uri="http://localhost:8081" />
+			<t:binding.jsonrpc uri="http://localhost:8081" />
+			<t:binding.atom uri="http://localhost:8081" />
+		</service>
+	</component>
+</composite>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
new file mode 100644
index 0000000000..9e4b454941
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
@@ -0,0 +1,32 @@
+<?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" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://goodvaluetrips.com/" targetNamespace="http://tuscany.apache.org/cloud" name="TripsNode">
+
+	<component name="TripsNode">
+		<t:implementation.node uri="introducing-trips" composite="c:Trips" />
+		<service name="Node">
+            <binding.sca uri="http://localhost:8082" />
+			<binding.ws uri="http://localhost:8082" />
+			<t:binding.http uri="http://localhost:8082" />
+			<t:binding.jsonrpc uri="http://localhost:8082" />
+			<t:binding.atom uri="http://localhost:8082" />
+		</service>
+	</component>
+</composite>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/domain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/domain.composite
new file mode 100644
index 0000000000..ec0f71484b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/domain.composite
@@ -0,0 +1,26 @@
+<?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 local="true" name="domain"
+  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">
+  <include name="ns2:Tours" uri="introducing-tours" xmlns:ns2="http://tuscanyscatours.com/"/>
+  <include name="ns2:Trips" uri="introducing-trips" xmlns:ns2="http://goodvaluetrips.com/"/>
+  <include name="ns2:Client" uri="introducing-client" xmlns:ns2="http://client.scatours/"/>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud.composite
deleted file mode 100644
index 5d400e1be8..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud.composite
+++ /dev/null
@@ -1,26 +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.    
--->
-<composite local="true" name="cloud"
-  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">
-  <include name="ns2:ToursNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:TripsNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:ClientNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ClientNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ClientNode.composite
deleted file mode 100644
index adf8f0e9cb..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ClientNode.composite
+++ /dev/null
@@ -1,32 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://client.scatours/" targetNamespace="http://tuscany.apache.org/cloud" name="ClientNode">
-
-	<component name="ClientNode">
-		<t:implementation.node uri="introducing-client" composite="c:Client" />
-		<service name="Node">
-            <binding.sca uri="http://localhost:8083" />
-			<binding.ws uri="http://localhost:8083" />
-			<t:binding.http uri="http://localhost:8083" />
-			<t:binding.jsonrpc uri="http://localhost:8083" />
-			<t:binding.atom uri="http://localhost:8083" />
-		</service>
-	</component>
-</composite>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ToursNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ToursNode.composite
deleted file mode 100644
index 6e8f7fadb6..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ToursNode.composite
+++ /dev/null
@@ -1,32 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://tuscanyscatours.com/" targetNamespace="http://tuscany.apache.org/cloud" name="ToursNode">
-
-	<component name="ToursNode">
-		<t:implementation.node uri="introducing-tours" composite="c:Tours" />
-		<service name="Node">
-            <binding.sca uri="http://localhost:8081" />
-			<binding.ws uri="http://localhost:8081" />
-			<t:binding.http uri="http://localhost:8081" />
-			<t:binding.jsonrpc uri="http://localhost:8081" />
-			<t:binding.atom uri="http://localhost:8081" />
-		</service>
-	</component>
-</composite>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/TripsNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/TripsNode.composite
deleted file mode 100644
index 9e4b454941..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/TripsNode.composite
+++ /dev/null
@@ -1,32 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://goodvaluetrips.com/" targetNamespace="http://tuscany.apache.org/cloud" name="TripsNode">
-
-	<component name="TripsNode">
-		<t:implementation.node uri="introducing-trips" composite="c:Trips" />
-		<service name="Node">
-            <binding.sca uri="http://localhost:8082" />
-			<binding.ws uri="http://localhost:8082" />
-			<t:binding.http uri="http://localhost:8082" />
-			<t:binding.jsonrpc uri="http://localhost:8082" />
-			<t:binding.atom uri="http://localhost:8082" />
-		</service>
-	</component>
-</composite>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/domain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/domain.composite
deleted file mode 100644
index ec0f71484b..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/domain.composite
+++ /dev/null
@@ -1,26 +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.    
--->
-<composite local="true" name="domain"
-  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">
-  <include name="ns2:Tours" uri="introducing-tours" xmlns:ns2="http://tuscanyscatours.com/"/>
-  <include name="ns2:Trips" uri="introducing-trips" xmlns:ns2="http://goodvaluetrips.com/"/>
-  <include name="ns2:Client" uri="introducing-client" xmlns:ns2="http://client.scatours/"/>
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace-distribution.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace-distribution.xml
deleted file mode 100644
index 5c058ee325..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace-distribution.xml
+++ /dev/null
@@ -1,30 +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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-    <contribution location="file:../domainconfig/introducing/cloud"
-           uri="http://tuscany.apache.org/cloud"/>
-    <contribution location="file:../contributions/scatours-contribution-introducing-tours.jar"
-           uri="introducing-tours"/>
-    <contribution location="file:../contributions/scatours-contribution-introducing-trips.jar"
-           uri="introducing-trips"/>
-    <contribution location="file:../contributions/scatours-contribution-introducing-client.jar"
-           uri="introducing-client"/>
-</workspace>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace.xml
deleted file mode 100644
index 59468135c1..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace.xml
+++ /dev/null
@@ -1,30 +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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-    <contribution location="file:../../domainconfig/introducing/target/classes/cloud"
-           uri="http://tuscany.apache.org/cloud"/>
-    <contribution location="file:../../contributions/introducing-tours/target/scatours-contribution-introducing-tours.jar"
-           uri="introducing-tours"/>
-    <contribution location="file:../../contributions/introducing-trips/target/scatours-contribution-introducing-trips.jar"
-           uri="introducing-trips"/>
-    <contribution location="file:../../contributions/introducing-client/target/scatours-contribution-introducing-client.jar"
-           uri="introducing-client"/>
-</workspace>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-distribution.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-distribution.xml
new file mode 100644
index 0000000000..5c058ee325
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-distribution.xml
@@ -0,0 +1,30 @@
+<?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:../domainconfig/introducing/cloud"
+           uri="http://tuscany.apache.org/cloud"/>
+    <contribution location="file:../contributions/scatours-contribution-introducing-tours.jar"
+           uri="introducing-tours"/>
+    <contribution location="file:../contributions/scatours-contribution-introducing-trips.jar"
+           uri="introducing-trips"/>
+    <contribution location="file:../contributions/scatours-contribution-introducing-client.jar"
+           uri="introducing-client"/>
+</workspace>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace.xml
new file mode 100644
index 0000000000..59468135c1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace.xml
@@ -0,0 +1,30 @@
+<?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:../../domainconfig/introducing/target/classes/cloud"
+           uri="http://tuscany.apache.org/cloud"/>
+    <contribution location="file:../../contributions/introducing-tours/target/scatours-contribution-introducing-tours.jar"
+           uri="introducing-tours"/>
+    <contribution location="file:../../contributions/introducing-trips/target/scatours-contribution-introducing-trips.jar"
+           uri="introducing-trips"/>
+    <contribution location="file:../../contributions/introducing-client/target/scatours-contribution-introducing-client.jar"
+           uri="introducing-client"/>
+</workspace>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml
index 668c9178b2..36de2a93e4 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml
@@ -32,7 +32,7 @@
                     <include name="tuscany-node-launcher-*.jar"/>
                 </fileset>
             </classpath>
-            <arg value="../../domainconfig/fullapp/target/classes/fullapp"/>
+            <arg value="../../domainconfig/fullapp/target/classes"/>
         </java>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml
index fd111f8c0f..9d8c28b8e1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml
@@ -32,7 +32,7 @@
                     <include name="tuscany-node-launcher-*.jar"/>
                 </fileset>
             </classpath>
-            <arg value="../../domainconfig/introducing/target/classes/introducing"/>
+            <arg value="../../domainconfig/introducing/target/classes"/>
         </java>
     </target>
 </project>
-- 
cgit v1.2.3