You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/05/29 11:57:12 UTC
svn commit: r1860331 - in /jmeter/trunk: bin/ extras/
Author: vladimirsitnikov
Date: Wed May 29 11:57:12 2019
New Revision: 1860331
URL: http://svn.apache.org/viewvc?rev=1860331&view=rev
Log:
Normalize EOL for cmd and bat files
Modified:
jmeter/trunk/bin/create-rmi-keystore.bat
jmeter/trunk/bin/heapdump.cmd
jmeter/trunk/bin/jmeter-n-r.cmd
jmeter/trunk/bin/jmeter-n.cmd
jmeter/trunk/bin/jmeter-server.bat
jmeter/trunk/bin/jmeter-t.cmd
jmeter/trunk/bin/jmeter.bat
jmeter/trunk/bin/jmeterw.cmd
jmeter/trunk/bin/mirror-server.cmd
jmeter/trunk/bin/shutdown.cmd
jmeter/trunk/bin/stoptest.cmd
jmeter/trunk/extras/proxycert.cmd
jmeter/trunk/extras/schematic.cmd
Modified: jmeter/trunk/bin/create-rmi-keystore.bat
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/create-rmi-keystore.bat?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/create-rmi-keystore.bat (original)
+++ jmeter/trunk/bin/create-rmi-keystore.bat Wed May 29 11:57:12 2019
@@ -1,20 +1,20 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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
-keytool -genkey -keyalg RSA -alias rmi -keystore rmi_keystore.jks -storepass changeit -validity 7 -keysize 2048 %*
-
-echo "Copy the generated rmi_keystore.jks to jmeter/bin folder or reference it in property 'server.rmi.ssl.keystore.file'"
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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
+keytool -genkey -keyalg RSA -alias rmi -keystore rmi_keystore.jks -storepass changeit -validity 7 -keysize 2048 %*
+
+echo "Copy the generated rmi_keystore.jks to jmeter/bin folder or reference it in property 'server.rmi.ssl.keystore.file'"
Modified: jmeter/trunk/bin/heapdump.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/heapdump.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/heapdump.cmd (original)
+++ jmeter/trunk/bin/heapdump.cmd Wed May 29 11:57:12 2019
@@ -1,23 +1,23 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 Ask the JMeter client to perform a HeapDump
-
-rem P1 = command port for JMeter instance (defaults to 4445)
-
-java -cp %~dp0ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient HeapDump %*
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 Ask the JMeter client to perform a HeapDump
+
+rem P1 = command port for JMeter instance (defaults to 4445)
+
+java -cp %~dp0ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient HeapDump %*
pause
\ No newline at end of file
Modified: jmeter/trunk/bin/jmeter-n-r.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter-n-r.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter-n-r.cmd (original)
+++ jmeter/trunk/bin/jmeter-n-r.cmd Wed May 29 11:57:12 2019
@@ -1,52 +1,52 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 ============================================
-rem Non-GUI version of JMETER.BAT
-rem
-rem Drop a JMX file on this batch script, and it
-rem will run it in non-GUI mode, with a log file
-rem formed from the input file name but with the
-rem extension .jtl
-rem
-rem Only the first parameter is used.
-rem
-rem ============================================
-
-rem Check file is supplied
-if a == a%1 goto winNT2
-
-rem Allow special name LAST
-if LAST == %1 goto winNT3
-
-rem Check it has extension .jmx
-if "%~x1" == ".jmx" goto winNT3
-:winNT2
-echo Please supply a script name with the extension .jmx
-pause
-goto END
-:winNT3
-
-rem Change to script directory
-pushd %~dp1
-
-rem use same directory to find jmeter script
-call "%~dp0"jmeter -n -t "%~nx1" -j "%~n1.log" -l "%~n1.jtl" -r %2 %3 %4 %5 %6 %7 %8 %9
-
-popd
-
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 ============================================
+rem Non-GUI version of JMETER.BAT
+rem
+rem Drop a JMX file on this batch script, and it
+rem will run it in non-GUI mode, with a log file
+rem formed from the input file name but with the
+rem extension .jtl
+rem
+rem Only the first parameter is used.
+rem
+rem ============================================
+
+rem Check file is supplied
+if a == a%1 goto winNT2
+
+rem Allow special name LAST
+if LAST == %1 goto winNT3
+
+rem Check it has extension .jmx
+if "%~x1" == ".jmx" goto winNT3
+:winNT2
+echo Please supply a script name with the extension .jmx
+pause
+goto END
+:winNT3
+
+rem Change to script directory
+pushd %~dp1
+
+rem use same directory to find jmeter script
+call "%~dp0"jmeter -n -t "%~nx1" -j "%~n1.log" -l "%~n1.jtl" -r %2 %3 %4 %5 %6 %7 %8 %9
+
+popd
+
:END
\ No newline at end of file
Modified: jmeter/trunk/bin/jmeter-n.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter-n.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter-n.cmd (original)
+++ jmeter/trunk/bin/jmeter-n.cmd Wed May 29 11:57:12 2019
@@ -1,52 +1,52 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 ============================================
-rem Non-GUI version of JMETER.BAT
-rem
-rem Drop a JMX file on this batch script, and it
-rem will run it in non-GUI mode, with a log file
-rem formed from the input file name but with the
-rem extension .jtl
-rem
-rem Only the first parameter is used.
-rem
-rem ============================================
-
-rem Check file is supplied
-if a == a%1 goto winNT2
-
-rem Allow special name LAST
-if LAST == %1 goto winNT3
-
-rem Check it has extension .jmx
-if "%~x1" == ".jmx" goto winNT3
-:winNT2
-echo Please supply a script name with the extension .jmx
-pause
-goto END
-:winNT3
-
-rem Change to script directory
-pushd %~dp1
-
-rem use same directory to find jmeter script
-call "%~dp0"jmeter -n -t "%~nx1" -j "%~n1.log" -l "%~n1.jtl" %2 %3 %4 %5 %6 %7 %8 %9
-
-popd
-
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 ============================================
+rem Non-GUI version of JMETER.BAT
+rem
+rem Drop a JMX file on this batch script, and it
+rem will run it in non-GUI mode, with a log file
+rem formed from the input file name but with the
+rem extension .jtl
+rem
+rem Only the first parameter is used.
+rem
+rem ============================================
+
+rem Check file is supplied
+if a == a%1 goto winNT2
+
+rem Allow special name LAST
+if LAST == %1 goto winNT3
+
+rem Check it has extension .jmx
+if "%~x1" == ".jmx" goto winNT3
+:winNT2
+echo Please supply a script name with the extension .jmx
+pause
+goto END
+:winNT3
+
+rem Change to script directory
+pushd %~dp1
+
+rem use same directory to find jmeter script
+call "%~dp0"jmeter -n -t "%~nx1" -j "%~n1.log" -l "%~n1.jtl" %2 %3 %4 %5 %6 %7 %8 %9
+
+popd
+
:END
\ No newline at end of file
Modified: jmeter/trunk/bin/jmeter-server.bat
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter-server.bat?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter-server.bat (original)
+++ jmeter/trunk/bin/jmeter-server.bat Wed May 29 11:57:12 2019
@@ -1,73 +1,73 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 ===============================================================
-rem Enviroment variables
-rem SERVER_PORT (optional) - define the rmiregistry and server port
-rem
-rem JVM_ARGS - Java flags - these are handled by jmeter.bat
-rem
-rem ===============================================================
-
-
-REM Protect environment against changes
-setlocal
-
-if exist jmeter-server.bat goto winNT1
-echo Changing to JMeter home directory
-cd /D %~dp0
-:winNT1
-
-if exist %JMETER_HOME%\lib\ext\ApacheJMeter_core.jar goto setCP
-echo Could not find ApacheJmeter_core.jar ...
-REM Try to work out JMETER_HOME
-echo ... Trying JMETER_HOME=..
-set JMETER_HOME=..
-if exist %JMETER_HOME%\lib\ext\ApacheJMeter_core.jar goto setCP
-echo ... trying JMETER_HOME=.
-set JMETER_HOME=.
-if exist %JMETER_HOME%\lib\ext\ApacheJMeter_core.jar goto setCP
-echo Cannot determine JMETER_HOME !
-goto exit
-
-:setCP
-echo Found ApacheJMeter_core.jar
-
-REM No longer need to create the rmiregistry as it is done by the server
-REM set CLASSPATH=%JMETER_HOME%\lib\ext\ApacheJMeter_core.jar;%JMETER_HOME%\lib\jorphan.jar
-
-REM START rmiregistry %SERVER_PORT%
-REM
-
-rem On NT/2K grab all arguments at once
-set JMETER_CMD_LINE_ARGS=%*
-
-if not "%SERVER_PORT%" == "" goto port
-
-call jmeter -s -j jmeter-server.log %JMETER_CMD_LINE_ARGS%
-goto end
-
-
-:port
-call jmeter -Dserver_port=%SERVER_PORT% -s -j jmeter-server.log %JMETER_CMD_LINE_ARGS%
-
-:end
-
-rem No longer needed, as server is started in-process
-rem taskkill /F /IM rmiregistry.exe
-
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 ===============================================================
+rem Enviroment variables
+rem SERVER_PORT (optional) - define the rmiregistry and server port
+rem
+rem JVM_ARGS - Java flags - these are handled by jmeter.bat
+rem
+rem ===============================================================
+
+
+REM Protect environment against changes
+setlocal
+
+if exist jmeter-server.bat goto winNT1
+echo Changing to JMeter home directory
+cd /D %~dp0
+:winNT1
+
+if exist %JMETER_HOME%\lib\ext\ApacheJMeter_core.jar goto setCP
+echo Could not find ApacheJmeter_core.jar ...
+REM Try to work out JMETER_HOME
+echo ... Trying JMETER_HOME=..
+set JMETER_HOME=..
+if exist %JMETER_HOME%\lib\ext\ApacheJMeter_core.jar goto setCP
+echo ... trying JMETER_HOME=.
+set JMETER_HOME=.
+if exist %JMETER_HOME%\lib\ext\ApacheJMeter_core.jar goto setCP
+echo Cannot determine JMETER_HOME !
+goto exit
+
+:setCP
+echo Found ApacheJMeter_core.jar
+
+REM No longer need to create the rmiregistry as it is done by the server
+REM set CLASSPATH=%JMETER_HOME%\lib\ext\ApacheJMeter_core.jar;%JMETER_HOME%\lib\jorphan.jar
+
+REM START rmiregistry %SERVER_PORT%
+REM
+
+rem On NT/2K grab all arguments at once
+set JMETER_CMD_LINE_ARGS=%*
+
+if not "%SERVER_PORT%" == "" goto port
+
+call jmeter -s -j jmeter-server.log %JMETER_CMD_LINE_ARGS%
+goto end
+
+
+:port
+call jmeter -Dserver_port=%SERVER_PORT% -s -j jmeter-server.log %JMETER_CMD_LINE_ARGS%
+
+:end
+
+rem No longer needed, as server is started in-process
+rem taskkill /F /IM rmiregistry.exe
+
:exit
\ No newline at end of file
Modified: jmeter/trunk/bin/jmeter-t.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter-t.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter-t.cmd (original)
+++ jmeter/trunk/bin/jmeter-t.cmd Wed May 29 11:57:12 2019
@@ -1,51 +1,51 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 ============================================
-rem
-rem Drop a JMX file on this batch script, and it
-rem will load it in the GUI.
-rem
-rem Only the first parameter is used.
-rem
-rem ============================================
-
-
-rem Check file is supplied
-if a == a%1 goto winNT2
-
-rem Allow special name LAST
-if LAST == %1 goto winNT3
-
-rem Check it has extension .jmx
-if "%~x1" == ".jmx" goto winNT3
-:winNT2
-echo Please supply a script name with the extension .jmx
-pause
-goto END
-:winNT3
-
-rem Start in directory with JMX file
-pushd %~dp1
-
-rem Prepend the directory in which this script resides in case not on path
-
-call "%~dp0"jmeter -j "%~n1.log" -t "%~nx1" %2 %3 %4 %5 %6 %7 %8 %9
-
-popd
-
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 ============================================
+rem
+rem Drop a JMX file on this batch script, and it
+rem will load it in the GUI.
+rem
+rem Only the first parameter is used.
+rem
+rem ============================================
+
+
+rem Check file is supplied
+if a == a%1 goto winNT2
+
+rem Allow special name LAST
+if LAST == %1 goto winNT3
+
+rem Check it has extension .jmx
+if "%~x1" == ".jmx" goto winNT3
+:winNT2
+echo Please supply a script name with the extension .jmx
+pause
+goto END
+:winNT3
+
+rem Start in directory with JMX file
+pushd %~dp1
+
+rem Prepend the directory in which this script resides in case not on path
+
+call "%~dp0"jmeter -j "%~n1.log" -t "%~nx1" %2 %3 %4 %5 %6 %7 %8 %9
+
+popd
+
:END
\ No newline at end of file
Modified: jmeter/trunk/bin/jmeter.bat
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Wed May 29 11:57:12 2019
@@ -1,213 +1,213 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 =====================================================
-rem Environment variables that can be defined externally:
-rem
-rem Do not set the variables in this script. Instead put them into a script
-rem setenv.bat in JMETER_HOME/bin to keep your customizations separate.
-rem
-rem DDRAW - (Optional) JVM options to influence usage of direct draw,
-rem e.g. '-Dsun.java2d.ddscale=true'
-rem
-rem JMETER_BIN - JMeter bin directory (must end in \)
-rem
-rem JMETER_COMPLETE_ARGS - if set indicates that JVM_ARGS is to be used exclusively instead
-rem of adding other options like HEAP or GC_ALGO
-rem
-rem JMETER_HOME - installation directory. Will be guessed from location of jmeter.bat
-rem
-rem JM_LAUNCH - java.exe (default) or javaw.exe
-rem
-rem JM_START - set this to 'start ""' to launch JMeter in a separate window
-rem this is used by the jmeterw.cmd script.
-rem
-rem JVM_ARGS - (Optional) Java options used when starting JMeter, e.g. -Dprop=val
-rem Defaults to '-Duser.language="en" -Duser.region="EN"'
-rem
-rem GC_ALGO - (Optional) JVM garbage collector options
-rem Defaults to '-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1ReservePercent=20'
-rem
-rem HEAP - (Optional) JVM memory settings used when starting JMeter
-rem Defaults to '-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m'
-rem
-rem =====================================================
-
-setlocal
-
-rem Guess JMETER_HOME if not defined
-set "CURRENT_DIR=%cd%"
-if not "%JMETER_HOME%" == "" goto gotHome
-set "JMETER_HOME=%CURRENT_DIR%"
-if exist "%JMETER_HOME%\bin\jmeter.bat" goto okHome
-cd ..
-set "JMETER_HOME=%cd%"
-cd "%CURRENT_DIR%"
-if exist "%JMETER_HOME%\bin\jmeter.bat" goto okHome
-set "JMETER_HOME=%~dp0\.."
-:gotHome
-
-if exist "%JMETER_HOME%\bin\jmeter.bat" goto okHome
-echo The JMETER_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-goto end
-:okHome
-
-rem Get standard environment variables
-if exist "%JMETER_HOME%\bin\setenv.bat" call "%JMETER_HOME%\bin\setenv.bat"
-
-if not defined JMETER_LANGUAGE (
- rem Set language
- rem Default to en_EN
- set JMETER_LANGUAGE=-Duser.language="en" -Duser.region="EN"
-)
-
-rem Minimal version to run JMeter
-set MINIMAL_VERSION=1.8.0
-
-
-rem --add-opens if JAVA 9
-set JAVA9_OPTS=
-
-
-for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
- rem @echo Debug Output: %%g
- set JAVAVER=%%g
-)
-if not defined JAVAVER (
- @echo Not able to find Java executable or version. Please check your Java installation.
- set ERRORLEVEL=2
- goto pause
-)
-
-
-
-rem Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 containing 1.${version}.x
-rem JAVAVER will be equal to "9.0.4" (quotes are part of the value) for Oracle Java 9
-rem JAVAVER will be equal to "1.8.0_161" (quotes are part of the value) for Oracle Java 8
-rem so we extract 2 chars starting from index 1
-IF "%JAVAVER:~1,2%"=="1." (
- set JAVAVER=%JAVAVER:"=%
- for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
- set current_minor=%%w
-)
-) else (
- rem Java 9 at least
- set current_minor=9
- set JAVA9_OPTS=--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED
-)
-
-
-for /f "delims=. tokens=1-3" %%v in ("%MINIMAL_VERSION%") do (
- set minimal_minor=%%w
-)
-
-if not defined current_minor (
- @echo Not able to find Java executable or version. Please check your Java installation.
- set ERRORLEVEL=2
- goto pause
-)
-rem @echo Debug: CURRENT=%current_minor% - MINIMAL=%minimal_minor%
-if %current_minor% LSS %minimal_minor% (
- @echo Error: Java version -- %JAVAVER% -- is too low to run JMeter. Needs a Java version greater than or equal to %MINIMAL_VERSION%
- set ERRORLEVEL=3
- goto pause
-)
-
-if not defined JM_LAUNCH (
- set JM_LAUNCH=java.exe
-)
-
-if exist jmeter.bat goto winNT1
-if not defined JMETER_BIN (
- set JMETER_BIN=%~dp0
-)
-
-:winNT1
-rem On NT/2K grab all arguments at once
-set JMETER_CMD_LINE_ARGS=%*
-
-rem The following link describes the -XX options:
-rem http://docs.oracle.com/javase/8/docs/technotes/tools/unix/java.html
-
-if not defined HEAP (
- rem See the unix startup file for the rationale of the following parameters,
- rem including some tuning recommendations
- set HEAP=-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m
-)
-
-rem Uncomment this to generate GC verbose file with Java prior to 9
-rem set VERBOSE_GC=-verbose:gc -Xloggc:gc_jmeter_%%p.log -XX:+PrintGCDetails -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCDateStamps -XX:+PrintAdaptiveSizePolicy
-
-rem Uncomment this to generate GC verbose file with Java 9 and above
-rem set VERBOSE_GC=-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%%p.log
-rem You may want to add those settings
-rem -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem
-if not defined GC_ALGO (
- set GC_ALGO=-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1ReservePercent=20
-)
-
-set SYSTEM_PROPS=-Djava.security.egd=file:/dev/urandom
-
-rem Always dump on OOM (does not cost anything unless triggered)
-set DUMP=-XX:+HeapDumpOnOutOfMemoryError
-
-rem Uncomment this if you run JMeter in DOCKER (need Java SE 8u131 or JDK 9)
-rem see https://blogs.oracle.com/java-platform-group/java-se-support-for-docker-cpu-and-memory-limits
-rem set RUN_IN_DOCKER=-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
-
-rem Additional settings that might help improve GUI performance on some platforms
-rem See: http://www.oracle.com/technetwork/java/perf-graphics-135933.html
-
-if not defined DDRAW (
- set DDRAW=
- rem Setting this flag to true turns off DirectDraw usage, which sometimes helps to get rid of a lot of rendering problems on Win32.
- rem set DDRAW=%DDRAW% -Dsun.java2d.noddraw=true
-
- rem Setting this flag to false turns off DirectDraw offscreen surfaces acceleration by forcing all createVolatileImage calls to become createImage calls, and disables hidden acceleration performed on surfaces created with createImage .
- rem set DDRAW=%DDRAW% -Dsun.java2d.ddoffscreen=false
-
- rem Setting this flag to true enables hardware-accelerated scaling.
- rem set DDRAW=%DDRAW% -Dsun.java2d.ddscale=true
-)
-
-rem Collect the settings defined above
-if not defined JMETER_COMPLETE_ARGS (
- set ARGS=%JAVA9_OPTS% %DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% %JMETER_LANGUAGE% %RUN_IN_DOCKER%
-) else (
- set ARGS=
-)
-
-if "%JM_START%" == "start" (
- set JM_START=start "Apache_JMeter"
-)
-
-%JM_START% "%JM_LAUNCH%" %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" %JMETER_CMD_LINE_ARGS%
-
-rem If the errorlevel is not zero, then display it and pause
-
-if NOT errorlevel 0 goto pause
-if errorlevel 1 goto pause
-
-goto end
-
-:pause
-echo errorlevel=%ERRORLEVEL%
-pause
-
-:end
-
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 =====================================================
+rem Environment variables that can be defined externally:
+rem
+rem Do not set the variables in this script. Instead put them into a script
+rem setenv.bat in JMETER_HOME/bin to keep your customizations separate.
+rem
+rem DDRAW - (Optional) JVM options to influence usage of direct draw,
+rem e.g. '-Dsun.java2d.ddscale=true'
+rem
+rem JMETER_BIN - JMeter bin directory (must end in \)
+rem
+rem JMETER_COMPLETE_ARGS - if set indicates that JVM_ARGS is to be used exclusively instead
+rem of adding other options like HEAP or GC_ALGO
+rem
+rem JMETER_HOME - installation directory. Will be guessed from location of jmeter.bat
+rem
+rem JM_LAUNCH - java.exe (default) or javaw.exe
+rem
+rem JM_START - set this to 'start ""' to launch JMeter in a separate window
+rem this is used by the jmeterw.cmd script.
+rem
+rem JVM_ARGS - (Optional) Java options used when starting JMeter, e.g. -Dprop=val
+rem Defaults to '-Duser.language="en" -Duser.region="EN"'
+rem
+rem GC_ALGO - (Optional) JVM garbage collector options
+rem Defaults to '-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1ReservePercent=20'
+rem
+rem HEAP - (Optional) JVM memory settings used when starting JMeter
+rem Defaults to '-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m'
+rem
+rem =====================================================
+
+setlocal
+
+rem Guess JMETER_HOME if not defined
+set "CURRENT_DIR=%cd%"
+if not "%JMETER_HOME%" == "" goto gotHome
+set "JMETER_HOME=%CURRENT_DIR%"
+if exist "%JMETER_HOME%\bin\jmeter.bat" goto okHome
+cd ..
+set "JMETER_HOME=%cd%"
+cd "%CURRENT_DIR%"
+if exist "%JMETER_HOME%\bin\jmeter.bat" goto okHome
+set "JMETER_HOME=%~dp0\.."
+:gotHome
+
+if exist "%JMETER_HOME%\bin\jmeter.bat" goto okHome
+echo The JMETER_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+:okHome
+
+rem Get standard environment variables
+if exist "%JMETER_HOME%\bin\setenv.bat" call "%JMETER_HOME%\bin\setenv.bat"
+
+if not defined JMETER_LANGUAGE (
+ rem Set language
+ rem Default to en_EN
+ set JMETER_LANGUAGE=-Duser.language="en" -Duser.region="EN"
+)
+
+rem Minimal version to run JMeter
+set MINIMAL_VERSION=1.8.0
+
+
+rem --add-opens if JAVA 9
+set JAVA9_OPTS=
+
+
+for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
+ rem @echo Debug Output: %%g
+ set JAVAVER=%%g
+)
+if not defined JAVAVER (
+ @echo Not able to find Java executable or version. Please check your Java installation.
+ set ERRORLEVEL=2
+ goto pause
+)
+
+
+
+rem Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 containing 1.${version}.x
+rem JAVAVER will be equal to "9.0.4" (quotes are part of the value) for Oracle Java 9
+rem JAVAVER will be equal to "1.8.0_161" (quotes are part of the value) for Oracle Java 8
+rem so we extract 2 chars starting from index 1
+IF "%JAVAVER:~1,2%"=="1." (
+ set JAVAVER=%JAVAVER:"=%
+ for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
+ set current_minor=%%w
+)
+) else (
+ rem Java 9 at least
+ set current_minor=9
+ set JAVA9_OPTS=--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED
+)
+
+
+for /f "delims=. tokens=1-3" %%v in ("%MINIMAL_VERSION%") do (
+ set minimal_minor=%%w
+)
+
+if not defined current_minor (
+ @echo Not able to find Java executable or version. Please check your Java installation.
+ set ERRORLEVEL=2
+ goto pause
+)
+rem @echo Debug: CURRENT=%current_minor% - MINIMAL=%minimal_minor%
+if %current_minor% LSS %minimal_minor% (
+ @echo Error: Java version -- %JAVAVER% -- is too low to run JMeter. Needs a Java version greater than or equal to %MINIMAL_VERSION%
+ set ERRORLEVEL=3
+ goto pause
+)
+
+if not defined JM_LAUNCH (
+ set JM_LAUNCH=java.exe
+)
+
+if exist jmeter.bat goto winNT1
+if not defined JMETER_BIN (
+ set JMETER_BIN=%~dp0
+)
+
+:winNT1
+rem On NT/2K grab all arguments at once
+set JMETER_CMD_LINE_ARGS=%*
+
+rem The following link describes the -XX options:
+rem http://docs.oracle.com/javase/8/docs/technotes/tools/unix/java.html
+
+if not defined HEAP (
+ rem See the unix startup file for the rationale of the following parameters,
+ rem including some tuning recommendations
+ set HEAP=-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m
+)
+
+rem Uncomment this to generate GC verbose file with Java prior to 9
+rem set VERBOSE_GC=-verbose:gc -Xloggc:gc_jmeter_%%p.log -XX:+PrintGCDetails -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCDateStamps -XX:+PrintAdaptiveSizePolicy
+
+rem Uncomment this to generate GC verbose file with Java 9 and above
+rem set VERBOSE_GC=-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%%p.log
+rem You may want to add those settings
+rem -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem
+if not defined GC_ALGO (
+ set GC_ALGO=-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1ReservePercent=20
+)
+
+set SYSTEM_PROPS=-Djava.security.egd=file:/dev/urandom
+
+rem Always dump on OOM (does not cost anything unless triggered)
+set DUMP=-XX:+HeapDumpOnOutOfMemoryError
+
+rem Uncomment this if you run JMeter in DOCKER (need Java SE 8u131 or JDK 9)
+rem see https://blogs.oracle.com/java-platform-group/java-se-support-for-docker-cpu-and-memory-limits
+rem set RUN_IN_DOCKER=-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+
+rem Additional settings that might help improve GUI performance on some platforms
+rem See: http://www.oracle.com/technetwork/java/perf-graphics-135933.html
+
+if not defined DDRAW (
+ set DDRAW=
+ rem Setting this flag to true turns off DirectDraw usage, which sometimes helps to get rid of a lot of rendering problems on Win32.
+ rem set DDRAW=%DDRAW% -Dsun.java2d.noddraw=true
+
+ rem Setting this flag to false turns off DirectDraw offscreen surfaces acceleration by forcing all createVolatileImage calls to become createImage calls, and disables hidden acceleration performed on surfaces created with createImage .
+ rem set DDRAW=%DDRAW% -Dsun.java2d.ddoffscreen=false
+
+ rem Setting this flag to true enables hardware-accelerated scaling.
+ rem set DDRAW=%DDRAW% -Dsun.java2d.ddscale=true
+)
+
+rem Collect the settings defined above
+if not defined JMETER_COMPLETE_ARGS (
+ set ARGS=%JAVA9_OPTS% %DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% %JMETER_LANGUAGE% %RUN_IN_DOCKER%
+) else (
+ set ARGS=
+)
+
+if "%JM_START%" == "start" (
+ set JM_START=start "Apache_JMeter"
+)
+
+%JM_START% "%JM_LAUNCH%" %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" %JMETER_CMD_LINE_ARGS%
+
+rem If the errorlevel is not zero, then display it and pause
+
+if NOT errorlevel 0 goto pause
+if errorlevel 1 goto pause
+
+goto end
+
+:pause
+echo errorlevel=%ERRORLEVEL%
+pause
+
+:end
+
Modified: jmeter/trunk/bin/jmeterw.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeterw.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeterw.cmd (original)
+++ jmeter/trunk/bin/jmeterw.cmd Wed May 29 11:57:12 2019
@@ -1,25 +1,25 @@
-@echo off
-rem Run JMeter using javaw
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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.
-
-set JM_START=start "Apache_JMeter"
-set JM_LAUNCH=javaw.exe
-
-call jmeter %*
-
-set JM_START=
-set JM_LAUNCH=
+@echo off
+rem Run JMeter using javaw
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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.
+
+set JM_START=start "Apache_JMeter"
+set JM_LAUNCH=javaw.exe
+
+call jmeter %*
+
+set JM_START=
+set JM_LAUNCH=
Modified: jmeter/trunk/bin/mirror-server.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/mirror-server.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/mirror-server.cmd (original)
+++ jmeter/trunk/bin/mirror-server.cmd Wed May 29 11:57:12 2019
@@ -1,34 +1,34 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 Run the JMeter mirror server in non-GUI mode
-rem P1 = port to use (default 8080)
-
-setlocal
-
-rem On NT/2K grab all arguments at once
-set JMETER_CMD_LINE_ARGS=%*
-
-cd /D %~dp0
-
-set CP=..\lib\ext\ApacheJMeter_http.jar;..\lib\ext\ApacheJMeter_core.jar;..\lib\jorphan.jar;..\lib\oro-2.0.8.jar
-set CP=%CP%;..\lib\slf4j-api-1.7.25.jar;..\lib\jcl-over-slf4j-1.7.25.jar;..\lib\log4j-slf4j-impl-2.11.1.jar
-set CP=%CP%;..\lib\log4j-api-2.11.1.jar;..\lib\log4j-core-2.11.1.jar;..\lib\log4j-1.2-api-2.11.1.jar
-
-java -cp %CP% org.apache.jmeter.protocol.http.control.HttpMirrorServer %JMETER_CMD_LINE_ARGS%
-
-pause
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 Run the JMeter mirror server in non-GUI mode
+rem P1 = port to use (default 8080)
+
+setlocal
+
+rem On NT/2K grab all arguments at once
+set JMETER_CMD_LINE_ARGS=%*
+
+cd /D %~dp0
+
+set CP=..\lib\ext\ApacheJMeter_http.jar;..\lib\ext\ApacheJMeter_core.jar;..\lib\jorphan.jar;..\lib\oro-2.0.8.jar
+set CP=%CP%;..\lib\slf4j-api-1.7.25.jar;..\lib\jcl-over-slf4j-1.7.25.jar;..\lib\log4j-slf4j-impl-2.11.1.jar
+set CP=%CP%;..\lib\log4j-api-2.11.1.jar;..\lib\log4j-core-2.11.1.jar;..\lib\log4j-1.2-api-2.11.1.jar
+
+java -cp %CP% org.apache.jmeter.protocol.http.control.HttpMirrorServer %JMETER_CMD_LINE_ARGS%
+
+pause
Modified: jmeter/trunk/bin/shutdown.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/shutdown.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/shutdown.cmd (original)
+++ jmeter/trunk/bin/shutdown.cmd Wed May 29 11:57:12 2019
@@ -1,23 +1,23 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 Run the Shutdown client to stop a non-GUI instance gracefully
-
-rem P1 = command port for JMeter instance (defaults to 4445)
-
-java -cp %~dp0ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient Shutdown %*
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 Run the Shutdown client to stop a non-GUI instance gracefully
+
+rem P1 = command port for JMeter instance (defaults to 4445)
+
+java -cp %~dp0ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient Shutdown %*
pause
\ No newline at end of file
Modified: jmeter/trunk/bin/stoptest.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/stoptest.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/bin/stoptest.cmd (original)
+++ jmeter/trunk/bin/stoptest.cmd Wed May 29 11:57:12 2019
@@ -1,23 +1,23 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 Run the Shutdown client to stop a non-GUI instance abruptly
-
-rem P1 = command port for JMeter instance (defaults to 4445)
-
-java -cp %~dp0ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient StopTestNow %*
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 Run the Shutdown client to stop a non-GUI instance abruptly
+
+rem P1 = command port for JMeter instance (defaults to 4445)
+
+java -cp %~dp0ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient StopTestNow %*
pause
\ No newline at end of file
Modified: jmeter/trunk/extras/proxycert.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/proxycert.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/extras/proxycert.cmd (original)
+++ jmeter/trunk/extras/proxycert.cmd Wed May 29 11:57:12 2019
@@ -1,45 +1,45 @@
-@echo off
-
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 Generate temporary certificate for use with JMeter Proxy recorder
-rem Usage: proxycert [validity(default 1)]
-rem e.g. proxycert 7
-
-setlocal
-
-set KEYSTORE=proxyserver.jks
-if not exist %KEYSTORE% goto NOTEXISTS
-echo %KEYSTORE% exists; please rename or delete it before creating a replacement
-goto :EOF
-:NOTEXISTS
-
-set DNAME="cn=JMeter Proxy (DO NOT TRUST)"
-
-set VALIDITY=1
-if not .%1 == . set VALIDITY=%1
-
-rem Must agree with property proxy.cert.keystorepass
-set STOREPASSWORD=password
-rem Must agree with proxy.cert.keypassword
-set KEYPASSWORD=password
-
-rem generate the keystore with the certificate
-keytool -genkeypair -alias jmeter -keystore %KEYSTORE% -keypass %KEYPASSWORD% -storepass %STOREPASSWORD% -validity %VALIDITY% -keyalg RSA -dname %DNAME%
-
-rem show the contents
-keytool -list -v -keystore %KEYSTORE% -storepass %STOREPASSWORD%
+@echo off
+
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 Generate temporary certificate for use with JMeter Proxy recorder
+rem Usage: proxycert [validity(default 1)]
+rem e.g. proxycert 7
+
+setlocal
+
+set KEYSTORE=proxyserver.jks
+if not exist %KEYSTORE% goto NOTEXISTS
+echo %KEYSTORE% exists; please rename or delete it before creating a replacement
+goto :EOF
+:NOTEXISTS
+
+set DNAME="cn=JMeter Proxy (DO NOT TRUST)"
+
+set VALIDITY=1
+if not .%1 == . set VALIDITY=%1
+
+rem Must agree with property proxy.cert.keystorepass
+set STOREPASSWORD=password
+rem Must agree with proxy.cert.keypassword
+set KEYPASSWORD=password
+
+rem generate the keystore with the certificate
+keytool -genkeypair -alias jmeter -keystore %KEYSTORE% -keypass %KEYPASSWORD% -storepass %STOREPASSWORD% -validity %VALIDITY% -keyalg RSA -dname %DNAME%
+
+rem show the contents
+keytool -list -v -keystore %KEYSTORE% -storepass %STOREPASSWORD%
Modified: jmeter/trunk/extras/schematic.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/schematic.cmd?rev=1860331&r1=1860330&r2=1860331&view=diff
==============================================================================
--- jmeter/trunk/extras/schematic.cmd (original)
+++ jmeter/trunk/extras/schematic.cmd Wed May 29 11:57:12 2019
@@ -1,24 +1,24 @@
-@echo off
-
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 Drop a JMX file on this script to create a schematic of the test plan as an HTML file
-
-cd /d %~dp0
-set name=%~n1
-if .%1 ==. set name=Test
-call ant -f schematic.xml -Dtest=%name%
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 Drop a JMX file on this script to create a schematic of the test plan as an HTML file
+
+cd /d %~dp0
+set name=%~n1
+if .%1 ==. set name=Test
+call ant -f schematic.xml -Dtest=%name%
pause
\ No newline at end of file