Merge r967047 from trunk to beta1 brn for the samples\pom.xml parent change in all the samples

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

34 files changed, 60 insertions, 60 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml
index 41073ba2d2..b2bfd17012 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-contribution-binding-rmi-calculator-reference</artifactId>
     <name>Apache Tuscany SCA Sample Contribution binding-rmi Calculator Reference</name>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-service/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-service/pom.xml
index 80c7274e48..931c0e311b 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-service/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-service/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-contribution-binding-rmi-calculator-service</artifactId>
     <name>Apache Tuscany SCA Sample Contribution binding-rmi Calculator Service</name>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/pom.xml
index 661efacc6b..f4199d5d9f 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

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

     <packaging>pom</packaging>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/contribution-calculator/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/contribution-calculator/pom.xml
index 7a00f26701..3e54d26e13 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/contribution-calculator/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/contribution-calculator/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-contribution-binding-sca-calculator</artifactId>
     <name>Apache Tuscany SCA Sample Contribution binding-sca Calculator</name>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/pom.xml
index 274f3098cd..4887e63054 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

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

     <packaging>pom</packaging>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/pom.xml
index 6815abf444..8aa260d6d5 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-osgi</artifactId>
     <name>Apache Tuscany SCA Sample Calculator OSGi</name>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/calculator-scaclient/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/calculator-scaclient/pom.xml
index cb95186e5a..9cd6fce79f 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/calculator-scaclient/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/calculator-scaclient/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

 

     <artifactId>sample-calculator-scaclient</artifactId>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/contribution-binding-ws-calculator/pom.xml
index 17b740c629..b296dff828 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/contribution-binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/contribution-binding-ws-calculator/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-contribution-binding-ws-calculator</artifactId>
     <name>Apache Tuscany SCA Sample Contribution binding-ws Calculator</name>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/contribution-implementation-java-calculator/pom.xml
index e5480d0970..f146ab2631 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/contribution-implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/contribution-implementation-java-calculator/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-contribution-implementation-java-calculator</artifactId>
     <name>Apache Tuscany SCA Sample Contribution Implementation Java Calculator</name>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator-operations/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator-operations/pom.xml
index c056a61ed5..d00fded23f 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator-operations/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-dosgi-calculator-operations</artifactId>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator/pom.xml
index 6b40ab4eeb..761c8e8c69 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-dosgi-calculator</artifactId>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator-operations/pom.xml
index d576e0ab9f..4ce926ee1b 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator-operations/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-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/branches/2.0-Beta1/samples/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator/pom.xml
index 99a6db3ea8..49c73c1dff 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample-dosgi-dynamic-calculator</artifactId>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/pom.xml
index 3cf6d5a1d1..8ad1d01c51 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <packaging>zip</packaging>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-scaclient/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-scaclient/pom.xml
index d1d416e3a9..88ae22c76e 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-scaclient/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-scaclient/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

 

     <artifactId>sample-helloworld-scaclient</artifactId>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-spring/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-spring/pom.xml
index 42edd47f60..59cce7178b 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-spring/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-spring/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

 

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

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-ws-sdo/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-ws-sdo/pom.xml
index a29324a38e..ba32747fb2 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-ws-sdo/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-sdo</artifactId>
     <name>Apache Tuscany SCA Sample HelloWorld Web Service SDO</name>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld/pom.xml
index ec2a72d8a3..ab83719bd4 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/helloworld/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/helloworld/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

 

     <packaging>jar</packaging>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-jse/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-jse/pom.xml
index be68b3e01c..63d5faaee6 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-jse/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-jse/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

     <artifactId>sample-launcher-embedded-jse</artifactId>

     <name>Apache Tuscany SCA Sample Launcher Embedded JSE</name>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi-base/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi-base/pom.xml
index 64f4a8ba31..db1e80d4c5 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi-base/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi-base/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-launcher-embedded-osgi-base</artifactId>
     <name>Apache Tuscany SCA Sample Launcher Embedded OSGi using base jar</name>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi/pom.xml
index b437cacc0c..2e0afbae79 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

     <artifactId>sample-launcher-embedded-osgi</artifactId>

     <name>Apache Tuscany SCA Sample Launcher Embedded OSGi</name>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/launcher-shell/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/launcher-shell/pom.xml
index 6366bcfc00..71c4335b62 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/launcher-shell/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/launcher-shell/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

     <artifactId>sample-launcher-shell</artifactId>

     <name>Apache Tuscany SCA Sample Launcher Shell</name>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/logging-scribe/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/logging-scribe/pom.xml
index 6c2ced50f6..11dad25894 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/logging-scribe/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/logging-scribe/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

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

     </parent>

 

     <packaging>jar</packaging>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/pom.xml
index 64ad67a9f4..258b7c7215 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/store/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/store/pom.xml
index 68294c59ff..5437634a50 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/store/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/store/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml
index 0e8b0cf70e..27597f0d2b 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml
@@ -22,10 +22,10 @@
 

       <modelVersion>4.0.0</modelVersion>

       <parent>

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

-          <artifactId>tuscany-sca</artifactId>

-          <version>2.0-Beta1-SNAPSHOT</version>

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

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

+        <artifactId>tuscany-samples</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

       </parent>

 

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

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jaxrs/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jaxrs/pom.xml
index 2fecea87fa..7d8ca78d16 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jaxrs/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jaxrs/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

     </parent>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/pom.xml
index 5e3de23392..37de079c5f 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-js-client/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-js-client/pom.xml
index 3f82fe32c9..2e875a35c7 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-js-client/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

+        <artifactId>tuscany-samples</artifactId>

         <version>2.0-Beta1-SNAPSHOT</version>

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

     </parent>

diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsf/pom.xml
index 59ab3e5c42..dfb90ecf97 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsf/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/pom.xml
index c250b9b774..5f488873a8 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/pom.xml
index 51683913de..890c3a1630 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-stripes/pom.xml
index 019e2e2d78..4c3ed7b21e 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-stripes/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld/pom.xml
index 147f591a0e..29d43bd6c4 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-samples</artifactId>
         <version>2.0-Beta1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>