You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/07/23 16:30:43 UTC

svn commit: r967108 - in /tuscany/sca-java-2.x/branches/2.0-Beta1/samples: binding-rmi/ binding-rmi/contribution-calculator-reference/ binding-rmi/contribution-calculator-service/ binding-sca/ binding-sca/contribution-calculator/ calculator-osgi/ calcu...

Author: antelder
Date: Fri Jul 23 14:30:42 2010
New Revision: 967108

URL: http://svn.apache.org/viewvc?rev=967108&view=rev
Log:
Merge r967047 from trunk to beta1 brn for the samples\pom.xml parent change in all the samples

Modified:
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-service/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/contribution-calculator/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-scaclient/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-binding-ws-calculator/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-implementation-java-calculator/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator-operations/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator-operations/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-scaclient/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-spring/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-ws-sdo/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-jse/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi-base/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-shell/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/logging-scribe/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jaxrs/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-js-client/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsf/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-stripes/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld/pom.xml

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-service/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-service/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-service/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/contribution-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/contribution-calculator/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/contribution-calculator/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/contribution-calculator/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/binding-sca/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-osgi/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-scaclient/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-scaclient/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-scaclient/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/calculator-scaclient/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-binding-ws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-binding-ws-calculator/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-binding-ws-calculator/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-binding-ws-calculator/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-implementation-java-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-implementation-java-calculator/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-implementation-java-calculator/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/contribution-implementation-java-calculator/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator-operations/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator-operations/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator-operations/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-calculator/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator-operations/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator-operations/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator-operations/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/dosgi-dynamic-calculator/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-bpel/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-scaclient/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-scaclient/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-scaclient/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-scaclient/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-spring/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-spring/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-spring/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-ws-sdo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-ws-sdo/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-ws-sdo/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld-ws-sdo/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/helloworld/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-jse/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-jse/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-jse/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-jse/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi-base/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi-base/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi-base/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi-base/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-embedded-osgi/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-shell/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-shell/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-shell/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/launcher-shell/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/logging-scribe/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/logging-scribe/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/logging-scribe/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/logging-scribe/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store-webapp/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/store/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jaxrs/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jaxrs/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jaxrs/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jms/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-js-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-js-client/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-js-client/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-js-client/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsf/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsf/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsf/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsf/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-jsp/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-servlet/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-stripes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-stripes/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-stripes/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-stripes/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>

Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld/pom.xml?rev=967108&r1=967107&r2=967108&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld/pom.xml Fri Jul 23 14:30:42 2010
@@ -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>