TUSCANY-3677 code changes to reflect reorg

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

4 files changed, 10 insertions, 15 deletions

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/README b/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/README
index 7108333efa..b10f588d0d 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/README
+++ b/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/README
@@ -1,15 +1,10 @@
-JSE Sample Launcher

-===================

+JSE Sample Launchers

+====================

 

-This directory contains a sample java launcher for the

+This directory contains sample java launchers for the

 tuscany sample contributions.   

 

-The README file in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running sample contributions using the

-tuscany sample launchers ( where distribution-unpack-dir is the directory in which you

-unpacked the tuscany binary distribution archive)

-

-To use this sample JSE launcher with ant excute the command

+To use this sample JSE launcher with ant execute the command

 

 ant run-<contributionname>

 

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
index 34ee729921..46cdcc73e4 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
@@ -64,7 +64,7 @@ public class SampleJSELauncher extends RuntimeIntegration {
      * that calls the CalculatorServiceComponent from an operation marked by @Init. 
      */
     public void launchBindingSCACalculator(){
-        Node node = startNode(new Contribution("c1", "../../sca-features/binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar"));
+        Node node = startNode(new Contribution("c1", "../../learning-more/binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar"));
         
         stopNode(node);
     }    
@@ -73,7 +73,7 @@ public class SampleJSELauncher extends RuntimeIntegration {
      * Using a Tuscany specific mechanism for getting at local service proxies
      */
     public void launchBindingWSCalculator() throws NoSuchDomainException, NoSuchServiceException{
-        Node node = startNode(new Contribution("c1", "../../sca-features/binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
+        Node node = startNode(new Contribution("c1", "../../learning-more/binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
         
         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
                
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java b/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
index 8f6d1d8ed4..ea22d3cc7b 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
@@ -40,7 +40,7 @@ public class SampleOSGILauncherBindingSCA extends RuntimeIntegration {
         SampleOSGILauncherBindingSCA launcher = new SampleOSGILauncherBindingSCA();
  
         
-        Node node = launcher.startNode(new Contribution("c1", "../../sca-features/binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar"));
+        Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar"));
         launcher.stopNode(node);
     }
     
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java b/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
index ff3589cfdd..d85c1cf5f8 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
@@ -41,7 +41,7 @@ public class SampleOSGILauncherBindingWS extends RuntimeIntegration {
         
         // launcher.launchBindingWSCalculator();
         
-        Node node = launcher.startNode(new Contribution("c1", "../../sca-features/binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
+        Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
         
         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
                
@@ -59,7 +59,7 @@ public class SampleOSGILauncherBindingWS extends RuntimeIntegration {
      * that calls the CalculatorServiceComponent from an operation marked by @Init. 
      */
     public void launchBindingSCACalculator(){
-        Node node = startNode(new Contribution("c1", "../../sca-features/binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar"));
+        Node node = startNode(new Contribution("c1", "../../learning-more/binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar"));
         
         stopNode(node);
     }    
@@ -68,7 +68,7 @@ public class SampleOSGILauncherBindingWS extends RuntimeIntegration {
      * Using a Tuscany specific mechanism for getting at local service proxies
      */
     public void launchBindingWSCalculator() throws NoSuchDomainException, NoSuchServiceException{
-        Node node = startNode(new Contribution("c1", "../../sca-features/binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
+        Node node = startNode(new Contribution("c1", "../../learning-more/binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
         
         CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");