You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/10/21 21:31:49 UTC

svn commit: r1026113 - in /tuscany/sca-java-2.x/trunk: samples/extending-tuscany/binding-sample/ samples/getting-started/callback-api/ samples/getting-started/helloworld-contribution/ samples/getting-started/sca-scopes/ samples/getting-started/scdl-inc...

Author: slaws
Date: Thu Oct 21 19:31:47 2010
New Revision: 1026113

URL: http://svn.apache.org/viewvc?rev=1026113&view=rev
Log:
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. 

Modified:
    tuscany/sca-java-2.x/trunk/samples/extending-tuscany/binding-sample/pom.xml
    tuscany/sca-java-2.x/trunk/samples/getting-started/callback-api/pom.xml
    tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml
    tuscany/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculatorAsync.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
    tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java

Modified: tuscany/sca-java-2.x/trunk/samples/extending-tuscany/binding-sample/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/extending-tuscany/binding-sample/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/extending-tuscany/binding-sample/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/extending-tuscany/binding-sample/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/getting-started/callback-api/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/callback-api/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/getting-started/callback-api/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/getting-started/callback-api/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/getting-started/sca-scopes/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml Thu Oct 21 19:31:47 2010
@@ -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">

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml Thu Oct 21 19:31:47 2010
@@ -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>
 

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java Thu Oct 21 19:31:47 2010
@@ -41,7 +41,7 @@ public class JSELauncherBindingJSONRPCCa
      * 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");

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java Thu Oct 21 19:31:47 2010
@@ -39,8 +39,8 @@ public class JSELauncherBindingRMICalcul
 
     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();

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java Thu Oct 21 19:31:47 2010
@@ -41,7 +41,7 @@ public class JSELauncherBindingSCACalcul
      * 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");

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java Thu Oct 21 19:31:47 2010
@@ -41,7 +41,7 @@ public class JSELauncherBindingWSCalcula
      * 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");

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java Thu Oct 21 19:31:47 2010
@@ -37,7 +37,7 @@ public class JSELauncherImplementationJa
     }
     
     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();

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculatorAsync.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculatorAsync.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculatorAsync.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculatorAsync.java Thu Oct 21 19:31:47 2010
@@ -35,7 +35,7 @@ public class JSELauncherImplementationJa
     }
     
     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();

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java Thu Oct 21 19:31:47 2010
@@ -41,7 +41,7 @@ public class JSELauncherImplementationSc
      * 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");

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java Thu Oct 21 19:31:47 2010
@@ -64,7 +64,7 @@ public class SampleJSELauncher extends R
      * 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 R
      * 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");
                

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java Thu Oct 21 19:31:47 2010
@@ -40,7 +40,7 @@ public class SampleOSGILauncherBindingSC
         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);
     }
     

Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java Thu Oct 21 19:31:47 2010
@@ -41,7 +41,7 @@ public class SampleOSGILauncherBindingWS
         
         // 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");
                

Modified: tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java?rev=1026113&r1=1026112&r2=1026113&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java Thu Oct 21 19:31:47 2010
@@ -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);