Update all samples to use the top level samples as their parent. Whatever happens with the other sample discussion this hopefully gets them working from the bin distro without having to do a local build first

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

11 files changed, 66 insertions, 69 deletions

diff --git a/sca-java-2.x/trunk/samples/applications/eightball-demo/pom.xml b/sca-java-2.x/trunk/samples/applications/eightball-demo/pom.xml
index b58b73c0d4..2499576fec 100644
--- a/sca-java-2.x/trunk/samples/applications/eightball-demo/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/eightball-demo/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-applications</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-eightball-demo</artifactId>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/samples/applications/logging-scribe/helloworld-scribe/pom.xml b/sca-java-2.x/trunk/samples/applications/logging-scribe/helloworld-scribe/pom.xml
index 7cef24e977..6a99a1e13e 100644
--- a/sca-java-2.x/trunk/samples/applications/logging-scribe/helloworld-scribe/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/logging-scribe/helloworld-scribe/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sample-logging-scribe</artifactId>

+        <artifactId>tuscany-sample</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/applications/logging-scribe/pom.xml b/sca-java-2.x/trunk/samples/applications/logging-scribe/pom.xml
index dd759ff2f0..e073c4ed09 100644
--- a/sca-java-2.x/trunk/samples/applications/logging-scribe/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/logging-scribe/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-samples-applications</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

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

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

     </parent>

     <artifactId>tuscany-sample-logging-scribe</artifactId>

     <packaging>pom</packaging>

@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <!--module>helloworld-scribe</module-->
+                <!--module>helloworld-scribe</module-->

             </modules>

         </profile>

     </profiles>    

diff --git a/sca-java-2.x/trunk/samples/applications/pom.xml b/sca-java-2.x/trunk/samples/applications/pom.xml
index 13420065d2..cb5972cb5d 100644
--- a/sca-java-2.x/trunk/samples/applications/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/pom.xml
@@ -23,7 +23,6 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-applications</artifactId>
     <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml b/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
index a68bce2ea6..1eb5160538 100644
--- a/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-applications</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-webapp</artifactId>
     <packaging>war</packaging>
diff --git a/sca-java-2.x/trunk/samples/applications/store/pom.xml b/sca-java-2.x/trunk/samples/applications/store/pom.xml
index 057df05a61..e3eadf8dc3 100644
--- a/sca-java-2.x/trunk/samples/applications/store/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/store/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-applications</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store</artifactId>
     <name>Apache Tuscany SCA Sample Getting Started Online Store</name>
diff --git a/sca-java-2.x/trunk/samples/extending-tuscany/binding-sample/pom.xml b/sca-java-2.x/trunk/samples/extending-tuscany/binding-sample/pom.xml
index fa2b574338..4af16a6871 100644
--- a/sca-java-2.x/trunk/samples/extending-tuscany/binding-sample/pom.xml
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/binding-sample/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples-extending-tuscany</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-binding-extension</artifactId>
diff --git a/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
index 8d54e83ed8..94dbe0ddb7 100644
--- a/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-samples-extending-tuscany</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-SNAPSHOT</version>

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

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

     </parent>

     <artifactId>sample-implementation-extension</artifactId>

     <name>Apache Tuscany SCA Sample Implementation Extension</name>

diff --git a/sca-java-2.x/trunk/samples/extending-tuscany/pom.xml b/sca-java-2.x/trunk/samples/extending-tuscany/pom.xml
index b03551994f..482bb39060 100644
--- a/sca-java-2.x/trunk/samples/extending-tuscany/pom.xml
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/pom.xml
@@ -23,7 +23,6 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>tuscany-samples-extending-tuscany</artifactId>
diff --git a/sca-java-2.x/trunk/samples/getting-started/callback-api/pom.xml b/sca-java-2.x/trunk/samples/getting-started/callback-api/pom.xml
index 2fb5eb9b15..a87560b9f2 100644
--- a/sca-java-2.x/trunk/samples/getting-started/callback-api/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/callback-api/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>
-    <artifactId>sample-callback-api-contribution</artifactId>
-    <name>Apache Tuscany SCA Sample Callback API Contribution</name>
-
-    <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>

+    <artifactId>sample-callback-api-contribution</artifactId>

+    <name>Apache Tuscany SCA Sample Callback API Contribution</name>

+

+    <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/pom.xml b/sca-java-2.x/trunk/samples/getting-started/pom.xml
index 5e64979214..56195a1997 100644
--- a/sca-java-2.x/trunk/samples/getting-started/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/pom.xml
@@ -23,7 +23,6 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-getting-started-contributions</artifactId>
     <groupId>org.apache.tuscany.sca</groupId>