A bit of name tidying to make the docs a little more consistent. Still a few that are odd, e.g. the dosgi ones but getting better.

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

56 files changed, 103 insertions, 97 deletions

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 233e558ba7..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
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>binding-sample</artifactId>
+    <artifactId>sample-binding-extension</artifactId>
     <name>Apache Tuscany SCA Sample Binding Extension</name>
 
     <dependencies>
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 446c7330d7..6d0515a003 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
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>sample-callback-api</artifactId>
-    <name>Apache Tuscany SCA Sample Callback API</name>
+    <artifactId>sample-callback-api-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample Callback API Contribution</name>
 
     <dependencies>
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
index bd95e76268..30f5a1c4ec 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
@@ -27,7 +27,7 @@
     </parent>

 

     <packaging>jar</packaging>

-    <artifactId>helloworld-contribution</artifactId>

+    <artifactId>sample-helloworld-contribution</artifactId>

     <name>Apache Tuscany SCA Samples - Getting Started - helloworld-contribution</name>

 

     <dependencies>

diff --git a/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml b/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml
index 6345f54e2a..318763759f 100644
--- a/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <name>Apache Tuscany SCA Sample Scopes</name>
-    <artifactId>sample-sca-scopes</artifactId>
+    <name>Apache Tuscany SCA Sample SCA Scopes Contribution</name>
+    <artifactId>sample-sca-scopes-contribution</artifactId>
 
     <dependencies>
          <dependency>
diff --git a/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml b/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml
index 27927999c5..ee18154669 100644
--- a/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml
@@ -27,8 +27,8 @@
     </parent>

 

     <packaging>zip</packaging>

-    <artifactId>scdl-include-contribution</artifactId>

-    <name>Apache Tuscany SCA Samples - Getting Started - scdl-include-contribution</name>

+    <artifactId>sample-scdl-include-contribution</artifactId>

+    <name>Apache Tuscany SCA Sample include Composite Contribution</name>

 

     <dependencies>

         <dependency>

diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
index a0f60bcf6b..9cd866d6bb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>sample-contribution-implementation-java-calculator-async</artifactId>
-    <name>Apache Tuscany SCA Sample Contribution Implementation Java Calculator for Async Sample</name>
+    <artifactId>sample-implementation-java-calculator-async-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample implementation.java Calculator Async Contribution</name>
 
     <dependencies>
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
index 0d37ef89aa..8cb729e00d 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
@@ -27,10 +27,10 @@
 	</parent>

 

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

-	<artifactId>sample-binding-comet</artifactId>

+	<artifactId>sample-binding-comet-weather-webapp</artifactId>

 	<packaging>war</packaging>

 	<version>1.0</version>

-	<name>Apache Tuscany SCA Sample binding.comet</name>

+	<name>Apache Tuscany SCA Sample binding.comet Weather Webapp</name>

 

 	<dependencies>

 		<dependency>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
index dbc3cd82a0..ec59d4f0a0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
@@ -26,9 +26,9 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>sample-helloworld-jms-webapp</artifactId>
+    <artifactId>sample-binding-jms-helloworld-webapp</artifactId>
     <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample JMS HelloWorld in a WebApp</name>
+    <name>Apache Tuscany SCA Sample binding.jms HelloWorld WebApp</name>
 
     <dependencies>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml
index 7d0ce122dd..7de780121d 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml
@@ -17,9 +17,9 @@
  * under the License.    

 -->

 

-<project name="calculator" default="compile">

+<project name="sample-binding-jsonrpc-calculator-contribution" default="compile">

     <property name="tuscany.home" value="../../.."/>

-    <property name="jar.name"   value="sample-contribution-binding-sca-calculator.jar" />

+    <property name="jar.name"   value="sample-binding-jsonrpc-calculator-contribution.jar" />

     

     <echo>${tuscany.home}</echo>

 

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
index 7e08ce52be..2d770ccd19 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>

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

     </parent>

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

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

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

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

 

     <dependencies>

         <dependency>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
