Update all samples to use the top level samples as parent

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

35 files changed, 119 insertions, 119 deletions

diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
index cf9ca44ec8..d0f522d96b 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-getting-started-contributions</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../pom.xml</relativePath>

     </parent>

 

     <packaging>jar</packaging>

diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
index f7c375a8c3..4a8c757ecf 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-getting-started-contributions</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-helloworld-webapp</artifactId>
diff --git a/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml b/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml
index 404c8cc4ff..878da43573 100644
--- a/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml
@@ -1,51 +1,51 @@
-<?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-samples-getting-started-contributions</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <name>Apache Tuscany SCA Sample SCA Scopes Contribution</name>
-    <artifactId>sample-sca-scopes-contribution</artifactId>
-
-    <dependencies>
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-</project>
+<?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-samples</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <name>Apache Tuscany SCA Sample SCA Scopes Contribution</name>

+    <artifactId>sample-sca-scopes-contribution</artifactId>

+

+    <dependencies>

+         <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-api</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-impl</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+</project>

diff --git a/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml b/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml
index 9d61acbd45..7f30c84149 100644
--- a/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-getting-started-contributions</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../pom.xml</relativePath>

     </parent>

 

     <packaging>zip</packaging>

diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
index eca47cb8e8..20c04e9e70 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>sample-tuscany-async</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-java-calculator-async-contribution</artifactId>
     <name>Apache Tuscany SCA Sample implementation.java Calculator Async Contribution</name>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
index 95c1ede7c2..cb538d02a0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
@@ -21,9 +21,9 @@
 	<modelVersion>4.0.0</modelVersion>

 	<parent>

 		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-samples-binding-comet</artifactId>

+		<artifactId>tuscany-samples</artifactId>

 		<version>2.0-SNAPSHOT</version>

-		<relativePath>../pom.xml</relativePath>

+		<relativePath>../../../pom.xml</relativePath>

 	</parent>

 

 	<groupId>org.apache.tuscany.sca</groupId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/pom.xml
index e4e495d65a..751fffc4c9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sample-binding-jms</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-binding-jms-helloworld-webapp</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
index f611d71402..8f0a042f21 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-binding-jsonrpc</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-binding-jsonrpc-calculator-contribution</artifactId>

     <name>Apache Tuscany SCA Sample binding.jsonrpc Calculator Contribution</name>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
index eb3eda368a..da55756087 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-binding-jsonrpc</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-binding-jsonrpc-calculator-webapp</artifactId>

     <name>Apache Tuscany SCA Sample binding.jsonrpc Calculator WebApp</name>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
index d8257ed8ee..87ac79b0d0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sample-binding-rmi</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-rmi-calculator-reference-contribution</artifactId>
     <name>Apache Tuscany SCA Sample binding.rmi Calculator Reference Contribution</name>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
index 01807f6b87..cb92cfe8a1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sample-binding-rmi</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-rmi-calculator-service-contribution</artifactId>
     <name>Apache Tuscany SCA Sample binding.rmi Calculator Service Contribution</name>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
index fb102b7c32..134a9be456 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sample-binding-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-sca-calculator-contribution</artifactId>
     <name>Apache Tuscany SCA Sample binding.sca Calculator Contribution</name>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
index 33ab0cde19..4153f5f523 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sample-binding-ws</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-binding-ws-calculator-contribution</artifactId>

     <name>Apache Tuscany SCA Sample binding.ws Calculator Contribution</name>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
index 3f2f9e4177..f5c2839067 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sample-binding-ws</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-ws-helloworld-ws-sdo-contribution</artifactId>
     <name>Apache Tuscany SCA Sample binding.ws HelloWorld Web Service SDO Contribution</name>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml
index c1b66724e9..e910931a27 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sample-binding-ws</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

 

     <packaging>jar</packaging>

diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
index e0b5d6962e..6f5918b8d1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-distributed-osgi</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-dosgi-dynamic-calculator-operations</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
index 978ada93d0..9b79a97b07 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-distributed-osgi</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-dosgi-dynamic-calculator</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
index 611b5a9366..59d74cb5ae 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sample-implementation-bpel</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <packaging>zip</packaging>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
index 0c7c4c230c..8417ee478f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
@@ -23,9 +23,9 @@
       <modelVersion>4.0.0</modelVersion>

       <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sample-implementation-bpel</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

       </parent>

 

       <artifactId>sample-implementation-bpel-helloworld-webapp</artifactId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
index a6c338475f..e6ec9557ac 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-implementation-composite</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

 

     <packaging>zip</packaging>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
index ef462dffba..d802f9a0e4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-implementation-composite</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

 

     <packaging>zip</packaging>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
index e43f92a862..f10a4b486e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sample-implementation-java</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-implementation-java-calculator-contribution</artifactId>

     <name>Apache Tuscany SCA Sample implementation.java Calculator Contribution</name>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
index f084b0ec3c..612bf0b634 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-distributed-osgi-static</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-dosgi-calculator-operations</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
index 0a436fc560..94a9d46db2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-distributed-osgi-static</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-dosgi-calculator</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
index cd1be13214..2444855b17 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sample-implementation-script</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-implementation-script-calculator-contribution</artifactId>

     <name>Apache Tuscany SCA Sample implementation.script Calculator Contribution</name>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
index b4cb31e1ef..5b7b366056 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-implementation-spring</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

 

     <artifactId>sample-implementation-spring-helloworld-contribution</artifactId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
index 5b96d7d913..25a78c2a54 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-implementation-spring</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-implementation-spring-helloworld-webapp</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
index 43b0e64daa..9b874a5215 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-implementation-webapp</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

 

     <artifactId>sample-implementation-web-helloworld-jaxrs-webapp</artifactId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
index bbde1b0d65..bdd9c5085b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-implementation-webapp</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

 

     <artifactId>sample-implementation-web-helloworld-js-client-webapp</artifactId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
index d93f1475ab..36fe0c93c8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-implementation-webapp</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-implementation-web-helloworld-jsf-webapp</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
index 0aeed87589..fb1f93bcc1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-implementation-webapp</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-implementation-web-helloworld-jsp-webapp</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
index 8892949405..5a07843e58 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-implementation-webapp</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-implementation-web-helloworld-servlet-webapp</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
index fd96fc3367..7e092f548b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-implementation-webapp</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-implementation-web-helloworld-stripes-webapp</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml
index a29fdc345d..d63a90c359 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-sca-client</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

 

     <artifactId>sample-sca-client-calculator</artifactId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml
index a9c4ef0dc0..f891ee3e45 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples-sca-client</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

+        <relativePath>../../../pom.xml</relativePath>

     </parent>

 

     <artifactId>sample-sca-client-helloworld</artifactId>