Switch over to using jar contribution for binding-sca-calculator and have the itest/distro test exercise it

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

2 files changed, 5 insertions, 11 deletions

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 4bf0367397..cd569b380a 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
@@ -32,8 +32,9 @@
 
     <target name="run"> 
     	
-        <ant antfile="build.xml"
-             dir="${distro.root}/samples/launcher-embedded-jse"/>
+        <ant dir="${distro.root}/samples/launcher-embedded-jse"
+             target="run-contribution-binding-sca-calculator">
+        </ant>
 
     </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 021b4d9a17..22b14a2fc1 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
@@ -62,15 +62,8 @@ public class SampleJSELauncher extends RuntimeIntegration {
      * that calls the CalculatorServiceComponent from an operation marked by @Init. 

      */

     public void launchBindingSCACalculator(){

-        Node node = startNode(new Contribution("c1", "../contribution-binding-sca-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

-        //double result = calculator.add(3, 2);

-        //System.out.println("3 + 2 = " + result);

-        //if (result != 5.0){

-        //    throw new SampleLauncherException();

-        //}        

+        Node node = startNode(new Contribution("c1", "../contribution-binding-sca-calculator/target/sample-contribution-binding-sca-calculator.jar"));

+              

         stopNode(node);

     }