index 586937b5e5..2fa51a4656 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>

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

     </parent>

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

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

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

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

     <packaging>war</packaging>

 

     <dependencies>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml
index 4bde8a31bf..06f6ba8730 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml
@@ -17,10 +17,10 @@
  * under the License.    
 -->
 
-<project name="contribution-binding-rmi-calculator-reference" default="compile">
+<project name="sample-binding-rmi-calculator-reference-contribution" default="compile">
 
     <property name="tuscany.home" value="../../../.."/>
-    <property name="jar.name"   value="contribution-calculator-reference.jar" />
+    <property name="jar.name"   value="sample-binding-rmi-calculator-reference-contribution.jar" />
     
     <echo>${tuscany.home}</echo>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
index c10d764ff1..fd2fb1683c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>sample-contribution-binding-rmi-calculator-reference</artifactId>
-    <name>Apache Tuscany SCA Sample Contribution binding-rmi Calculator Reference</name>
+    <artifactId>sample-binding-rmi-calculator-reference-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample binding.rmi Calculator Reference Contribution</name>
 
     <dependencies>
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml
index d155649159..79ec168c8a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml
@@ -17,10 +17,10 @@
  * under the License.    
 -->
 
-<project name="contribution-binding-rmi-calculator-service" default="compile">
+<project name="sample-binding-rmi-calculator-service-contribution" default="compile">
 
     <property name="tuscany.home" value="../../../.."/>
-    <property name="jar.name"   value="contribution-calculator-service.jar" />
+    <property name="jar.name"   value="sample-binding-rmi-calculator-service-contribution.jar" />
     
     <echo>${tuscany.home}</echo>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
index 5cd39e96bb..9a719441e0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>sample-contribution-binding-rmi-calculator-service</artifactId>
-    <name>Apache Tuscany SCA Sample Contribution binding-rmi Calculator Service</name>
+    <artifactId>sample-binding-rmi-calculator-service-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample binding.rmi Calculator Service Contribution</name>
 
     <dependencies>
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml
index 593e1ba7a4..8fef755c8b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml
@@ -17,9 +17,9 @@
  * under the License.    
 -->
 
-<project name="calculator" default="compile">
+<project name="sample-binding-sca-calculator-contribution" default="compile">
     <property name="tuscany.home" value="../../../.."/>
-    <property name="jar.name"   value="sample-contribution-binding-sca-calculator.jar" />
+    <property name="jar.name"   value="sample-binding-sca-calculator-contribution.jar" />
     
     <echo>${tuscany.home}</echo>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
index c877155853..3b4e03ddcc 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>sample-contribution-binding-sca-calculator</artifactId>
-    <name>Apache Tuscany SCA Sample Contribution binding-sca Calculator</name>
+    <artifactId>sample-binding-sca-calculator-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample binding.sca Calculator Contribution</name>
 
     <dependencies>
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml
index dcb1193e3b..ab27460ea9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<project name="binding-ws-calculator" default="compile"> 

+<project name="sample-binding-ws-calculator-contribution" default="compile"> 

 	<property name="tuscany.home" value="../../../.."/>

-    <property name="jar.name"   value="sample-contribution-binding-ws-calculator.jar" />

+    <property name="jar.name"   value="sample-binding-ws-calculator-contribution.jar" />

 	

 	<echo>${tuscany.home}</echo>

 

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
index a177a043d5..c436b2288a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>

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

     </parent>

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

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

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

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

 

     <dependencies>

         <dependency>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
index c5bf5ff186..3ab5472638 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>sample-helloworld-ws-sdo</artifactId>
-    <name>Apache Tuscany SCA Sample HelloWorld Web Service SDO</name>
+    <artifactId>sample-binding-ws-helloworld-ws-sdo-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample binding.ws HelloWorld Web Service SDO Contribution</name>
 
     <dependencies>
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
index 877bbccde1..c52aac5e6d 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>sample-dosgi-dynamic-calculator-operations</artifactId>
-    <name>Apache Tuscany SCA OSGi Remote Services Dynamic Calculator Operations Sample</name>
+    <name>Apache Tuscany SCA Sample OSGi Remote Services Dynamic Calculator Operations</name>
 
     <dependencies>
        <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
