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 2004/02/16 14:34:10 UTC
cvs commit: jakarta-jmeter/bin jmetertest.properties upgrade.properties jmeter-server.bat users.xml log4j.conf jmeterw.bat jmeter.bat jmeter.properties jmeter-server jmeter
sebb 2004/02/16 05:34:10
Modified: bin jmetertest.properties upgrade.properties
jmeter-server.bat users.xml log4j.conf jmeterw.bat
jmeter.bat jmeter.properties jmeter-server jmeter
Log:
ASF L V2
Revision Changes Path
1.5 +17 -0 jakarta-jmeter/bin/jmetertest.properties
Index: jmetertest.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmetertest.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jmetertest.properties 29 Jan 2004 00:35:31 -0000 1.4
+++ jmetertest.properties 16 Feb 2004 13:34:10 -0000 1.5
@@ -1,6 +1,23 @@
################################################################################
# Apache JMeter Property file
################################################################################
+
+
+## $Id$
+## Copyright 2001-2004 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
#Preferred GUI language. Comment out to use the JVM default locale's language.
#language=de
1.5 +17 -0 jakarta-jmeter/bin/upgrade.properties
Index: upgrade.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/upgrade.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upgrade.properties 16 Jan 2004 02:31:35 -0000 1.4
+++ upgrade.properties 16 Feb 2004 13:34:10 -0000 1.5
@@ -1,4 +1,20 @@
# Class, property and value upgrade equivalences.
+
+## $Id$
+## Copyright 2001-2004 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
#
# Format is as follows --
# for renamed test element & GUI classes:
@@ -8,6 +24,7 @@
# for renamed values:
# old.class.Name.old.propertyName/oldValue=newValue
#
+
org.apache.jmeter.protocol.http.config.gui.UrlConfigGui=org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui
org.apache.jmeter.assertions.Assertion=org.apache.jmeter.assertions.ResponseAssertion
org.apache.jmeter.protocol.http.sampler.HTTPSamplerFull=org.apache.jmeter.protocol.http.sampler.HTTPSampler
1.10 +15 -0 jakarta-jmeter/bin/jmeter-server.bat
Index: jmeter-server.bat
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter-server.bat,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jmeter-server.bat 15 Jul 2003 13:56:20 -0000 1.9
+++ jmeter-server.bat 16 Feb 2004 13:34:10 -0000 1.10
@@ -1,5 +1,20 @@
@echo off
+rem $Id$
+rem Copyright 2001-2004 The Apache Software Foundation
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
REM Protect environment against changes if possible:
if "%OS%"=="Windows_NT" setlocal
1.3 +17 -0 jakarta-jmeter/bin/users.xml
Index: users.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/users.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- users.xml 5 Jun 2003 17:33:36 -0000 1.2
+++ users.xml 16 Feb 2004 13:34:10 -0000 1.3
@@ -1,6 +1,23 @@
<?xml version="1.0"?>
<!DOCTYPE allthreads SYSTEM "users.dtd">
+<!--
+ $Header$
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<!-- all users, uses round robin selection -->
<allthreads>
<!-- unique parameters for each individual thread (ie user) -->
1.5 +17 -0 jakarta-jmeter/bin/log4j.conf
Index: log4j.conf
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/log4j.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- log4j.conf 23 May 2002 15:47:03 -0000 1.4
+++ log4j.conf 16 Feb 2004 13:34:10 -0000 1.5
@@ -1,4 +1,21 @@
+
+## $Id$
+## Copyright 2001-2004 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
# Set appender specific options
+
log4j.appender.Root_Appender=org.apache.log4j.RollingFileAppender
log4j.appender.Root_Appender.File=root.log
log4j.appender.Root_Appender.Append=true
1.2 +17 -0 jakarta-jmeter/bin/jmeterw.bat
Index: jmeterw.bat
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeterw.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jmeterw.bat 15 Jan 2004 15:45:49 -0000 1.1
+++ jmeterw.bat 16 Feb 2004 13:34:10 -0000 1.2
@@ -1,4 +1,21 @@
@echo off
+rem Run JMeter using javaw
+
+rem $Id$
+rem Copyright 2001-2004 The Apache Software Foundation
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
if not "%OS%"=="Windows_NT" goto win9xStart
:winNTStart
@setlocal
1.28 +61 -45 jakarta-jmeter/bin/jmeter.bat
Index: jmeter.bat
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.bat,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jmeter.bat 29 Nov 2003 00:50:26 -0000 1.27
+++ jmeter.bat 16 Feb 2004 13:34:10 -0000 1.28
@@ -1,45 +1,61 @@
-@echo off
-if not "%OS%"=="Windows_NT" goto win9xStart
-:winNTStart
-@setlocal
-
-rem Need to check if we are using the 4NT shell...
-if "%eval[2+2]" == "4" goto setup4NT
-
-rem On NT/2K grab all arguments at once
-set JMETER_CMD_LINE_ARGS=%*
-goto doneStart
-
-:setup4NT
-set JMETER_CMD_LINE_ARGS=%$
-goto doneStart
-
-:win9xStart
-rem Slurp the command line arguments. This loop allows for an unlimited number of
-rem agruments (up to the command line limit, anyway).
-
-set JMETER_CMD_LINE_ARGS=
-
-:setupArgs
-if %1a==a goto doneStart
-set JMETER_CMD_LINE_ARGS=%JMETER_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-
-:doneStart
-rem This label provides a place for the argument list loop to break out
-rem and for NT handling to skip to.
-
-rem See the unix startup file for the rationale of the following parameters,
-rem including some tuning recommendations
-set HEAP=-Xms256m -Xmx256m
-set NEW=-XX:NewSize=128m -XX:MaxNewSize=128m
-set SURVIVOR=-XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=50%
-set TENURING=-XX:MaxTenuringThreshold=2
-set EVACUATION=-XX:MaxLiveObjectEvacuationRatio=20%
-set RMIGC=-Dsun.rmi.dgc.client.gcInterval=600000 -Dsun.rmi.dgc.server.gcInterval=600000
-set PERM=-XX:PermSize=64m -XX:MaxPermSize=64m
-set DEBUG=-verbose:gc -XX:+PrintTenuringDistribution
-set ARGS=%HEAP% %NEW% %SURVIVOR% %TENURING% %EVACUATION% %RMIGC% %PERM% %DEBUG%
-
-java %ARGS% -jar ApacheJMeter.jar %JMETER_CMD_LINE_ARGS%
+@echo off
+
+rem $Id$
+rem Copyright 2001-2004 The Apache Software Foundation
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+if not "%OS%"=="Windows_NT" goto win9xStart
+:winNTStart
+@setlocal
+
+rem Need to check if we are using the 4NT shell...
+if "%eval[2+2]" == "4" goto setup4NT
+
+rem On NT/2K grab all arguments at once
+set JMETER_CMD_LINE_ARGS=%*
+goto doneStart
+
+:setup4NT
+set JMETER_CMD_LINE_ARGS=%$
+goto doneStart
+
+:win9xStart
+rem Slurp the command line arguments. This loop allows for an unlimited number of
+rem agruments (up to the command line limit, anyway).
+
+set JMETER_CMD_LINE_ARGS=
+
+:setupArgs
+if %1a==a goto doneStart
+set JMETER_CMD_LINE_ARGS=%JMETER_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+
+:doneStart
+rem This label provides a place for the argument list loop to break out
+rem and for NT handling to skip to.
+
+rem See the unix startup file for the rationale of the following parameters,
+rem including some tuning recommendations
+set HEAP=-Xms256m -Xmx256m
+set NEW=-XX:NewSize=128m -XX:MaxNewSize=128m
+set SURVIVOR=-XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=50%
+set TENURING=-XX:MaxTenuringThreshold=2
+set EVACUATION=-XX:MaxLiveObjectEvacuationRatio=20%
+set RMIGC=-Dsun.rmi.dgc.client.gcInterval=600000 -Dsun.rmi.dgc.server.gcInterval=600000
+set PERM=-XX:PermSize=64m -XX:MaxPermSize=64m
+set DEBUG=-verbose:gc -XX:+PrintTenuringDistribution
+set ARGS=%HEAP% %NEW% %SURVIVOR% %TENURING% %EVACUATION% %RMIGC% %PERM% %DEBUG%
+
+java %ARGS% -jar ApacheJMeter.jar %JMETER_CMD_LINE_ARGS%
1.96 +17 -0 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- jmeter.properties 11 Feb 2004 23:17:48 -0000 1.95
+++ jmeter.properties 16 Feb 2004 13:34:10 -0000 1.96
@@ -1,6 +1,23 @@
################################################################################
# Apache JMeter Property file
################################################################################
+
+## $Id$
+## Copyright 2001-2004 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
+
#Preferred GUI language. Comment out to use the JVM default locale's language.
#language=de
1.11 +16 -0 jakarta-jmeter/bin/jmeter-server
Index: jmeter-server
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter-server,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jmeter-server 3 Aug 2003 18:19:27 -0000 1.10
+++ jmeter-server 16 Feb 2004 13:34:10 -0000 1.11
@@ -1,4 +1,20 @@
#!/bin/sh
+
+## $Id$
+## Copyright 2001-2004 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
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
1.24 +15 -0 jakarta-jmeter/bin/jmeter
Index: jmeter
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jmeter 29 Nov 2003 00:50:26 -0000 1.23
+++ jmeter 16 Feb 2004 13:34:10 -0000 1.24
@@ -1,5 +1,20 @@
#! /bin/sh
+## $Id$
+## Copyright 2001-2004 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
# The following should be reasonably good values for most tests running
# on Sun JVMs. Following is the analysis on which it is based. If it's total
# gibberish to you, please study my article at
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org