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 ms...@apache.org on 2002/05/03 02:34:40 UTC
cvs commit: jakarta-jmeter/bin jmeter jmeter-server jmeter-server.bat nongui.bat nongui.sh
mstover1 02/05/02 17:34:40
Modified: bin jmeter jmeter-server jmeter-server.bat nongui.bat
nongui.sh
Log:
Fixing minor problems with startup scripts
Revision Changes Path
1.19 +1 -0 jakarta-jmeter/bin/jmeter
Index: jmeter
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jmeter 27 Jul 2001 22:14:03 -0000 1.18
+++ jmeter 3 May 2002 00:34:40 -0000 1.19
@@ -1,4 +1,5 @@
#!/bin/sh
+
USAGE=$0" [-h proxyHost] [-p proxyPort] [-f property-file]"
LOG4JCONFIG=log4j.configuration=log4j.conf
1.3 +12 -1 jakarta-jmeter/bin/jmeter-server
Index: jmeter-server
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter-server,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jmeter-server 5 Jul 2001 13:07:59 -0000 1.2
+++ jmeter-server 3 May 2002 00:34:40 -0000 1.3
@@ -1,4 +1,5 @@
#!/bin/sh
+
USAGE=$0" [-h remote-host] [-p policy-file] [-f property-file]"
PROPERTIES=`dirname $0`/jmeter.properties
@@ -13,4 +14,14 @@
esac;
done
-java -classpath $CLASSPATH:`dirname $0`/../lib/xerces.jar:`dirname $0`/ApacheJMeter.jar -Djava.security.policy=$POLICY org.apache.jmeter.engine.RemoteJMeterEngineImpl $PROPERTIES $JAVA_PROPS
\ No newline at end of file
+for i in `dirname $0`/../lib/*.jar
+do
+ CLASSPATH=${CLASSPATH}:$i
+done
+
+for i in `dirname $0`/../ext/*.jar
+do
+ CLASSPATH=${CLASSPATH}:$i
+done
+
+java -classpath $CLASSPATH:`dirname $0`/ApacheJMeter.jar -Djava.security.policy=$POLICY org.apache.jmeter.engine.RemoteJMeterEngineImpl $PROPERTIES $JAVA_PROPS
\ No newline at end of file
1.4 +1 -1 jakarta-jmeter/bin/jmeter-server.bat
Index: jmeter-server.bat
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter-server.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jmeter-server.bat 24 Nov 2001 17:00:22 -0000 1.3
+++ jmeter-server.bat 3 May 2002 00:34:40 -0000 1.4
@@ -1,4 +1,4 @@
-@echo on
+@echo off
set PROP=jmeter.properties
set LOG4JCONFIG=log4j.configuration=log4j.conf
1.2 +7 -3 jakarta-jmeter/bin/nongui.bat
Index: nongui.bat
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/nongui.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nongui.bat 27 Jul 2001 21:56:00 -0000 1.1
+++ nongui.bat 3 May 2002 00:34:40 -0000 1.2
@@ -1,4 +1,4 @@
-@echo on
+@echo off
set PROP=jmeter.properties
rem set the log4j configuration file
set LOG4JCONFIG=log4j.configuration=log4j.conf
@@ -23,5 +23,9 @@
IF "%7" EQU "-p" set PORT=-Dhttp.proxyPort=%8 -Dhttps.proxyPort=%8
IF "%7" EQU "-o" set SRC=%8
-set CLSPATH=../lib/xerces.jar;ApacheJMeter.jar;../lib/Tidy.jar;../lib/log4j.jar;
-java -cp %CLASSPATH%;%CLSPATH% -D%LOG4JCONFIG% %HOST% %PORT% org.apache.jmeter.NonGuiDriver %PROP% %SRC%
+set LOCALCLASSPATH=%CLASSPATH%
+
+for %%i in ("..\lib\*.jar") do CALL ..\lcp %%i
+for %%i in ("..\ext\*.jar") do CALL ..\lcp %%i
+
+java -cp %LOCALCLASSPATH%;ApacheJMeter.jar -D%LOG4JCONFIG% %HOST% %PORT% org.apache.jmeter.NonGuiDriver %PROP% %SRC%
1.3 +1 -0 jakarta-jmeter/bin/nongui.sh
Index: nongui.sh
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/nongui.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nongui.sh 16 Aug 2001 14:16:53 -0000 1.2
+++ nongui.sh 3 May 2002 00:34:40 -0000 1.3
@@ -1,4 +1,5 @@
#!/bin/sh
+
USAGE=$0" [-h proxyHost] [-p proxyPort] [-f property-file] [-o jmeter script file]"
LOG4JCONFIG=log4j.configuration=log4j.conf
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>