index 1614d5abf6..fadfdff1ab 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>sample-dosgi-dynamic-calculator</artifactId>
-    <name>Apache Tuscany SCA OSGi Remote Services Dynamic Calculator Sample</name>
+    <name>Apache Tuscany SCA Sample OSGi Remote Services Dynamic Calculator</name>
 
     <dependencies>
        <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml
index 008953e63b..d94388f466 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<project name="sample-helloworld-bpel" default="compile">
+<project name="sample-implementation-bpel-helloworld-contribution" default="compile">
     <property name="test.class"   value="helloworld.BPELClient" />
-    <property name="test.jar"     value="sample-helloworld-bpel.jar" />
+    <property name="test.jar"     value="sample-implementation-bpel-helloworld-contribution.jar" />
     <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" />
 
     <target name="init">
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
index f1bf7820da..8f7a97c555 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
@@ -27,8 +27,8 @@
     </parent>
 
     <packaging>zip</packaging>
-    <artifactId>sample-helloworld-bpel</artifactId>
-    <name>Apache Tuscany SCA Sample HelloWorld BPEL</name>
+    <artifactId>sample-implementation-bpel-helloworld-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample implementation.bpel HelloWorld Contribution</name>
 
     <dependencies>
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
index 1ca3770b74..e17919fd4c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
@@ -28,9 +28,9 @@
         <relativePath>../../pom.xml</relativePath>

       </parent>

 

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

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

       <packaging>war</packaging>

-      <name>Apache Tuscany SCA Sample Helloworld BPEL</name>

+      <name>Apache Tuscany SCA Sample implementation.bpel Helloworld WebApp</name>

 

 	<properties>

 		<tuscany.version>2.0-SNAPSHOT</tuscany.version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
index d2609d0883..253d0c949a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
@@ -27,8 +27,8 @@
     </parent>

 

     <packaging>zip</packaging>

-    <artifactId>sample-helloworld-recursive-ws</artifactId>

-    <name>Apache Tuscany SCA Sample Helloworld using recursive composition and a Web Service</name>

+    <artifactId>sample-implementation-composite-helloworld-ws-contribution</artifactId>

+    <name>Apache Tuscany SCA Sample implemenation.composite Helloworld WS Contribution</name>

 

     <dependencies>

         <dependency>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
index 4326970c33..509714c5cd 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
@@ -27,8 +27,8 @@
     </parent>

 

     <packaging>zip</packaging>

-    <artifactId>sample-helloworld-recursive</artifactId>

-    <name>Apache Tuscany SCA Sample Helloworld using recursive composition</name>

+    <artifactId>sample-implementation-composite-helloworld-contribution</artifactId>

+    <name>Apache Tuscany SCA Sample implementation.composite Helloworld Contribution</name>

 

     <dependencies>

         <dependency>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml
index 46ff617b30..21dd4db482 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml
@@ -17,10 +17,10 @@
  * under the License.    

 -->

 	

-<project name="implementation-java-calculator" default="compile"> 

+<project name="sample-implementation-java-calculator-contribution" default="compile"> 

     

     <property name="tuscany.home" value="../../../.."/>

-    <property name="jar.name"   value="contribution-implementation-java-calculator.jar" />

+    <property name="jar.name"   value="sample-implementation-java-calculator-contribution.jar" />

     

     <echo>${tuscany.home}</echo>

 

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
index c3e4ba4208..8008b97488 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>

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

     </parent>

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

-    <name>Apache Tuscany SCA Sample Contribution Implementation Java Calculator</name>

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

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

 

     <dependencies>

         <dependency>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
index 075462b253..13525a8cc8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>sample-dosgi-calculator-operations</artifactId>
-    <name>Apache Tuscany SCA OSGi Remote Services Calculator Operations Sample</name>
+    <name>Apache Tuscany SCA Sample OSGi Remote Services Calculator Operations</name>
 
     <dependencies>
        <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
