18 files changed, 37 insertions, 36 deletions
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
index b12fd1bf15..5d569c62d9 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>helloworld-bpel</artifactId>
+            <artifactId>sample-helloworld-bpel-webapp</artifactId>
             <type>war</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>        
@@ -115,7 +115,7 @@
                         <deployables>
                            <deployable>
                               <groupId>org.apache.tuscany.sca</groupId>
-                              <artifactId>helloworld-bpel</artifactId>
+                              <artifactId>sample-helloworld-bpel-webapp</artifactId>
                               <type>war</type>
                               <properties>
                                  <context>helloworld-bpel</context>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
index c7013ce853..cee3467c8f 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>helloworld-jms</artifactId>
+            <artifactId>sample-helloworld-jms-webapp</artifactId>
             <type>war</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -207,7 +207,7 @@
                         <deployables>
                             <deployable>
                                 <groupId>org.apache.tuscany.sca</groupId>
-                                <artifactId>helloworld-jms</artifactId>
+                                <artifactId>sample-helloworld-jms-webapp</artifactId>
                                 <type>war</type>
                                 <properties>
                                     <context>helloworld-jms</context>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
index d5da35e2be..ddda9b7ad0 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>helloworld-js-client</artifactId>
+            <artifactId>sample-helloworld-js-client-webapp</artifactId>
             <type>war</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -179,7 +179,7 @@
                         <deployables>
                             <deployable>
                                 <groupId>org.apache.tuscany.sca</groupId>
-                                <artifactId>helloworld-js-client</artifactId>
+                                <artifactId>sample-helloworld-js-client-webapp</artifactId>
                                 <type>war</type>
                                 <properties>
                                     <context>helloworld-js-client</context>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
index 06b862058f..e2b75e9c71 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>helloworld-jsf</artifactId>
+            <artifactId>sample-helloworld-jsf-webapp</artifactId>
             <type>war</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>        
@@ -121,7 +121,7 @@
                         <deployables>
                            <deployable>
                               <groupId>org.apache.tuscany.sca</groupId>
-                              <artifactId>helloworld-jsf</artifactId>
+                              <artifactId>sample-helloworld-jsf-webapp</artifactId>
                               <type>war</type>
                               <properties>
                                  <context>helloworld-jsf</context>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
index 2d9f1153ef..b1cfc6492a 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>helloworld-jsp</artifactId>
+            <artifactId>sample-helloworld-jsp-webapp</artifactId>
             <type>war</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -179,7 +179,7 @@
                         <deployables>
                             <deployable>
                                 <groupId>org.apache.tuscany.sca</groupId>
-                                <artifactId>helloworld-jsp</artifactId>
+                                <artifactId>sample-helloworld-jsp-webapp</artifactId>
                                 <type>war</type>
                                 <properties>
                                     <context>helloworld-jsp</context>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
index 9c3342d6fb..04f43a54cd 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>helloworld-servlet</artifactId>
+            <artifactId>sample-helloworld-servlet-webapp</artifactId>
             <type>war</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -179,7 +179,7 @@
                         <deployables>
                             <deployable>
                                 <groupId>org.apache.tuscany.sca</groupId>
-                                <artifactId>helloworld-servlet</artifactId>
+                                <artifactId>sample-helloworld-servlet-webapp</artifactId>
                                 <type>war</type>
                                 <properties>
                                     <context>helloworld-servlet</context>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
index 04294f4fa9..578e490a8f 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>helloworld-stripes</artifactId>
+            <artifactId>sample-helloworld-stripes-webapp</artifactId>
             <type>war</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>        
@@ -115,7 +115,7 @@
                         <deployables>
                            <deployable>
                               <groupId>org.apache.tuscany.sca</groupId>
-                              <artifactId>helloworld-stripes</artifactId>
+                              <artifactId>sample-helloworld-stripes-webapp</artifactId>
                               <type>war</type>
                               <properties>
                                  <context>helloworld-stripes</context>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
index 68dc0fe382..bf1f8cc335 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>helloworld</artifactId>
+            <artifactId>sample-helloworld-webapp</artifactId>
             <type>war</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>        
@@ -114,7 +114,7 @@
                         <deployables>
                            <deployable>
                               <groupId>org.apache.tuscany.sca</groupId>
