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

7 files changed, 8 insertions, 8 deletions

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");