index 2e06ff7e05..18c7b7dc60 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>sample-dosgi-calculator</artifactId>
-    <name>Apache Tuscany SCA OSGi Remote Services Calculator Sample</name>
+    <name>Apache Tuscany SCA Sample OSGi Remote Services Calculator</name>
 
     <dependencies>
        <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml
index 91285fdbca..837e3b6716 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml
@@ -17,9 +17,9 @@
  * under the License.    

 -->

 

-<project name="calculator" default="compile">

+<project name="sample-implementation-script-calculator-contribution" default="compile">

     <property name="tuscany.home" value="../../.."/>

-    <property name="jar.name"   value="sample-contribution-implementation-script-calculator.jar" />

+    <property name="jar.name"   value="sample-implementation-script-calculator-contribution.jar" />

     

     <echo>${tuscany.home}</echo>

 

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
index 61c864a4f0..65436d1cea 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>

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

     </parent>

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

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

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

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

 

     <dependencies>

         <dependency>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
index 9e42ad8ac8..9f3660b00f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
@@ -26,8 +26,8 @@
         <relativePath>../pom.xml</relativePath>

     </parent>

 

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

-    <name>Apache Tuscany SCA Sample HelloWorld using Spring</name>

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

+    <name>Apache Tuscany SCA Sample implemenation.spring HelloWorld Contribution</name>

 

     <dependencies>

         <dependency>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
index e5f3b59776..e0f6dad543 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
@@ -26,8 +26,8 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>sample-helloworld-spring-webapp</artifactId>
-    <name>Apache Tuscany SCA Sample Spring Helloworld</name>
+    <artifactId>sample-implementation-spring-helloworld-webapp</artifactId>
+    <name>Apache Tuscany SCA Sample implementation.spring Helloworld WebApp</name>
     <packaging>war</packaging>
 
     <dependencies>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
index d9194a102c..74a12d6309 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
@@ -26,9 +26,9 @@
         <relativePath>../../pom.xml</relativePath>

     </parent>

 

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

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

     <packaging>war</packaging>

-    <name>Apache Tuscany SCA Sample Helloworld JAX-RS</name>

+    <name>Apache Tuscany SCA Sample implemenation.web Helloworld JAX-RS WebApp</name>

 

     <dependencies>

 

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
index ecd04d6d5d..b0801d79f2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
@@ -26,9 +26,9 @@
         <relativePath>../../pom.xml</relativePath>

     </parent>

 

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

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

     <packaging>war</packaging>

-    <name>Apache Tuscany SCA Sample Helloworld Javascript Client</name>

+    <name>Apache Tuscany SCA Sample implemenation.web Helloworld Javascript Client WebApp</name>

 

     <dependencies>

 

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
index 6f2b820e4c..cbda8bc601 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
@@ -26,8 +26,8 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>sample-helloworld-jsf-webapp</artifactId>
-    <name>Apache Tuscany SCA Sample Helloworld JSF</name>
+    <artifactId>sample-implementation-web-helloworld-jsf-webapp</artifactId>
+    <name>Apache Tuscany SCA Sample implemenation.web Helloworld JSF WebApp</name>
     <packaging>war</packaging>
 
     <dependencies>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
index f871af8cf5..66478f9963 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
@@ -26,9 +26,9 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>sample-helloworld-jsp-webapp</artifactId>
+    <artifactId>sample-implementation-web-helloworld-jsp-webapp</artifactId>
     <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld JSP</name>
+    <name>Apache Tuscany SCA Sample implemenation-web Helloworld JSP WebApp</name>
 
     <dependencies>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
index d4dbe9eb6e..d812ddb186 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
@@ -26,9 +26,9 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>sample-helloworld-servlet-webapp</artifactId>
+    <artifactId>sample-implementation-web-helloworld-servlet-webapp</artifactId>
     <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld Servlet</name>
