Author: slaws
Date: Wed May 19 10:11:38 2010
New Revision: 946102
URL: http://svn.apache.org/viewvc?rev=946102&view=rev
Log:
Switch over to using jar contribution for binding-sca-calculator and have the
itest/distro test exercise it
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml?rev=946102&r1=946101&r2=946102&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml
Wed May 19 10:11:38 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java?rev=946102&r1=946101&r2=946102&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
Wed May 19 10:11:38 2010
@@ -62,15 +62,8 @@ public class SampleJSELauncher extends R
* 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);
}