-                              <artifactId>helloworld</artifactId>
+                              <artifactId>sample-helloworld-webapp</artifactId>
                               <type>war</type>
                               <pingURL>http://localhost:8085/helloworld</pingURL>
                            </deployable>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml
index dad495c13a..d894f293d9 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml
@@ -28,7 +28,7 @@
           <relativePath>../../pom.xml</relativePath>
       </parent>
 
-      <artifactId>helloworld-bpel</artifactId>
+      <artifactId>sample-helloworld-bpel-webapp</artifactId>
       <packaging>war</packaging>
       <name>Apache Tuscany SCA Sample Helloworld BPEL</name>
 
@@ -89,7 +89,7 @@
 	</dependencies>
 
 	<build>
-         <finalName>${artifactId}</finalName>
+         <finalName>helloworld-bpel</finalName>
 
          <plugins>
             <plugin>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml
index 4e45d20d5c..5f513cbbef 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>helloworld-jms</artifactId>
+    <artifactId>sample-helloworld-jms-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Sample JMS HelloWorld in a WebApp</name>
 
@@ -58,6 +58,7 @@
             <version>5.1.0</version>
             <scope>runtime</scope>
         </dependency>
+        
         <dependency>
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
@@ -67,7 +68,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>helloworld-jms</finalName>
        <plugins>
           <plugin>
              <groupId>org.mortbay.jetty</groupId>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
index a85e72b925..31a5671066 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>helloworld-js-client</artifactId>
+    <artifactId>sample-helloworld-js-client-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Sample Helloworld Javascript Client</name>
 
@@ -49,7 +49,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>helloworld-js-client</finalName>
           <plugins>
              <plugin>
                 <groupId>org.mortbay.jetty</groupId>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml
index e9093cc098..e9608d6191 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>helloworld-jsf</artifactId>
+    <artifactId>sample-helloworld-jsf-webapp</artifactId>
     <name>Apache Tuscany SCA Sample Helloworld JSF</name>
     <packaging>war</packaging>
 
@@ -56,7 +56,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>helloworld-jsf</finalName>
        <plugins>
           <plugin>
              <groupId>org.mortbay.jetty</groupId>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml
index 88773913a5..1da19c2c3d 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>helloworld-jsp</artifactId>
+    <artifactId>sample-helloworld-jsp-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Sample Helloworld JSP</name>
 
@@ -49,7 +49,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>helloworld-jsp</finalName>
        <plugins>
           <plugin>
              <groupId>org.mortbay.jetty</groupId>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml
index 0bb7a58812..ec16478ac7 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml
@@ -25,7 +25,7 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>helloworld-rest</artifactId>
+    <artifactId>sample-helloworld-rest-webapp</artifactId>
     <packaging>war</packaging>
     <name>HelloWorld RESTFul Web Application</name>
 
@@ -105,7 +105,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>helloworld-rest</finalName>
     </build>
 
 </project>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml
index 7c60031b6f..e737d7f8b0 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>helloworld-servlet</artifactId>
+    <artifactId>sample-helloworld-servlet-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Sample Helloworld Servlet</name>
 
@@ -48,7 +48,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>helloworld-servlet</finalName>
        <plugins>
           <plugin>
              <groupId>org.mortbay.jetty</groupId>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml
index ec5cb600ea..261fed768c 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>helloworld-stripes</artifactId>
+    <artifactId>sample-helloworld-stripes-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Sample Helloworld using Stripes</name>
 
@@ -59,7 +59,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>helloworld-stripes</finalName>
        <plugins>
           <plugin>
              <groupId>org.mortbay.jetty</groupId>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml
index 82f08f1e41..25e30c136c 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>helloworld-wicket</artifactId>
+    <artifactId>sample-helloworld-wicket-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Sample Helloworld using Wicket</name>
 
@@ -70,7 +70,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>helloworld-wicket</finalName>
        <plugins>
           <plugin>
              <groupId>org.mortbay.jetty</groupId>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml
index 1d8a7d3a72..627ca062d3 100644
--- a/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>helloworld</artifactId>
+    <artifactId>sample-helloworld-webapp</artifactId>
     <name>Apache Tuscany SCA Sample Helloworld</name>
     <packaging>war</packaging>
 
@@ -49,7 +49,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>helloworld</finalName>
        <plugins>
           <plugin>
              <groupId>org.mortbay.jetty</groupId>