+    <name>Apache Tuscany SCA Sample implementation.web Helloworld Servlet WebApp</name>
 
     <dependencies>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
index f3c62210ef..c264235b47 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
@@ -26,9 +26,9 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>sample-helloworld-stripes-webapp</artifactId>
+    <artifactId>sample-implementation-web-helloworld-stripes-webapp</artifactId>
     <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld using Stripes</name>
+    <name>Apache Tuscany SCA Sample implementation.web Helloworld Stripes WebApp</name>
 
     <dependencies>
 
@@ -39,6 +39,12 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-stripes</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
         <!--  Stripes Framework dependencies -->
         <dependency>
             <groupId>net.sourceforge.stripes</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml
index 34f37873f1..924d9f7c3b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>sample-calculator-osgi</artifactId>
-    <name>Apache Tuscany SCA Sample Calculator OSGi</name>
+    <artifactId>sample-maven-osgi-junit-calculator-osgi</artifactId>
+    <name>Apache Tuscany SCA Sample Maven OSGI JUnit Calculator OSGi</name>
 
     <dependencies>
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml
index 9cedf7ec07..5afd616604 100644
--- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>sample-calculator-rest-osgi</artifactId>
-    <name>Apache Tuscany SCA Sample Calculator REST OSGi</name>
+    <artifactId>sample-maven-osgi-junit-calculator-rest-osgi</artifactId>
+    <name>Apache Tuscany SCA Sample Maven OSGi JUnit Calculator REST OSGi</name>
 
 	<dependencies>
 		<dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
index 701eca43ac..1e3c23aec1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
@@ -26,8 +26,8 @@
         <relativePath>../pom.xml</relativePath>

     </parent>

 

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

-    <name>Apache Tuscany SCA Sample Calculator SCAClient</name>

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

+    <name>Apache Tuscany SCA Sample SCA Client Calculator</name>

 

     <dependencies>

 

diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
index de22d49ddd..88cfc7e094 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
@@ -26,8 +26,8 @@
         <relativePath>../pom.xml</relativePath>

     </parent>

 

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

-    <name>Apache Tuscany SCA Sample Helloworld SCAClient</name>

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

