From 43158c3941dd9489d9934e976ff08cd1d6612630 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 17:57:11 +0000
Subject: Change domainconfig directory structure to make ant build of binaries
 module work

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946311 13f79535-47bb-0310-9956-ffa450edef68
---
 .../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 --------------------
 14 files changed, 208 insertions(+), 208 deletions(-)
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/domain.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ClientNode.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ToursNode.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/TripsNode.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/domain.composite
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace-distribution.xml
 create mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace.xml
 delete mode 100644 sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-distribution.xml
 delete 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/sca-java-travelsample-1.0/domainconfig/introducing/src')

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
deleted file mode 100644
index 5d400e1be8..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/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/cloud/ClientNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/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/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/cloud/ToursNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/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/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/cloud/TripsNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/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/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/domain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/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/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/cloud.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/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/introducing/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/introducing/cloud/ClientNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/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/introducing/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/introducing/cloud/ToursNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/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/introducing/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/introducing/cloud/TripsNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/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/introducing/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/introducing/domain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/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/introducing/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/workspace-distribution.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/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/introducing/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/introducing/workspace.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/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/introducing/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/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
deleted file mode 100644
index 5c058ee325..0000000000
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/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/workspace.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/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/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>
-- 
cgit v1.2.3