Update to match sample names

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

6 files changed, 9 insertions, 9 deletions

diff --git a/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml b/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml
index 53c86ac3aa..69b6ba7817 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml
@@ -63,9 +63,9 @@
                 <exclude>learning-more/implementation-webapp/*/target/**/*</exclude>
                 <exclude>learning-more/implementation-bpel/helloworld-bpel-webapp/target</exclude>
                 <exclude>learning-more/implementation-bpel/helloworld-bpel-webapp/target/**/*</exclude>
-                <exclude>learning-more/binding-jsonrpc/contribution-calculator-webapp/target/**/*</exclude>
-                <exclude>learning-more/binding-jsonrpc/contribution-calculator-webapp/target</exclude>
-                <exclude>learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/dojo/**/*</exclude>
+                <exclude>learning-more/binding-jsonrpc/calculator-webapp/target/**/*</exclude>
+                <exclude>learning-more/binding-jsonrpc/calculator-webapp/target</exclude>
+                <exclude>learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/dojo/**/*</exclude>
             </excludes>
         </fileSet>
     </fileSets>
diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml
index f5fa075ba4..b3fe651c36 100644
--- a/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml
@@ -31,9 +31,9 @@
 
     <target name="run"> 
         <ant antfile="build.xml"
-             dir="${distro.root}/samples/learning-more/binding-rmi/contribution-calculator-reference"/>
+             dir="${distro.root}/samples/learning-more/binding-rmi/calculator-reference-contribution"/>
         <ant antfile="build.xml"
-             dir="${distro.root}/samples/learning-more/binding-rmi/contribution-calculator-service"/>
+             dir="${distro.root}/samples/learning-more/binding-rmi/calculator-service-contribution"/>
     </target>
 
 </project>
diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml
index 365371c85f..2e7c182bf3 100644
--- a/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml
@@ -33,7 +33,7 @@
     <target name="run"> 
     	
         <ant antfile="build.xml"
-    	     dir="${distro.root}/samples/learning-more/binding-sca/contribution-calculator"/>
+    	     dir="${distro.root}/samples/learning-more/binding-sca/calculator-contribution"/>
     	
     </target>
 
diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml
index 1cb9d6b817..2cd66aa9a2 100644
--- a/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml
@@ -33,7 +33,7 @@
     <target name="run"> 
     	
         <ant antfile="build.xml"
-             dir="${distro.root}/samples/learning-more/binding-ws/contribution-calculator"/>
+             dir="${distro.root}/samples/learning-more/binding-ws/calculator-contribution"/>
 
     </target>
 
diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml
index daf1e0a85c..70a2207e11 100644
--- a/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml
@@ -33,7 +33,7 @@
     <target name="run"> 
     	
         <ant antfile="build.xml"
-    	     dir="${distro.root}/samples/learning-more/implementation-java/contribution-calculator"/>
+    	     dir="${distro.root}/samples/learning-more/implementation-java/calculator-contribution"/>
     	
     </target>
 
diff --git a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml
index 51c479856b..fa19e10325 100644
--- a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml
@@ -33,7 +33,7 @@
     <target name="run"> 
     	
         <ant dir="${distro.root}/samples/running-tuscany/embedded-jse"
-             target="run-contribution-binding-sca-calculator">
+             target="binding-sca-calculator">
         </ant>
 
     </target>