diff options
3 files changed, 20 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml b/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml index 90a4d9b2c5..ebb2567a74 100644 --- a/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml +++ b/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml @@ -18,7 +18,7 @@ -->
<project name="binding-ws-calculator" default="run">
<property name="tuscany.home" value="../.."/>
- <property name="jar.name" value="sample-launcher-embedded-jse.jar" />
+ <property name="jar.name" value="sample-launcher-embedded-osgi.jar" />
<property name="main.class" value="launcher.SampleJSELauncher" />
<echo>${tuscany.home}</echo>
@@ -53,8 +53,22 @@ <target name="run" depends="compile">
<echo>Please use 'ant run-name-of-sample-contribution-to-run' </echo>
</target>
+
+ <target name="run-contribution-binding-sca-calculator" depends="compile">
+ <java classname="${main.class}"
+ fork="true"
+ failonerror="true">
+ <classpath>
+ <pathelement location="target/${jar.name}"/>
+ <fileset dir="${tuscany.home}/features">
+ <include name="tuscany-sca-manifest.jar" />
+ </fileset>
+ </classpath>
+ <arg value="contribution-binding-sca-calculator"/>
+ </java>
+ </target>
- <target name="run-binding-ws-calculator" depends="compile">
+ <target name="run-contribution-binding-ws-calculator" depends="compile">
<java classname="${main.class}"
fork="true"
failonerror="true">
@@ -64,7 +78,7 @@ <include name="tuscany-sca-manifest.jar" />
</fileset>
</classpath>
- <arg value="binding-ws-calculator"/>
+ <arg value="contribution-binding-ws-calculator"/>
</java>
</target>
diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java index 79bd8403e6..68059099db 100644 --- a/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java +++ b/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java @@ -58,7 +58,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", "../contribution-binding-sca-calculator/target/classes"));
+ Node node = startNode(new Contribution("c1", "../binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar"));
//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
diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java index 9706249751..7b72ec7aee 100644 --- a/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java +++ b/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java @@ -28,12 +28,12 @@ import org.junit.Test; public class LauncherTestCase {
@Test
- public void testCOntributionBindingSCACalculator() throws Exception {
+ public void testContributionBindingSCACalculator() throws Exception {
SampleJSELauncher.main(new String[] {"contribution-binding-sca-calculator"});
}
@Test
- public void testCOntributionBindingWSCalculator() throws Exception {
+ public void testContributionBindingWSCalculator() throws Exception {
SampleJSELauncher.main(new String[] {"contribution-binding-ws-calculator"});
}
}
|