+    <name>Apache Tuscany SCA Sample SCA Client Helloworld </name>

 

     <dependencies>

 

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
index c898f6b7c6..b4ef6b6ea7 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
@@ -41,7 +41,7 @@ public class JSELauncherBindingJSONRPCCalculator {
      * Using the Tuscany Node API to get a local service proxy

      */

     public void launchBindingSCACalculator(){

-        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../binding-jsonrpc/calculator-contribution/target/sample-contribution-binding-jsonrpc-calculator.jar"));

+        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../binding-jsonrpc/calculator-contribution/target/sample-binding-jsonrpc-calculator-contribution.jar"));

         node.start();

         

         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
index 0ac295d252..b3c99edfa1 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
@@ -39,8 +39,8 @@ public class JSELauncherBindingRMICalculator {
 
     public void launchBindingRMICalculator(){
     	
-        Node node1 = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-rmi/calculator-service-contribution/target/sample-contribution-binding-rmi-calculator-service.jar"));       
-        Node node2 = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-rmi/calculator-reference-contribution/target/sample-contribution-binding-rmi-calculator-reference.jar"));
+        Node node1 = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-rmi/calculator-service-contribution/target/sample-binding-rmi-calculator-service-contribution.jar"));       
+        Node node2 = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-rmi/calculator-reference-contribution/target/sample-binding-rmi-calculator-reference-contribution.jar"));
         
         node1.start();
         node2.start();
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
index de48e5245d..43de9e646f 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
@@ -41,7 +41,7 @@ public class JSELauncherBindingSCACalculator {
      * Using the Tuscany Node API to get a local service proxy
      */
     public void launchBindingSCACalculator(){
-        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar"));
+        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-binding-sca-calculator-contribution.jar"));
         node.start();
         
         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
index afcc338130..7c212a75dd 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
@@ -41,7 +41,7 @@ public class JSELauncherBindingWSCalculator {
      * Using the Tuscany Node API to get a local service proxy

      */

     public void launchBindingWSCalculator(){

-        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-contribution-binding-ws-calculator.jar"));

+        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-binding-ws-calculator-contribution.jar"));

         node.start();

         

         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
index ecc747a1fa..6e865f3822 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
@@ -37,7 +37,7 @@ public class JSELauncherImplementationJavaCalculator {
     }
     
     public void launchImplementationJavaCalculator(){
-        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/implementation-java/calculator-contribution/target/sample-contribution-implementation-java-calculator.jar"));
+        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/implementation-java/calculator-contribution/target/sample-implementation-java-calculator-contribution.jar"));
         node.start();
         
         node.stop();
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculatorAsync.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculatorAsync.java
index 98c537c406..98cab93b5f 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculatorAsync.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculatorAsync.java
@@ -35,7 +35,7 @@ public class JSELauncherImplementationJavaCalculatorAsync {
     }

     

     public void launchImplementationJavaCalculator(){

-        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/async/calculator-contribution/target/sample-contribution-implementation-java-calculator-async.jar"));

+        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/async/calculator-contribution/target/sample-implementation-java-calculator-async-contribution.jar"));

         node.start();

         

         node.stop();

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
index 70bd07649f..4f6e951671 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
@@ -41,7 +41,7 @@ public class JSELauncherImplementationScriptCalculator {
      * Using the Tuscany Node API to get a local service proxy

      */

     public void launchImplementationScriptCalculator(){

-        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/implementation-script/calculator-contribution/target/sample-contribution-implementation-script-calculator.jar"));

+        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/implementation-script/calculator-contribution/target/sample-implementation-script-calculator-contribution.jar"));

         node.start();

         

         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
index 3df1418604..4d8ea7f86a 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
@@ -64,7 +64,7 @@ public class SampleJSELauncher extends RuntimeIntegration {
      * that calls the CalculatorServiceComponent from an operation marked by @Init. 
      */
     public void launchBindingSCACalculator(){
-        Node node = startNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar"));
+        Node node = startNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-binding-sca-calculator-contribution.jar"));
         
         stopNode(node);
     }    
@@ -73,7 +73,7 @@ public class SampleJSELauncher extends RuntimeIntegration {
      * Using a Tuscany specific mechanism for getting at local service proxies
      */
     public void launchBindingWSCalculator() throws NoSuchDomainException, NoSuchServiceException{
-        Node node = startNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-contribution-binding-ws-calculator.jar"));
+        Node node = startNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-binding-ws-calculator-contribution.jar"));
         
         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
                
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
index eb196a0a07..66830622fe 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
@@ -40,7 +40,7 @@ public class SampleOSGILauncherBindingSCA extends RuntimeIntegration {
         SampleOSGILauncherBindingSCA launcher = new SampleOSGILauncherBindingSCA();
  
         
-        Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar"));
+        Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-binding-sca-calculator-contribution.jar"));
         launcher.stopNode(node);
     }
     
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
index b53dd9e90e..c9299f79b8 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
@@ -41,7 +41,7 @@ public class SampleOSGILauncherBindingWS extends RuntimeIntegration {
         
         // launcher.launchBindingWSCalculator();
         
-        Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-contribution-binding-ws-calculator.jar"));
+        Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-binding-ws-calculator-contribution.jar"));
         
         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
                
diff --git a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
index 6b3759c532..50587caf27 100644
--- a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
@@ -47,7 +47,7 @@ public class ContributionTestCase {
     @Test

     public void testRead() throws Exception {

         Deployer deployer = new DefaultDeployer();

-        File file = new File("../../../samples/learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar");

+        File file = new File("../../../samples/learning-more/binding-sca/calculator-contribution/target/sample-binding-sca-calculator-contribution.jar");

         URL url = file.toURI().toURL();

         Monitor monitor = deployer.createMonitor();

         Contribution contribution = deployer.loadContribution(url.toURI(), url, monitor);