Run autostyleApply

bin/create-rmi-keystore.bat

@@ -1,20 +1,21 @@
 @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 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'"

bin/create-rmi-keystore.sh

@@ -1,20 +1,21 @@
 #!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you 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.
+#
 
-##   Licensed to the Apache Software Foundation (ASF) under one or more
-##   contributor license agreements.  See the NOTICE file distributed with
-##   this work for additional information regarding copyright ownership.
-##   The ASF licenses this file to You 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.
-##
 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'"

bin/heapdump.cmd

@@ -1,23 +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
+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   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 
+pause

bin/heapdump.sh

@@ -1,19 +1,20 @@
 #!/bin/sh
-
-##   Licensed to the Apache Software Foundation (ASF) under one or more
-##   contributor license agreements.  See the NOTICE file distributed with
-##   this work for additional information regarding copyright ownership.
-##   The ASF licenses this file to You 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.
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you 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.
+#
 
 #   Ask the JMeter client to perform a HeapDump
 

bin/jmeter-n-r.cmd

@@ -1,19 +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
+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  Non-GUI version of JMETER.BAT
@@ -49,4 +50,4 @@ call "%~dp0"jmeter -n -t "%~nx1" -j "%~n1.log" -l "%~n1.jtl" -r %2 %3 %4 %5 %6 %
 
 popd
 
-:END
+:END

bin/jmeter-n.cmd

@@ -1,19 +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
+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  Non-GUI version of JMETER.BAT
@@ -49,4 +50,4 @@ call "%~dp0"jmeter -n -t "%~nx1" -j "%~n1.log" -l "%~n1.jtl" %2 %3 %4 %5 %6 %7 %
 
 popd
 
-:END
+:END

bin/jmeter-server.bat

@@ -1,19 +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
+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   Enviroment variables
@@ -70,4 +71,4 @@ call jmeter -Dserver_port=%SERVER_PORT% -s -j jmeter-server.log %JMETER_CMD_LINE
 rem No longer needed, as server is started in-process
 rem taskkill /F /IM rmiregistry.exe
 
-:exit
+:exit

bin/jmeter-t.cmd

@@ -1,19 +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
+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
@@ -48,4 +49,4 @@ call "%~dp0"jmeter -j "%~n1.log" -t "%~nx1" %2 %3 %4 %5 %6 %7 %8 %9
 
 popd
 
-:END
+:END

bin/jmeter.bat

@@ -1,19 +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
+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   Environment variables that can be defined externally:
@@ -39,7 +40,7 @@ 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   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
@@ -150,7 +151,7 @@ if not defined HEAP (
     set HEAP=-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m
 )
 
-rem Uncomment this to generate GC verbose file with Java prior to 9 
+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
@@ -210,4 +211,3 @@ echo errorlevel=%ERRORLEVEL%
 pause
 
 :end
-