You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/05/19 14:43:58 UTC
svn commit: r946157 - in
/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi: build.xml
src/main/java/launcher/SampleJSELauncher.java
src/test/java/launcher/LauncherTestCase.java
Author: slaws
Date: Wed May 19 12:43:58 2010
New Revision: 946157
URL: http://svn.apache.org/viewvc?rev=946157&view=rev
Log:
Correct some typos
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml?rev=946157&r1=946156&r2=946157&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml Wed May 19 12:43:58 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java?rev=946157&r1=946156&r2=946157&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java Wed May 19 12:43:58 2010
@@ -58,7 +58,7 @@ 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"));
+ 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
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java?rev=946157&r1=946156&r2=946157&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java Wed May 19 12:43:58 2010
@@ -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"});
}
}