21 files changed, 34 insertions, 9 deletions
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/README b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/README
index fb5afcc7ec..fb5afcc7ec 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/README
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/README
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/build.xml b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml
index c5d4957688..c5d4957688 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/calculator.odg b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.odg
index c2646f7d5e..c2646f7d5e 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/calculator.odg
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.odg
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/calculator.png b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.png
index 476306e5f0..476306e5f0 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/calculator.png
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.png
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/pom.xml b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml
index a395a8d674..06662b1d08 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>sample-binding-ws-calculator</artifactId>
-    <name>Apache Tuscany SCA Sample Binding WS Calculator</name>
+    <artifactId>sample-contribution-binding-ws-calculator</artifactId>
+    <name>Apache Tuscany SCA Sample Binding WS Calculator Contribution</name>
 
     <repositories>
        <repository>
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite
index ac4d7321e7..ac4d7321e7 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sca-java-2.x/trunk/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml b/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
index 90a4d9b2c5..1b67df3b7e 100644
--- a/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
+++ b/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
@@ -54,7 +54,7 @@
 		<echo>Please use 'ant run-name-of-sample-contribution-to-run' </echo>
     </target>
 
-    <target name="run-binding-ws-calculator" depends="compile">
+    <target name="run-contribution-binding-ws-calculator" depends="compile">
         <java classname="${main.class}"
               fork="true"
         	  failonerror="true">
@@ -64,7 +64,7 @@
                    <include name="tuscany-sca-manifest.jar" />
                 </fileset>
             </classpath> 
-        	<arg value="binding-ws-calculator"/> 
+        	<arg value="contribution-binding-ws-calculator"/> 
         </java>    	
     </target>
 
diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
index c9c113a2dc..7249e92f43 100644
--- a/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
+++ b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
@@ -41,12 +41,12 @@ public class SampleJSELauncher {
         if (args == null || args.length != 1){
             System.out.println("Please provide the name of the sample contribution to run as a parameter");
             System.out.println("Running binding-ws-calculator by default");
-            contribution = "binding-ws-calculator";
+            contribution = "contribution-binding-ws-calculator";
         } else {
             contribution = args[0];
         }   
         
-        if (contribution.equals("binding-ws-calculator")){
+        if (contribution.equals("contribution-binding-ws-calculator")){
             launcher.launchBindingWSCalculator();
         } else {
             System.out.println("Sample contribution " + contribution + "not found");
@@ -65,11 +65,13 @@ public class SampleJSELauncher {
     }
     
     public void launchBindingWSCalculator(){
-        Node node = startNode(new Contribution("c1", "../binding-ws-calculator/target/classes"));
+        Node node = startNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/classes"));
         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
         
         // TODO - could use JUnit assertions but don't want to have to handle JUnit dependency from Ant script
-        if (calculator.add(3, 2) != 5.0){
+        double result = calculator.add(3, 2);
+        System.out.println("3 + 2 = " + result);
+        if (result != 5.0){
             throw new SampleLauncherException();
         }
         
diff --git a/sca-java-2.x/trunk/samples/pom.xml b/sca-java-2.x/trunk/samples/pom.xml
index abe7c4207d..d82c394de6 100644
--- a/sca-java-2.x/trunk/samples/pom.xml
+++ b/sca-java-2.x/trunk/samples/pom.xml
@@ -43,7 +43,6 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>binding-ws-calculator</module>
                 <module>calculator</module>
                 <module>calculator-equinox</module>
                 <module>calculator-osgi</module>
@@ -76,6 +75,30 @@
                 <module>webapps/helloworld-jsp</module>
                 <module>webapps/helloworld-stripes</module>
                 <module>webapps/helloworld-servlet</module>
+
+                <!-- contributions - SCA samples -->
+
+                <module>contribution-binding-ws-calculator</module>
+
+                <!-- contributions - Tuscany samples -->
+
+                <!-- TODO -->
+
+                <!-- contribution launchers -->
+
+                <!-- don't need to process this as it has just a README in it
+                <module>launcher-command-line</module>
+                -->
+                <module>launcher-embedded-jse</module>
+
+                <!-- don't add yet
+                <module>launcher-embedded-osgi</module>
+                -->
+
+                <!-- Application samples -->
+
+                <!-- TODO -->
+
             </modules>
         </profile>
     </profiles>