From eda6f2a4367ea4e6507def8b3e5aeb7cba9e8288 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 5 Feb 2009 12:21:36 +0000
Subject: Set up the sample scripts so that the automatic run uses a time to
 live of 4 seconds while the script, when run manually, waits for the user to
 press a key.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741087 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/itest/samples/build.xml                                  | 8 +++++---
 .../java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java   | 2 +-
 java/sca/samples/calculator-rmi-service/build.xml                 | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'java')

diff --git a/java/sca/itest/samples/build.xml b/java/sca/itest/samples/build.xml
index 06b60f28c2..124a30636c 100644
--- a/java/sca/itest/samples/build.xml
+++ b/java/sca/itest/samples/build.xml
@@ -28,22 +28,24 @@
 	    service sides of the sample.
 	-->
     <target name="run"> 
+    	
+    	<property name="time.to.live" id="ttl" value="4000" />
+    	
         <ant antfile="../../samples/implementation-java-calculator/build.xml"
     	     dir="../../samples/implementation-java-calculator"/>
     	
         <ant antfile="../../samples/binding-ws-calculator/build.xml"
              dir="../../samples/binding-ws-calculator"/> 
     	
-    	<!--parallel>
+    	<parallel>
             <ant antfile="../../samples/calculator-rmi-service/build.xml"
         	     dir="../../samples/calculator-rmi-service"/>
     		<sequential>
     		    <sleep seconds="2"/>
                 <ant antfile="../../samples/calculator-rmi-reference/build.xml"
             	     dir="../../samples/calculator-rmi-reference"/>
-    			
     		</sequential>
-    	</parallel-->
+    	</parallel>
     	
     </target>
 
diff --git a/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index e2c8550f09..3560fade53 100644
--- a/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
@@ -205,7 +205,7 @@ public class NodeLauncher {
                 Runtime.getRuntime().addShutdownHook(shutdown);
 
                 long ttl = Long.parseLong(cli.getOptionValue("ttl", "-1"));
-                if (ttl >= 0) {
+                if (ttl > 0) {
                     logger.info("Waiting for " + ttl + " milliseconds ...");
                     Thread.sleep(ttl);
                     // Stop the node
diff --git a/java/sca/samples/calculator-rmi-service/build.xml b/java/sca/samples/calculator-rmi-service/build.xml
index 870ac9f68f..31fed2b026 100644
--- a/java/sca/samples/calculator-rmi-service/build.xml
+++ b/java/sca/samples/calculator-rmi-service/build.xml
@@ -21,6 +21,7 @@
 
    <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"> 
@@ -70,18 +71,17 @@
    <target name="run" depends="compile">
         <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher"
               fork="true"
-        	  timeout="6000"
         	  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"/>
-                <pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT/tuscany-sca-2.0-SNAPSHOT/modules/tuscany-node-launcher-2.0-SNAPSHOT.jar"/>
-            	<pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT/tuscany-sca-2.0-SNAPSHOT/modules/commons-cli-1.1/commons-cli-1.1.jar"/>
+                <pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/modules/tuscany-node-launcher-2.0-SNAPSHOT.jar"/>
+            	<pathelement location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/modules/commons-cli-1.1/commons-cli-1.1.jar"/>
             </classpath> 
         	<arg value="target/${jar.name}"/> 
         	<arg value="-t"/> 
-        	<arg value="5000"/> 
+        	<arg value="${time.to.live}"/>
         </java>    	
     </target>	
 
-- 
cgit v1.2.3