Moving 1.x branches

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

23 files changed, 0 insertions, 864 deletions

diff --git a/branches/sca-java-1.2/tutorial/domain/cloud.composite b/branches/sca-java-1.2/tutorial/domain/cloud.composite
deleted file mode 100644
index 993b634c9f..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud.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 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:CurrencyNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:CatalogsNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreMergerNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreDBNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreSupplierNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreEUNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:CatalogWebAppNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:CatalogMediationNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:CatalogEJBNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/CatalogEJBNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/CatalogEJBNode.composite
deleted file mode 100644
index b495b45ebd..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/CatalogEJBNode.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:c="http://catalog"
-		name="CatalogEJBNode">
-
-	<component name="CatalogEJBNode">
-		<t:implementation.node uri="catalog-ejb" composite="c:catalog-ejb"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8080"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/CatalogMediationNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/CatalogMediationNode.composite
deleted file mode 100644
index bac96d9781..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/CatalogMediationNode.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:c="http://catalog"
-		name="CatalogMediationNode">
-
-	<component name="CatalogMediationNode">
-		<t:implementation.node uri="catalog-mediation" composite="c:catalog-mediation"/>
-		<service name="Node">
-			<binding.ws uri="http://localhost:8105"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/CatalogWebAppNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/CatalogWebAppNode.composite
deleted file mode 100644
index f3ed2dfdd5..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/CatalogWebAppNode.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"
-	xmlns:c="http://catalog"
-	targetNamespace="http://tuscany.apache.org/cloud"
-	name="CatalogWebAppNode">
-
-	<component name="CatalogWebAppNode">
-		<t:implementation.node uri="catalog-webapp" composite="c:catalog-web" />
-		<service name="Node">
-			<binding.ws uri="http://localhost:8080/CatalogWebAppNode" />
-			<t:binding.http uri="http://localhost:8080/CatalogWebAppNode" />
-			<t:binding.jsonrpc uri="http://localhost:8080/CatalogWebAppNode" />
-			<t:binding.atom uri="http://localhost:8080/CatalogWebAppNode" />
-		</service>
-	</component>
-	
-</composite>
\ No newline at end of file
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite
deleted file mode 100644
index 3a5ec770cb..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.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:c="http://services"
-		name="CatalogsNode">
-
-	<component name="CatalogsNode">
-		<t:implementation.node uri="web-services" composite="c:catalogs"/>
-		<service name="Node">
-			<binding.ws uri="http://localhost:8200"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite
deleted file mode 100644
index ed80268f22..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.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:c="http://services"
-		name="CurrencyNode">
-
-	<component name="CurrencyNode">
-		<t:implementation.node uri="web-services" composite="c:currency"/>
-		<service name="Node">
-			<binding.ws uri="http://localhost:8201"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/StoreDBNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/StoreDBNode.composite
deleted file mode 100644
index 9b09bd7344..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/StoreDBNode.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:s="http://store"
-		name="StoreDBNode">
-
-	<component name="StoreDBNode">
-		<t:implementation.node uri="store-db" composite="s:store-db"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8102"/>
-			<t:binding.jsonrpc uri="http://localhost:8102"/>
-			<t:binding.atom uri="http://localhost:8102"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/StoreEUNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/StoreEUNode.composite
deleted file mode 100644
index 6a50de56d5..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/StoreEUNode.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:s="http://store"
-		name="StoreEUNode">
-
-	<component name="StoreEUNode">
-		<t:implementation.node uri="store-eu" composite="s:store-eu"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8104"/>
-			<t:binding.jsonrpc uri="http://localhost:8104"/>
-			<t:binding.atom uri="http://localhost:8104"/>
-			<binding.ws uri="http://localhost:8444"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/StoreMergerNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/StoreMergerNode.composite
deleted file mode 100644
index 0ce6e6a231..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/StoreMergerNode.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:s="http://store"
-		name="StoreMergerNode">
-
-	<component name="StoreMergerNode">
-		<t:implementation.node uri="store-merger" composite="s:store-merger"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8101"/>
-			<t:binding.jsonrpc uri="http://localhost:8101"/>
-			<t:binding.atom uri="http://localhost:8101"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/StoreNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/StoreNode.composite
deleted file mode 100644
index e2b61a98e1..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/StoreNode.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:s="http://store"
-		name="StoreNode">
-
-	<component name="StoreNode">
-		<t:implementation.node uri="store" composite="s:store"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8100"/>
-			<t:binding.jsonrpc uri="http://localhost:8100"/>
-			<t:binding.atom uri="http://localhost:8100"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/cloud/StoreSupplierNode.composite b/branches/sca-java-1.2/tutorial/domain/cloud/StoreSupplierNode.composite
deleted file mode 100644
index df46bb8813..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/cloud/StoreSupplierNode.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:s="http://store"
-		name="StoreSupplierNode">
-
-	<component name="StoreSupplierNode">
-		<t:implementation.node uri="store-supplier" composite="s:store-supplier"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8103"/>
-			<t:binding.jsonrpc uri="http://localhost:8103"/>
-			<t:binding.atom uri="http://localhost:8103"/>
-			<binding.ws uri="http://localhost:8333"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/domain.composite b/branches/sca-java-1.2/tutorial/domain/domain.composite
deleted file mode 100644
index ff4dde969c..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/domain.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 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:store" uri="store" xmlns:ns2="http://store"/>
-  <include name="ns2:store-merger" uri="store-merger" xmlns:ns2="http://store"/>
-  <include name="ns2:store-db" uri="store-db" xmlns:ns2="http://store"/>
-  <include name="ns2:store-supplier" uri="store-supplier" xmlns:ns2="http://store"/>
-  <include name="ns2:store-eu" uri="store-eu" xmlns:ns2="http://store"/>
-  <include name="ns2:catalogs" uri="web-services" xmlns:ns2="http://services"/>
-  <include name="ns2:currency" uri="web-services" xmlns:ns2="http://services"/>
-  <include name="ns2:catalog-web" uri="catalog-webapp" xmlns:ns2="http://catalog"/>
-  <include name="ns2:catalog-mediation" uri="catalog-mediation" xmlns:ns2="http://catalog"/>
-  <include name="ns2:catalog-ejb" uri="catalog-ejb" xmlns:ns2="http://catalog"/>
-</composite>
diff --git a/branches/sca-java-1.2/tutorial/domain/launch/LaunchCatalogMediationNode.java b/branches/sca-java-1.2/tutorial/domain/launch/LaunchCatalogMediationNode.java
deleted file mode 100644
index 442b1b6a05..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/launch/LaunchCatalogMediationNode.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchCatalogMediationNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-image/CatalogMediationNode"});
-    }
-}
diff --git a/branches/sca-java-1.2/tutorial/domain/launch/LaunchCatalogsNode.java b/branches/sca-java-1.2/tutorial/domain/launch/LaunchCatalogsNode.java
deleted file mode 100644
index 8a23433012..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/launch/LaunchCatalogsNode.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchCatalogsNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-image/CatalogsNode"});
-    }
-}
diff --git a/branches/sca-java-1.2/tutorial/domain/launch/LaunchCurrencyNode.java b/branches/sca-java-1.2/tutorial/domain/launch/LaunchCurrencyNode.java
deleted file mode 100644
index fae521547d..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/launch/LaunchCurrencyNode.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchCurrencyNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-image/CurrencyNode"});
-    }
-}
diff --git a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreDBNode.java b/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreDBNode.java
deleted file mode 100644
index 480088b46a..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreDBNode.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreDBNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-image/StoreDBNode"});
-    }
-}
diff --git a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreEUNode.java b/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreEUNode.java
deleted file mode 100644
index cdc7eb824b..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreEUNode.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreEUNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-image/StoreEUNode"});
-    }
-}
diff --git a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreMergerNode.java b/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreMergerNode.java
deleted file mode 100644
index 26452b231b..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreMergerNode.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreMergerNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-image/StoreMergerNode"});
-    }
-}
diff --git a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreNode.java b/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreNode.java
deleted file mode 100644
index d15ee0e9d2..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreNode.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-image/StoreNode"});
-    }
-}
diff --git a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreSupplierNode.java b/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreSupplierNode.java
deleted file mode 100644
index 4210108aa5..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreSupplierNode.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreSupplierNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-image/StoreSupplierNode"});
-    }
-}
diff --git a/branches/sca-java-1.2/tutorial/domain/launch/LaunchTutorialDomainManager.java b/branches/sca-java-1.2/tutorial/domain/launch/LaunchTutorialDomainManager.java
deleted file mode 100644
index 7408e99c63..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/launch/LaunchTutorialDomainManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package launch;
-
-/**
- * Launches the domain manager from this module.
- *
- * @version $Rev$ $Date$
- */
-public class LaunchTutorialDomainManager {
-    
-    public static void main(String[] args) throws Exception {
-        org.apache.tuscany.sca.node.launcher.DomainManagerLauncher.main(args);
-    }
-
-}
diff --git a/branches/sca-java-1.2/tutorial/domain/pom.xml b/branches/sca-java-1.2/tutorial/domain/pom.xml
deleted file mode 100644
index b76ce4de37..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/pom.xml
+++ /dev/null
@@ -1,164 +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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
-        <version>1.2-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-domain</artifactId>
-    <name>Apache Tuscany SCA Tutorial Domain</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-admin</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb-xml</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.1.2.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.2-incubating-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>launch.LaunchTutorialAdmin</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/branches/sca-java-1.2/tutorial/domain/workspace.xml b/branches/sca-java-1.2/tutorial/domain/workspace.xml
deleted file mode 100644
index e405dea03a..0000000000
--- a/branches/sca-java-1.2/tutorial/domain/workspace.xml
+++ /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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-  <contribution location="file:../assets/target/tutorial-assets.jar" uri="assets"/>
-  <contribution location="file:../store/target/tutorial-store.jar" uri="store"/>
-  <contribution location="file:../store-merger/target/tutorial-store-merger.jar" uri="store-merger"/>
-  <contribution location="file:../store-db/target/tutorial-store-db.jar" uri="store-db"/>
-  <contribution location="file:../store-supplier/target/tutorial-store-supplier.jar" uri="store-supplier"/>
-  <contribution location="file:../store-eu/target/tutorial-store-eu.jar" uri="store-eu"/>
-  <contribution location="file:../web-services/target/tutorial-web-services.jar" uri="web-services"/>
-  <contribution location="file:../catalog-webapp/target/tutorial-catalog-webapp.war" uri="catalog-webapp"/>
-  <contribution location="file:../catalog-mediation/target/tutorial-catalog-mediation.jar" uri="catalog-mediation"/>
-  <contribution location="file:../catalog-ejb/target/tutorial-catalog-ejb.jar" uri="catalog-ejb"/>
-  <contribution location="file:../domain/cloud" uri="http://tuscany.apache.org/cloud"/>
-</workspace>