diff options
5 files changed, 17 insertions, 28 deletions
diff --git a/java/sca/itest/distribution/calculator-rmi/build.xml b/java/sca/itest/distribution/calculator-rmi/build.xml index b405f747ea..679c1dcfdf 100644 --- a/java/sca/itest/distribution/calculator-rmi/build.xml +++ b/java/sca/itest/distribution/calculator-rmi/build.xml @@ -18,7 +18,6 @@ -->
<project name="itest-samples" default="run">
- <echo>${JAVA_HOME}</echo>
<!--
compile and run each sample as though the user were running
samples from the binary distribution. Here we use ant targets
@@ -32,16 +31,19 @@ <target name="run">
- <property name="time.to.live" id="ttl" value="4000" />
-
<parallel>
- <ant antfile="build.xml"
- dir="${distro.root}/samples/calculator-rmi-service"/>
+
+ <daemons>
+ <ant antfile="build.xml"
+ dir="${distro.root}/samples/calculator-rmi-service"/>
+ </daemons>
+
<sequential>
<sleep seconds="2"/>
<ant antfile="build.xml"
dir="${distro.root}/samples/calculator-rmi-reference"/>
</sequential>
+
</parallel>
</target>
diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java index 440b427c15..6c26db5a25 100644 --- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java +++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java @@ -43,7 +43,13 @@ public class NodeMain2 { node.start();
System.out.println("Hit enter to stop node...");
- System.in.read();
+ if (System.in.read() == -1) {
+ // no sysin so wait for ever letting caller do the terminate
+ Object lock = new Object();
+ synchronized(lock) {
+ lock.wait();
+ }
+ }
node.stop();
}
diff --git a/java/sca/samples/binding-ws-calculator/build.xml b/java/sca/samples/binding-ws-calculator/build.xml index da97f7b4c6..02125b9f3d 100644 --- a/java/sca/samples/binding-ws-calculator/build.xml +++ b/java/sca/samples/binding-ws-calculator/build.xml @@ -53,7 +53,6 @@ <target name="run" depends="compile"> <java classname="org.apache.tuscany.sca.launcher.LauncherMain" fork="true" - inputstring="q" failonerror="true"> <classpath> <pathelement location="../../bin/launcher.jar"/> diff --git a/java/sca/samples/calculator-rmi-service/build.xml b/java/sca/samples/calculator-rmi-service/build.xml index 56c9256681..96f9a2a7b6 100644 --- a/java/sca/samples/calculator-rmi-service/build.xml +++ b/java/sca/samples/calculator-rmi-service/build.xml @@ -21,7 +21,6 @@ <property name="jar.name" value="sample-calculator-rmi-service.jar" /> <property name="main.class" value="calculator.CalculatorClient" /> - <property name="time.to.live" value="0" /> <target name="init"> <delete quiet="true" includeemptydirs="true"> @@ -52,33 +51,17 @@ </jar> </target> - <!--target name="run" depends="compile"> + <target name="run" depends="compile"> <java classname="org.apache.tuscany.sca.launcher.LauncherMain" fork="true" - inputstring="\n" failonerror="true"> <classpath> <pathelement location="../../bin/launcher.jar"/> </classpath> <arg value="target/${jar.name}"/> </java> - </target--> - - <target name="run" depends="compile"> - <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher" - fork="true" - failonerror="true"> - <jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/> - <classpath> - <pathelement location="../../modules/tuscany-node-launcher-2.0-SNAPSHOT.jar"/> - <pathelement location="../../modules/commons-cli-1.1/commons-cli-1.1.jar"/> - </classpath> - <arg value="target/${jar.name}"/> - <arg value="-t"/> - <arg value="${time.to.live}"/> - </java> </target> - + </project> diff --git a/java/sca/samples/implementation-java-calculator/build.xml b/java/sca/samples/implementation-java-calculator/build.xml index e8e24e4dcb..8dde36a60c 100644 --- a/java/sca/samples/implementation-java-calculator/build.xml +++ b/java/sca/samples/implementation-java-calculator/build.xml @@ -48,9 +48,8 @@ <target name="run" depends="compile"> <java classname="org.apache.tuscany.sca.launcher.LauncherMain" fork="true" - inputstring="q" + inputstring="q" failonerror="true"> - <jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/> <classpath> <pathelement location="../../bin/launcher.jar"/> </classpath> |