You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/09/19 10:48:00 UTC
svn commit: r577197 - in /jakarta/jmeter: branches/rel-2-2/bin/jmeter-server
trunk/bin/jmeter-server
Author: sebb
Date: Wed Sep 19 01:47:59 2007
New Revision: 577197
URL: http://svn.apache.org/viewvc?rev=577197&view=rev
Log:
Fix bug - should not have used "set"
Rework to remove need to save CLASSPATH
Kill rmiregistry when interrupted
Modified:
jakarta/jmeter/branches/rel-2-2/bin/jmeter-server
jakarta/jmeter/trunk/bin/jmeter-server
Modified: jakarta/jmeter/branches/rel-2-2/bin/jmeter-server
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/jmeter-server?rev=577197&r1=577196&r2=577197&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/jmeter-server (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/jmeter-server Wed Sep 19 01:47:59 2007
@@ -20,11 +20,8 @@
## SERVER_PORT=1234 jmeter-server
##
-set OLDCLASSPATH=$CLASSPATH
-export OLDCLASSPATH
-set CLASSPATH=`dirname $0`/../lib/ext/ApacheJMeter_core.jar:`dirname $0`/../lib/jorphan.jar:`dirname $0`/../lib/logkit-1.2.jar
-export CLASSPATH
-rmiregistry $SERVER_PORT &
-set CLASSPATH=$OLDCLASSPATH
-export CLASSPATH
-`dirname $0`/jmeter -Dserver_port=${SERVER_PORT:-1099} -s -j jmeter-server.log "$@"
+DIRNAME=${DIRNAME}
+CLASSPATH=${DIRNAME}/../lib/ext/ApacheJMeter_core.jar:${DIRNAME}/../lib/jorphan.jar:${DIRNAME}/../lib/logkit-1.2.jar rmiregistry $SERVER_PORT &
+# stop rmiregistry on interrupt
+trap "kill $!" 2
+${DIRNAME}/jmeter -Dserver_port=${SERVER_PORT:-1099} -s -j jmeter-server.log "$@"
\ No newline at end of file
Modified: jakarta/jmeter/trunk/bin/jmeter-server
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter-server?rev=577197&r1=577196&r2=577197&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter-server (original)
+++ jakarta/jmeter/trunk/bin/jmeter-server Wed Sep 19 01:47:59 2007
@@ -20,11 +20,8 @@
## SERVER_PORT=1234 jmeter-server
##
-set OLDCLASSPATH=$CLASSPATH
-export OLDCLASSPATH
-set CLASSPATH=`dirname $0`/../lib/ext/ApacheJMeter_core.jar:`dirname $0`/../lib/jorphan.jar:`dirname $0`/../lib/logkit-1.2.jar
-export CLASSPATH
-rmiregistry $SERVER_PORT &
-set CLASSPATH=$OLDCLASSPATH
-export CLASSPATH
-`dirname $0`/jmeter -Dserver_port=${SERVER_PORT:-1099} -s -j jmeter-server.log "$@"
+DIRNAME=${DIRNAME}
+CLASSPATH=${DIRNAME}/../lib/ext/ApacheJMeter_core.jar:${DIRNAME}/../lib/jorphan.jar:${DIRNAME}/../lib/logkit-1.2.jar rmiregistry $SERVER_PORT &
+# stop rmiregistry on interrupt
+trap "kill $!" 2
+${DIRNAME}/jmeter -Dserver_port=${SERVER_PORT:-1099} -s -j jmeter-server.log "$@"
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org