From b6d11d79d905d0c099732bb928d2372fd1388981 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Sat, 28 Dec 2019 16:03:53 +0300 Subject: [PATCH] Run autostyleApply --- bin/create-rmi-keystore.bat | 31 +- bin/create-rmi-keystore.sh | 31 +- bin/heapdump.cmd | 33 +- bin/heapdump.sh | 31 +- bin/jmeter-n-r.cmd | 33 +- bin/jmeter-n.cmd | 33 +- bin/jmeter-server.bat | 33 +- bin/jmeter-t.cmd | 33 +- bin/jmeter.bat | 36 +- bin/jmeter.properties | 30 +- bin/jmeter.sh | 31 +- bin/jmeterw.cmd | 26 +- bin/log4j2.xml | 29 +- bin/mirror-server.cmd | 31 +- bin/mirror-server.sh | 31 +- .../flot-axislabels/README.md | 1 - bin/reportgenerator.properties | 32 +- bin/saveservice.properties | 32 +- bin/shutdown.cmd | 33 +- bin/shutdown.sh | 31 +- bin/stoptest.cmd | 33 +- bin/stoptest.sh | 31 +- bin/system.properties | 30 +- bin/templates/templates.xml | 49 +- bin/threaddump.cmd | 33 +- bin/threaddump.sh | 31 +- bin/upgrade.properties | 32 +- bin/user.properties | 32 +- build.gradle.kts | 5 +- config/checkstyle/checkstyle-suppressions.xml | 30 +- config/checkstyle/checkstyle.xml | 29 +- extras/addons.xml | 35 +- extras/build.xml | 43 +- extras/execcode.bsh | 4 +- extras/jmeter-results-detail-report_21.xsl | 71 +- extras/jmeter-results-report_21.xsl | 43 +- extras/printvars.bsh | 2 +- extras/proxycert.cmd | 32 +- extras/proxycert.sh | 32 +- extras/remote.bsh | 4 +- extras/schematic.cmd | 33 +- extras/schematic.sh | 33 +- extras/schematic.xml | 29 +- extras/schematic.xsl | 23 +- extras/startup.bsh | 4 +- fb-csv.xsl | 31 +- fb-excludes.xml | 37 +- gradle.properties | 26 +- gradle/wrapper/gradle-wrapper.properties | 26 +- settings.gradle.kts | 5 +- src/bom/build.gradle.kts | 5 +- src/bshclient/build.gradle.kts | 5 +- .../apache/jmeter/util/BeanShellClient.java | 5 +- src/build.gradle.kts | 5 +- src/components/build.gradle.kts | 5 +- .../jmeter/assertions/BSFAssertion.java | 5 +- .../assertions/BSFAssertionBeanInfo.java | 5 +- .../jmeter/assertions/BeanShellAssertion.java | 5 +- .../jmeter/assertions/CompareAssertion.java | 5 +- .../assertions/CompareAssertionBeanInfo.java | 5 +- .../jmeter/assertions/DurationAssertion.java | 5 +- .../jmeter/assertions/HTMLAssertion.java | 5 +- .../jmeter/assertions/JSONPathAssertion.java | 5 +- .../jmeter/assertions/JSR223Assertion.java | 5 +- .../assertions/JSR223AssertionBeanInfo.java | 5 +- .../jmeter/assertions/LogErrorHandler.java | 5 +- .../jmeter/assertions/MD5HexAssertion.java | 5 +- .../jmeter/assertions/ResponseAssertion.java | 5 +- .../jmeter/assertions/SMIMEAssertion.java | 5 +- .../assertions/SMIMEAssertionTestElement.java | 5 +- .../jmeter/assertions/SizeAssertion.java | 5 +- .../assertions/SubstitutionElement.java | 5 +- .../jmeter/assertions/XMLAssertion.java | 5 +- .../jmeter/assertions/XMLSchemaAssertion.java | 5 +- .../jmeter/assertions/XPath2Assertion.java | 5 +- .../jmeter/assertions/XPathAssertion.java | 5 +- .../jmeter/assertions/gui/AssertionGui.java | 5 +- .../assertions/gui/BeanShellAssertionGui.java | 5 +- .../assertions/gui/DurationAssertionGui.java | 5 +- .../assertions/gui/HTMLAssertionGui.java | 5 +- .../assertions/gui/JSONPathAssertionGui.java | 5 +- .../assertions/gui/MD5HexAssertionGUI.java | 5 +- .../assertions/gui/SMIMEAssertionGui.java | 5 +- .../assertions/gui/SizeAssertionGui.java | 5 +- .../assertions/gui/XMLAssertionGui.java | 5 +- .../jmeter/assertions/gui/XMLConfPanel.java | 5 +- .../assertions/gui/XMLSchemaAssertionGUI.java | 5 +- .../assertions/gui/XPath2AssertionGui.java | 5 +- .../jmeter/assertions/gui/XPath2Panel.java | 5 +- .../assertions/gui/XPathAssertionGui.java | 5 +- .../jmeter/assertions/gui/XPathPanel.java | 5 +- .../jmespath/JMESPathAssertion.java | 5 +- .../jmespath/gui/JMESPathAssertionGui.java | 5 +- .../org/apache/jmeter/config/CSVDataSet.java | 5 +- .../jmeter/config/CSVDataSetBeanInfo.java | 5 +- .../apache/jmeter/config/KeystoreConfig.java | 5 +- .../jmeter/config/KeystoreConfigBeanInfo.java | 5 +- .../jmeter/config/RandomVariableConfig.java | 5 +- .../config/RandomVariableConfigBeanInfo.java | 5 +- .../control/CriticalSectionController.java | 5 +- .../jmeter/control/ForeachController.java | 5 +- .../jmeter/control/IncludeController.java | 5 +- .../jmeter/control/InterleaveControl.java | 5 +- .../jmeter/control/ModuleController.java | 5 +- .../jmeter/control/OnceOnlyController.java | 5 +- .../jmeter/control/RandomController.java | 5 +- .../jmeter/control/RandomOrderController.java | 5 +- .../jmeter/control/SwitchController.java | 5 +- .../jmeter/control/ThroughputController.java | 5 +- .../gui/CriticalSectionControllerGui.java | 5 +- .../control/gui/ForeachControlPanel.java | 5 +- .../control/gui/IncludeControllerGui.java | 5 +- .../control/gui/InterleaveControlGui.java | 5 +- .../control/gui/ModuleControllerGui.java | 5 +- .../control/gui/OnceOnlyControllerGui.java | 5 +- .../jmeter/control/gui/RandomControlGui.java | 5 +- .../control/gui/RandomOrderControllerGui.java | 5 +- .../control/gui/SwitchControllerGui.java | 5 +- .../control/gui/ThroughputControllerGui.java | 5 +- .../jmeter/control/gui/TreeNodeWrapper.java | 5 +- .../jmeter/extractor/BSFPostProcessor.java | 5 +- .../extractor/BSFPostProcessorBeanInfo.java | 5 +- .../extractor/BeanShellPostProcessor.java | 5 +- .../BeanShellPostProcessorBeanInfo.java | 5 +- .../jmeter/extractor/BoundaryExtractor.java | 5 +- .../jmeter/extractor/DebugPostProcessor.java | 5 +- .../extractor/DebugPostProcessorBeanInfo.java | 5 +- .../apache/jmeter/extractor/Extractor.java | 5 +- .../jmeter/extractor/HtmlExtractor.java | 5 +- .../jmeter/extractor/JSR223PostProcessor.java | 5 +- .../JSR223PostProcessorBeanInfo.java | 5 +- .../jmeter/extractor/JSoupExtractor.java | 5 +- .../jmeter/extractor/JoddExtractor.java | 5 +- .../jmeter/extractor/RegexExtractor.java | 5 +- .../jmeter/extractor/XPath2Extractor.java | 5 +- .../jmeter/extractor/XPathExtractor.java | 5 +- .../extractor/gui/BoundaryExtractorGui.java | 5 +- .../extractor/gui/HtmlExtractorGui.java | 5 +- .../extractor/gui/RegexExtractorGui.java | 5 +- .../extractor/gui/XPath2ExtractorGui.java | 5 +- .../extractor/gui/XPathExtractorGui.java | 5 +- .../json/jmespath/JMESPathCache.java | 5 +- .../json/jmespath/JMESPathCacheLoader.java | 5 +- .../json/jmespath/JMESPathExtractor.java | 5 +- .../jmespath/gui/JMESPathExtractorGui.java | 5 +- .../extractor/json/jsonpath/JSONManager.java | 5 +- .../json/jsonpath/JSONPostProcessor.java | 5 +- .../jsonpath/gui/JSONPostProcessorGui.java | 5 +- .../render/AbstractRenderAsJsonRenderer.java | 5 +- .../json/render/RenderAsJmesPathRenderer.java | 5 +- .../json/render/RenderAsJsonRenderer.java | 5 +- .../ExportTransactionAndSamplerNames.java | 5 +- .../jmeter/modifiers/BSFPreProcessor.java | 5 +- .../modifiers/BSFPreProcessorBeanInfo.java | 5 +- .../modifiers/BeanShellPreProcessor.java | 5 +- .../BeanShellPreProcessorBeanInfo.java | 5 +- .../jmeter/modifiers/CounterConfig.java | 5 +- .../jmeter/modifiers/JSR223PreProcessor.java | 5 +- .../modifiers/JSR223PreProcessorBeanInfo.java | 5 +- .../jmeter/modifiers/SampleTimeout.java | 5 +- .../jmeter/modifiers/UserParameters.java | 5 +- .../modifiers/gui/CounterConfigGui.java | 5 +- .../modifiers/gui/SampleTimeoutGui.java | 5 +- .../modifiers/gui/UserParametersGui.java | 5 +- .../apache/jmeter/reporters/MailerModel.java | 5 +- .../reporters/MailerResultCollector.java | 5 +- .../apache/jmeter/sampler/DebugSampler.java | 5 +- .../jmeter/sampler/DebugSamplerBeanInfo.java | 5 +- .../org/apache/jmeter/sampler/TestAction.java | 5 +- .../jmeter/sampler/gui/TestActionGui.java | 5 +- .../thinktime/DefaultThinkTimeCreator.java | 5 +- .../org/apache/jmeter/timers/BSFTimer.java | 5 +- .../jmeter/timers/BSFTimerBeanInfo.java | 5 +- .../apache/jmeter/timers/BeanShellTimer.java | 5 +- .../jmeter/timers/BeanShellTimerBeanInfo.java | 5 +- .../timers/ConstantThroughputTimer.java | 5 +- .../ConstantThroughputTimerBeanInfo.java | 5 +- .../apache/jmeter/timers/ConstantTimer.java | 5 +- .../jmeter/timers/GaussianRandomTimer.java | 5 +- .../org/apache/jmeter/timers/JSR223Timer.java | 5 +- .../jmeter/timers/JSR223TimerBeanInfo.java | 5 +- .../jmeter/timers/PoissonRandomTimer.java | 5 +- .../org/apache/jmeter/timers/RandomTimer.java | 5 +- .../org/apache/jmeter/timers/SyncTimer.java | 5 +- .../jmeter/timers/SyncTimerBeanInfo.java | 5 +- .../jmeter/timers/UniformRandomTimer.java | 5 +- .../timers/gui/AbstractRandomTimerGui.java | 5 +- .../jmeter/timers/gui/ConstantTimerGui.java | 5 +- .../timers/gui/GaussianRandomTimerGui.java | 5 +- .../timers/gui/PoissonRandomTimerGui.java | 5 +- .../timers/gui/UniformRandomTimerGui.java | 5 +- .../ConstantPoissonProcessGenerator.java | 5 +- .../poissonarrivals/DurationProvider.java | 5 +- .../timers/poissonarrivals/EventProducer.java | 5 +- .../PreciseThroughputTimer.java | 5 +- .../PreciseThroughputTimerBeanInfo.java | 5 +- .../poissonarrivals/ThroughputProvider.java | 5 +- .../ComponentTreeClonerForValidation.java | 5 +- .../jmeter/visualizers/AccumListener.java | 5 +- .../visualizers/AssertionVisualizer.java | 5 +- .../apache/jmeter/visualizers/AxisGraph.java | 5 +- .../jmeter/visualizers/BSFListener.java | 5 +- .../visualizers/BSFListenerBeanInfo.java | 5 +- .../apache/jmeter/visualizers/BarGraph.java | 5 +- .../jmeter/visualizers/BeanShellListener.java | 5 +- .../BeanShellListenerBeanInfo.java | 5 +- .../visualizers/ComparisonVisualizer.java | 5 +- .../org/apache/jmeter/visualizers/Graph.java | 5 +- .../jmeter/visualizers/GraphListener.java | 5 +- .../jmeter/visualizers/GraphVisualizer.java | 5 +- .../jmeter/visualizers/JSR223Listener.java | 5 +- .../visualizers/JSR223ListenerBeanInfo.java | 5 +- .../apache/jmeter/visualizers/LineGraph.java | 5 +- .../jmeter/visualizers/MailerVisualizer.java | 5 +- .../visualizers/PropertyControlGui.java | 5 +- .../RenderAsBoundaryExtractor.java | 5 +- .../jmeter/visualizers/RenderAsCssJQuery.java | 5 +- .../jmeter/visualizers/RenderAsDocument.java | 5 +- .../jmeter/visualizers/RenderAsHTML.java | 5 +- .../visualizers/RenderAsHTMLFormatted.java | 5 +- .../visualizers/RenderAsHTMLWithEmbedded.java | 5 +- .../jmeter/visualizers/RenderAsJSON.java | 5 +- .../jmeter/visualizers/RenderAsRegexp.java | 5 +- .../jmeter/visualizers/RenderAsText.java | 5 +- .../jmeter/visualizers/RenderAsXML.java | 5 +- .../jmeter/visualizers/RenderAsXPath.java | 5 +- .../jmeter/visualizers/RenderAsXPath2.java | 5 +- .../jmeter/visualizers/RequestPanel.java | 5 +- .../jmeter/visualizers/RequestView.java | 5 +- .../jmeter/visualizers/RequestViewRaw.java | 5 +- .../visualizers/RespTimeGraphChart.java | 5 +- .../visualizers/RespTimeGraphDataBean.java | 5 +- .../visualizers/RespTimeGraphLineBean.java | 5 +- .../visualizers/RespTimeGraphVisualizer.java | 5 +- .../jmeter/visualizers/ResultRenderer.java | 5 +- .../jmeter/visualizers/SamplerResultTab.java | 5 +- .../visualizers/SearchTextExtension.java | 5 +- .../jmeter/visualizers/SearchTreePanel.java | 5 +- .../visualizers/SearchableTreeNode.java | 5 +- .../jmeter/visualizers/SimpleDataWriter.java | 5 +- .../visualizers/StatGraphProperties.java | 5 +- .../visualizers/StatGraphVisualizer.java | 5 +- .../jmeter/visualizers/StatVisualizer.java | 5 +- .../jmeter/visualizers/SummaryReport.java | 5 +- .../jmeter/visualizers/TableVisualizer.java | 5 +- .../jmeter/visualizers/TreeNodeRenderer.java | 5 +- .../ViewResultsFullVisualizer.java | 5 +- .../XMLDefaultMutableTreeNode.java | 5 +- .../AbstractBackendListenerClient.java | 5 +- .../visualizers/backend/BackendListener.java | 5 +- .../backend/BackendListenerClient.java | 5 +- .../backend/BackendListenerContext.java | 5 +- .../backend/BackendListenerGui.java | 5 +- .../visualizers/backend/ErrorMetric.java | 5 +- .../visualizers/backend/SamplerMetric.java | 5 +- .../visualizers/backend/UserMetric.java | 5 +- .../visualizers/backend/WindowMode.java | 5 +- .../AbstractGraphiteMetricsSender.java | 5 +- .../GraphiteBackendListenerClient.java | 5 +- .../graphite/GraphiteMetricsSender.java | 5 +- .../graphite/PickleGraphiteMetricsSender.java | 5 +- .../graphite/SocketConnectionInfos.java | 5 +- .../backend/graphite/SocketOutputStream.java | 5 +- .../SocketOutputStreamPoolFactory.java | 5 +- .../graphite/TextGraphiteMetricsSender.java | 5 +- .../AbstractInfluxdbMetricsSender.java | 5 +- .../backend/influxdb/HttpMetricsSender.java | 5 +- .../InfluxdbBackendListenerClient.java | 5 +- .../influxdb/InfluxdbMetricsSender.java | 5 +- .../backend/influxdb/UdpMetricsSender.java | 5 +- .../jmeter/visualizers/utils/Colors.java | 5 +- .../BSFAssertionResources.properties | 26 +- .../BSFAssertionResources_fr.properties | 26 +- .../BSFAssertionResources_pl.properties | 27 +- .../BSFAssertionResources_pt_BR.properties | 26 +- .../BSFAssertionResources_zh_CN.properties | 26 +- .../CompareAssertionResources.properties | 26 +- .../CompareAssertionResources_fr.properties | 26 +- ...CompareAssertionResources_zh_CN.properties | 26 +- .../JSR223AssertionResources.properties | 26 +- .../JSR223AssertionResources_fr.properties | 26 +- .../JSR223AssertionResources_zh_CN.properties | 26 +- .../config/CSVDataSetResources.properties | 26 +- .../config/CSVDataSetResources_de.properties | 26 +- .../config/CSVDataSetResources_es.properties | 26 +- .../config/CSVDataSetResources_fr.properties | 26 +- .../config/CSVDataSetResources_pl.properties | 27 +- .../CSVDataSetResources_pt_BR.properties | 26 +- .../config/CSVDataSetResources_tr.properties | 26 +- .../CSVDataSetResources_zh_CN.properties | 26 +- .../CSVDataSetResources_zh_TW.properties | 26 +- .../config/KeystoreConfigResources.properties | 26 +- .../KeystoreConfigResources_fr.properties | 26 +- .../KeystoreConfigResources_zh_CN.properties | 26 +- .../RandomVariableConfigResources.properties | 26 +- ...andomVariableConfigResources_es.properties | 26 +- ...andomVariableConfigResources_fr.properties | 26 +- ...andomVariableConfigResources_pl.properties | 27 +- ...omVariableConfigResources_pt_BR.properties | 26 +- ...omVariableConfigResources_zh_CN.properties | 26 +- .../BSFPostProcessorResources.properties | 26 +- .../BSFPostProcessorResources_fr.properties | 26 +- .../BSFPostProcessorResources_pl.properties | 27 +- ...BSFPostProcessorResources_pt_BR.properties | 26 +- ...BSFPostProcessorResources_zh_CN.properties | 26 +- ...BeanShellPostProcessorResources.properties | 26 +- ...nShellPostProcessorResources_de.properties | 26 +- ...nShellPostProcessorResources_fr.properties | 26 +- ...nShellPostProcessorResources_pl.properties | 28 +- ...ellPostProcessorResources_pt_BR.properties | 26 +- ...nShellPostProcessorResources_tr.properties | 26 +- ...ellPostProcessorResources_zh_CN.properties | 26 +- .../DebugPostProcessorResources.properties | 26 +- .../DebugPostProcessorResources_de.properties | 26 +- .../DebugPostProcessorResources_fr.properties | 26 +- ...bugPostProcessorResources_pt_BR.properties | 26 +- .../DebugPostProcessorResources_tr.properties | 26 +- ...bugPostProcessorResources_zh_CN.properties | 26 +- .../JSR223PostProcessorResources.properties | 26 +- ...JSR223PostProcessorResources_fr.properties | 26 +- ...223PostProcessorResources_zh_CN.properties | 26 +- .../BSFPreProcessorResources.properties | 26 +- .../BSFPreProcessorResources_fr.properties | 26 +- .../BSFPreProcessorResources_pt_BR.properties | 26 +- .../BSFPreProcessorResources_zh_CN.properties | 26 +- .../BeanShellPreProcessorResources.properties | 26 +- ...anShellPreProcessorResources_de.properties | 26 +- ...anShellPreProcessorResources_fr.properties | 26 +- ...hellPreProcessorResources_pt_BR.properties | 26 +- ...anShellPreProcessorResources_tr.properties | 26 +- ...hellPreProcessorResources_zh_CN.properties | 26 +- .../JSR223PreProcessorResources.properties | 26 +- .../JSR223PreProcessorResources_fr.properties | 26 +- ...R223PreProcessorResources_zh_CN.properties | 26 +- .../sampler/DebugSamplerResources.properties | 26 +- .../DebugSamplerResources_de.properties | 26 +- .../DebugSamplerResources_fr.properties | 26 +- .../DebugSamplerResources_pt_BR.properties | 26 +- .../DebugSamplerResources_tr.properties | 26 +- .../DebugSamplerResources_zh_CN.properties | 26 +- .../timers/BSFTimerResources.properties | 26 +- .../timers/BSFTimerResources_fr.properties | 26 +- .../timers/BSFTimerResources_zh_CN.properties | 26 +- .../timers/BeanShellTimerResources.properties | 26 +- .../BeanShellTimerResources_de.properties | 26 +- .../BeanShellTimerResources_fr.properties | 26 +- .../BeanShellTimerResources_pt_BR.properties | 26 +- .../BeanShellTimerResources_tr.properties | 26 +- .../BeanShellTimerResources_zh_CN.properties | 26 +- ...onstantThroughputTimerResources.properties | 26 +- ...tantThroughputTimerResources_de.properties | 26 +- ...tantThroughputTimerResources_es.properties | 26 +- ...tantThroughputTimerResources_fr.properties | 26 +- ...tantThroughputTimerResources_ja.properties | 26 +- ...tThroughputTimerResources_pt_BR.properties | 26 +- ...tantThroughputTimerResources_tr.properties | 26 +- ...tThroughputTimerResources_zh_CN.properties | 26 +- ...tThroughputTimerResources_zh_TW.properties | 26 +- .../timers/JSR223TimerResources.properties | 26 +- .../timers/JSR223TimerResources_fr.properties | 26 +- .../JSR223TimerResources_zh_CN.properties | 26 +- .../timers/SyncTimerResources.properties | 26 +- .../timers/SyncTimerResources_de.properties | 26 +- .../timers/SyncTimerResources_es.properties | 26 +- .../timers/SyncTimerResources_fr.properties | 26 +- .../SyncTimerResources_pt_BR.properties | 26 +- .../timers/SyncTimerResources_tr.properties | 26 +- .../SyncTimerResources_zh_CN.properties | 26 +- ...PreciseThroughputTimerResources.properties | 26 +- ...ciseThroughputTimerResources_fr.properties | 26 +- ...eThroughputTimerResources_zh_CN.properties | 26 +- .../BSFListenerResources.properties | 26 +- .../BSFListenerResources_fr.properties | 26 +- .../BSFListenerResources_pt_BR.properties | 26 +- .../BSFListenerResources_zh_CN.properties | 26 +- .../BeanShellListenerResources.properties | 26 +- .../BeanShellListenerResources_de.properties | 26 +- .../BeanShellListenerResources_fr.properties | 26 +- ...eanShellListenerResources_pt_BR.properties | 26 +- .../BeanShellListenerResources_tr.properties | 26 +- ...eanShellListenerResources_zh_CN.properties | 26 +- .../JSR223ListenerResources.properties | 26 +- .../JSR223ListenerResources_fr.properties | 26 +- .../JSR223ListenerResources_zh_CN.properties | 26 +- .../visualizers/utils/colors.properties | 26 +- .../assertions/CompareAssertionSpec.groovy | 5 +- .../assertions/MD5HexAssertionSpec.groovy | 5 +- .../assertions/gui/AssertionGuiSpec.groovy | 5 +- .../control/RandomOrderControllerSpec.groovy | 5 +- .../apache/jmeter/control/RunTimeSpec.groovy | 5 +- .../control/ThroughputControllerSpec.groovy | 5 +- .../extractor/BoundaryExtractorSpec.groovy | 5 +- .../jmeter/extractor/JoddExtractorSpec.groovy | 5 +- .../RenderAsJmesPathRendererSpec.groovy | 5 +- .../render/RenderAsJsonRendererSpec.groovy | 5 +- .../timers/UniformRandomTimerSpec.groovy | 5 +- .../PickleGraphiteMetricsSenderSpec.groovy | 5 +- .../TextGraphiteMetricsSenderSpec.groovy | 5 +- .../InfluxdbBackendListenerClientSpec.groovy | 5 +- .../assertions/DurationAssertionTest.java | 5 +- .../assertions/ResponseAssertionTest.java | 5 +- .../jmeter/assertions/SMIMEAssertionTest.java | 5 +- .../jmeter/assertions/SizeAssertionTest.java | 5 +- .../assertions/TestJSONPathAssertion.java | 5 +- .../assertions/XMLSchemaAssertionTest.java | 5 +- .../assertions/XPath2AssertionTest.java | 5 +- .../jmeter/assertions/XPathAssertionTest.java | 5 +- .../jmeter/assertions/XmlAssertionTest.java | 5 +- .../gui/TestJSONPathAssertionGui.java | 5 +- .../jmespath/TestJMESPathAssertion.java | 5 +- .../gui/JMESPathAssertionGuiTest.java | 5 +- .../apache/jmeter/config/TestCVSDataSet.java | 5 +- .../config/TestRandomVariableConfig.java | 5 +- .../jmeter/config/gui/TestArgumentsPanel.java | 5 +- .../jmeter/control/TestGenericController.java | 5 +- .../jmeter/control/TestIfController.java | 5 +- .../jmeter/control/TestInterleaveControl.java | 5 +- .../jmeter/control/TestLoopController.java | 5 +- .../control/TestOnceOnlyController.java | 5 +- .../jmeter/control/TestRandomController.java | 5 +- .../control/TestTransactionController.java | 5 +- .../jmeter/control/TestWhileController.java | 5 +- .../extractor/TestBoundaryExtractor.java | 5 +- .../extractor/TestHtmlExtractorJSoup.java | 5 +- .../extractor/TestHtmlExtractorJodd.java | 5 +- .../extractor/TestJSONPostProcessor.java | 5 +- .../jmeter/extractor/TestRegexExtractor.java | 5 +- .../jmeter/extractor/TestXPath2Extractor.java | 5 +- .../jmeter/extractor/TestXPathExtractor.java | 5 +- .../json/jmespath/TestJMESPathExtractor.java | 5 +- .../apache/jmeter/gui/action/TestSave.java | 5 +- .../action/template/TestTemplateManager.java | 5 +- .../jmeter/reporters/TestResultSaver.java | 5 +- .../ResourceKeyUsageTestComponents.java | 5 +- .../timers/ConstantThroughputTimerTest.java | 5 +- .../apache/jmeter/timers/SyncTimerTest.java | 5 +- .../jmeter/timers/TimerServiceTest.java | 5 +- .../PreciseThroughputTimerTest.java | 5 +- .../jmeter/visualizers/TestRenderAsJson.java | 5 +- .../visualizers/TestSampleCompareTo.java | 5 +- .../TestSamplingStatCalculator.java | 5 +- .../backend/SamplerMetricFixedModeTest.java | 5 +- .../backend/SamplerMetricTimedModeTest.java | 5 +- .../influxdb/HttpMetricsSenderTest.java | 5 +- .../gui/action/template/invalidTemplates.xml | 19 +- .../gui/action/template/validTemplates.xml | 19 +- src/config/build.gradle.kts | 5 +- src/core/build.gradle.kts | 5 +- .../main/java/org/apache/jmeter/JMeter.java | 5 +- .../org/apache/jmeter/ProxyAuthenticator.java | 5 +- .../java/org/apache/jmeter/SplashScreen.java | 5 +- .../apache/jmeter/assertions/Assertion.java | 5 +- .../jmeter/assertions/AssertionResult.java | 5 +- .../assertions/CompareAssertionResult.java | 5 +- .../assertions/gui/AbstractAssertionGui.java | 5 +- .../org/apache/jmeter/config/Argument.java | 5 +- .../org/apache/jmeter/config/Arguments.java | 5 +- .../apache/jmeter/config/ConfigElement.java | 5 +- .../jmeter/config/ConfigTestElement.java | 5 +- .../org/apache/jmeter/config/LoginConfig.java | 5 +- .../jmeter/config/gui/AbstractConfigGui.java | 5 +- .../jmeter/config/gui/ArgumentsPanel.java | 5 +- .../jmeter/config/gui/LoginConfigGui.java | 5 +- .../apache/jmeter/config/gui/ObsoleteGui.java | 5 +- .../jmeter/config/gui/RowDetailDialog.java | 5 +- .../jmeter/config/gui/SimpleConfigGui.java | 5 +- .../org/apache/jmeter/control/Controller.java | 5 +- .../jmeter/control/GenericController.java | 5 +- .../apache/jmeter/control/IfController.java | 5 +- .../jmeter/control/IteratingController.java | 5 +- .../apache/jmeter/control/LoopController.java | 5 +- .../jmeter/control/NextIsNullException.java | 5 +- .../jmeter/control/ReplaceableController.java | 5 +- .../org/apache/jmeter/control/RunTime.java | 5 +- .../control/TestFragmentController.java | 5 +- .../jmeter/control/TransactionController.java | 5 +- .../jmeter/control/TransactionSampler.java | 5 +- .../jmeter/control/WhileController.java | 5 +- .../control/gui/AbstractControllerGui.java | 5 +- .../jmeter/control/gui/IfControllerPanel.java | 5 +- .../control/gui/LogicControllerGui.java | 5 +- .../jmeter/control/gui/LoopControlPanel.java | 5 +- .../apache/jmeter/control/gui/RunTimeGui.java | 5 +- .../gui/TestFragmentControllerGui.java | 5 +- .../jmeter/control/gui/TestPlanGui.java | 5 +- .../control/gui/TransactionControllerGui.java | 5 +- .../control/gui/WhileControllerGui.java | 5 +- .../jmeter/control/gui/WorkBenchGui.java | 5 +- .../jmeter/engine/ClientJMeterEngine.java | 5 +- .../jmeter/engine/ConvertListeners.java | 5 +- .../jmeter/engine/DistributedRunner.java | 5 +- .../apache/jmeter/engine/JMeterEngine.java | 5 +- .../jmeter/engine/JMeterEngineException.java | 5 +- .../org/apache/jmeter/engine/PreCompiler.java | 5 +- .../jmeter/engine/RemoteJMeterEngine.java | 5 +- .../jmeter/engine/RemoteJMeterEngineImpl.java | 5 +- .../jmeter/engine/StandardJMeterEngine.java | 5 +- .../org/apache/jmeter/engine/TreeCloner.java | 5 +- .../jmeter/engine/TreeClonerNoTimer.java | 5 +- .../apache/jmeter/engine/TurnElementsOn.java | 5 +- .../engine/event/LoopIterationEvent.java | 5 +- .../engine/event/LoopIterationListener.java | 5 +- .../apache/jmeter/engine/package-info.java | 5 +- .../engine/util/AbstractTransformer.java | 5 +- .../jmeter/engine/util/CompoundVariable.java | 5 +- .../util/ConfigMergabilityIndicator.java | 5 +- .../jmeter/engine/util/FunctionParser.java | 5 +- .../jmeter/engine/util/NoConfigMerge.java | 5 +- .../jmeter/engine/util/NoThreadClone.java | 5 +- .../util/ReplaceFunctionsWithStrings.java | 5 +- .../util/ReplaceStringWithFunctions.java | 5 +- .../jmeter/engine/util/SimpleVariable.java | 5 +- .../engine/util/UndoVariableReplacement.java | 5 +- .../jmeter/engine/util/ValueReplacer.java | 5 +- .../jmeter/engine/util/ValueTransformer.java | 5 +- .../IllegalUserActionException.java | 5 +- .../jmeter/functions/AbstractFunction.java | 5 +- .../org/apache/jmeter/functions/Function.java | 5 +- .../functions/InvalidVariableException.java | 5 +- .../jmeter/functions/gui/FunctionHelper.java | 5 +- .../gui/AbstractJMeterGuiComponent.java | 5 +- .../gui/AbstractScopedJMeterGuiComponent.java | 5 +- .../java/org/apache/jmeter/gui/ClearGui.java | 5 +- .../org/apache/jmeter/gui/CommentPanel.java | 5 +- .../org/apache/jmeter/gui/GUIFactory.java | 5 +- .../apache/jmeter/gui/GUIMenuSortOrder.java | 5 +- .../apache/jmeter/gui/GlobalUndoableEdit.java | 5 +- .../org/apache/jmeter/gui/GuiPackage.java | 5 +- .../apache/jmeter/gui/HtmlReportAction.java | 5 +- .../org/apache/jmeter/gui/HtmlReportUI.java | 5 +- .../apache/jmeter/gui/JMeterFileFilter.java | 5 +- .../apache/jmeter/gui/JMeterGUIComponent.java | 5 +- .../org/apache/jmeter/gui/LoggerPanel.java | 5 +- .../java/org/apache/jmeter/gui/MainFrame.java | 5 +- .../java/org/apache/jmeter/gui/NamePanel.java | 5 +- .../org/apache/jmeter/gui/OnErrorPanel.java | 5 +- .../org/apache/jmeter/gui/Replaceable.java | 5 +- .../apache/jmeter/gui/SavePropertyDialog.java | 5 +- .../org/apache/jmeter/gui/Searchable.java | 5 +- .../org/apache/jmeter/gui/ServerPanel.java | 5 +- .../apache/jmeter/gui/SimpleCompoundEdit.java | 5 +- .../java/org/apache/jmeter/gui/Stoppable.java | 5 +- .../apache/jmeter/gui/TestPlanListener.java | 5 +- .../java/org/apache/jmeter/gui/TreeState.java | 5 +- .../org/apache/jmeter/gui/UndoHistory.java | 5 +- .../apache/jmeter/gui/UndoHistoryItem.java | 5 +- .../apache/jmeter/gui/UnsharedComponent.java | 5 +- .../jmeter/gui/action/AboutCommand.java | 5 +- .../jmeter/gui/action/AbstractAction.java | 5 +- .../AbstractActionWithNoRunningTest.java | 5 +- .../apache/jmeter/gui/action/ActionNames.java | 5 +- .../jmeter/gui/action/ActionRouter.java | 5 +- .../apache/jmeter/gui/action/AddParent.java | 5 +- .../action/AddThinkTimeBetweenEachStep.java | 5 +- .../apache/jmeter/gui/action/AddToTree.java | 5 +- .../gui/action/ApplyNamingConvention.java | 5 +- .../jmeter/gui/action/ChangeLanguage.java | 5 +- .../jmeter/gui/action/ChangeParent.java | 5 +- .../apache/jmeter/gui/action/CheckDirty.java | 5 +- .../org/apache/jmeter/gui/action/Clear.java | 5 +- .../org/apache/jmeter/gui/action/Close.java | 5 +- .../jmeter/gui/action/CollapseExpand.java | 5 +- .../gui/action/CollapseExpandTreeBranch.java | 5 +- .../org/apache/jmeter/gui/action/Command.java | 5 +- .../gui/action/CompileJSR223TestElements.java | 5 +- .../org/apache/jmeter/gui/action/Copy.java | 5 +- .../gui/action/CreateFunctionDialog.java | 5 +- .../org/apache/jmeter/gui/action/Cut.java | 5 +- .../apache/jmeter/gui/action/Duplicate.java | 5 +- .../apache/jmeter/gui/action/EditCommand.java | 5 +- .../jmeter/gui/action/EnableComponent.java | 5 +- .../apache/jmeter/gui/action/ExitCommand.java | 5 +- .../org/apache/jmeter/gui/action/Help.java | 5 +- .../gui/action/HtmlReportGenerator.java | 5 +- .../apache/jmeter/gui/action/KeyStrokes.java | 5 +- .../org/apache/jmeter/gui/action/Load.java | 5 +- .../jmeter/gui/action/LoadDraggedFile.java | 5 +- .../jmeter/gui/action/LoadRecentProject.java | 5 +- .../jmeter/gui/action/LogLevelCommand.java | 5 +- .../gui/action/LoggerPanelEnableDisable.java | 5 +- .../jmeter/gui/action/LookAndFeelCommand.java | 5 +- .../org/apache/jmeter/gui/action/Move.java | 5 +- .../jmeter/gui/action/OpenLinkAction.java | 5 +- .../org/apache/jmeter/gui/action/Paste.java | 5 +- .../jmeter/gui/action/RawTextSearcher.java | 5 +- .../jmeter/gui/action/RegexpSearcher.java | 5 +- .../apache/jmeter/gui/action/RemoteStart.java | 5 +- .../org/apache/jmeter/gui/action/Remove.java | 5 +- .../jmeter/gui/action/ResetSearchCommand.java | 5 +- .../org/apache/jmeter/gui/action/Restart.java | 5 +- .../jmeter/gui/action/RevertProject.java | 5 +- .../jmeter/gui/action/SSLManagerCommand.java | 5 +- .../org/apache/jmeter/gui/action/Save.java | 5 +- .../jmeter/gui/action/SaveBeforeRun.java | 5 +- .../jmeter/gui/action/SaveGraphics.java | 5 +- .../jmeter/gui/action/SchematicView.java | 5 +- .../jmeter/gui/action/SearchTreeCommand.java | 5 +- .../jmeter/gui/action/SearchTreeDialog.java | 5 +- .../apache/jmeter/gui/action/Searcher.java | 5 +- .../gui/action/SelectTemplatesDialog.java | 5 +- .../org/apache/jmeter/gui/action/Start.java | 5 +- .../jmeter/gui/action/StopStoppables.java | 5 +- .../jmeter/gui/action/TemplatesCommand.java | 5 +- .../gui/action/TreeNodeNamingPolicy.java | 5 +- .../apache/jmeter/gui/action/UndoCommand.java | 5 +- .../org/apache/jmeter/gui/action/What.java | 5 +- .../apache/jmeter/gui/action/ZoomInOut.java | 5 +- .../impl/DefaultTreeNodeNamingPolicy.java | 5 +- .../jmeter/gui/action/template/Template.java | 5 +- .../gui/action/template/TemplateManager.java | 5 +- .../action/thinktime/ThinkTimeCreator.java | 5 +- .../validation/TreeClonerForValidation.java | 5 +- .../gui/logging/GuiLogEventAppender.java | 5 +- .../jmeter/gui/logging/GuiLogEventBus.java | 5 +- .../gui/logging/GuiLogEventListener.java | 5 +- .../jmeter/gui/logging/LogEventObject.java | 5 +- .../apache/jmeter/gui/plugin/MenuCreator.java | 5 +- .../jmeter/gui/tree/JMeterCellRenderer.java | 5 +- .../jmeter/gui/tree/JMeterTreeListener.java | 5 +- .../jmeter/gui/tree/JMeterTreeModel.java | 5 +- .../jmeter/gui/tree/JMeterTreeNode.java | 5 +- .../gui/tree/JMeterTreeTransferHandler.java | 5 +- .../apache/jmeter/gui/tree/NamedTreeNode.java | 5 +- .../apache/jmeter/gui/util/CheckBoxPanel.java | 5 +- .../apache/jmeter/gui/util/EscapeDialog.java | 5 +- .../apache/jmeter/gui/util/FileDialoger.java | 5 +- .../apache/jmeter/gui/util/FileListPanel.java | 5 +- .../org/apache/jmeter/gui/util/FilePanel.java | 5 +- .../jmeter/gui/util/FilePanelEntry.java | 5 +- .../jmeter/gui/util/FocusRequester.java | 5 +- .../gui/util/HeaderAsPropertyRenderer.java | 5 +- .../util/HeaderAsPropertyRendererWrapper.java | 5 +- .../jmeter/gui/util/HorizontalPanel.java | 5 +- .../jmeter/gui/util/IconToolbarBean.java | 5 +- .../apache/jmeter/gui/util/JDateField.java | 5 +- .../jmeter/gui/util/JLabeledRadioI18N.java | 5 +- .../apache/jmeter/gui/util/JMeterColor.java | 5 +- .../apache/jmeter/gui/util/JMeterMenuBar.java | 5 +- .../apache/jmeter/gui/util/JMeterToolBar.java | 5 +- .../jmeter/gui/util/JSyntaxSearchToolBar.java | 5 +- .../jmeter/gui/util/JSyntaxTextArea.java | 5 +- .../jmeter/gui/util/JTextScrollPane.java | 5 +- .../apache/jmeter/gui/util/MenuFactory.java | 5 +- .../org/apache/jmeter/gui/util/MenuInfo.java | 5 +- .../jmeter/gui/util/MenuSeparatorInfo.java | 5 +- .../gui/util/NumberFieldErrorListener.java | 5 +- .../jmeter/gui/util/PowerTableModel.java | 5 +- .../jmeter/gui/util/TextAreaCellRenderer.java | 5 +- .../gui/util/TextAreaTableCellEditor.java | 5 +- .../jmeter/gui/util/TextBoxDialoger.java | 5 +- .../jmeter/gui/util/TristateCheckBox.java | 5 +- .../apache/jmeter/gui/util/TristateState.java | 5 +- .../apache/jmeter/gui/util/VerticalPanel.java | 5 +- .../apache/jmeter/plugin/JMeterPlugin.java | 5 +- .../apache/jmeter/plugin/PluginManager.java | 5 +- .../jmeter/processor/PostProcessor.java | 5 +- .../apache/jmeter/processor/PreProcessor.java | 5 +- .../gui/AbstractPostProcessorGui.java | 5 +- .../gui/AbstractPreProcessorGui.java | 5 +- .../report/config/ConfigurationException.java | 5 +- .../report/config/ConfigurationUtils.java | 5 +- .../report/config/ExporterConfiguration.java | 5 +- .../report/config/GraphConfiguration.java | 5 +- .../report/config/InstanceConfiguration.java | 5 +- .../config/ReportGeneratorConfiguration.java | 5 +- .../report/config/SubConfiguration.java | 5 +- .../report/core/AbstractSampleWriter.java | 5 +- .../core/ControllerSamplePredicate.java | 5 +- .../jmeter/report/core/ConvertException.java | 5 +- .../apache/jmeter/report/core/Converters.java | 5 +- .../apache/jmeter/report/core/CsvFile.java | 5 +- .../jmeter/report/core/CsvSampleReader.java | 5 +- .../jmeter/report/core/CsvSampleWriter.java | 5 +- .../jmeter/report/core/DataContext.java | 5 +- .../apache/jmeter/report/core/JsonUtil.java | 5 +- .../org/apache/jmeter/report/core/Sample.java | 5 +- .../jmeter/report/core/SampleBuilder.java | 5 +- .../jmeter/report/core/SampleComparator.java | 5 +- .../jmeter/report/core/SampleException.java | 5 +- .../report/core/SampleMetaDataParser.java | 5 +- .../jmeter/report/core/SampleMetadata.java | 5 +- .../jmeter/report/core/SamplePredicate.java | 5 +- .../jmeter/report/core/SampleSelector.java | 5 +- .../jmeter/report/core/SampleWriter.java | 5 +- .../jmeter/report/core/StringConverter.java | 5 +- .../apache/jmeter/report/core/TimeHelper.java | 5 +- .../dashboard/AbstractDataExporter.java | 5 +- .../jmeter/report/dashboard/DataExporter.java | 5 +- .../report/dashboard/ExportException.java | 5 +- .../report/dashboard/GenerationException.java | 5 +- .../dashboard/HtmlTemplateExporter.java | 5 +- .../jmeter/report/dashboard/JsonExporter.java | 5 +- .../report/dashboard/JsonizerVisitor.java | 5 +- .../report/dashboard/ReportGenerator.java | 5 +- .../report/dashboard/SamplingStatistic.java | 5 +- .../report/dashboard/TemplateVisitor.java | 5 +- .../processor/AbstractAggregatorFactory.java | 5 +- .../processor/AbstractSampleConsumer.java | 5 +- .../processor/AbstractSampleProcessor.java | 5 +- .../processor/AbstractSampleSource.java | 5 +- .../processor/AbstractSummaryConsumer.java | 5 +- .../report/processor/AggregateConsumer.java | 5 +- .../jmeter/report/processor/Aggregator.java | 5 +- .../report/processor/AggregatorFactory.java | 5 +- .../processor/ApdexSummaryConsumer.java | 5 +- .../report/processor/ApdexSummaryData.java | 5 +- .../report/processor/ApdexThresholdsInfo.java | 5 +- .../report/processor/ChannelContext.java | 5 +- .../report/processor/CsvFileSampleSource.java | 5 +- .../processor/ErrorsSummaryConsumer.java | 5 +- .../processor/ExternalSampleSorter.java | 5 +- .../processor/FieldSampleComparator.java | 5 +- .../report/processor/FilterConsumer.java | 5 +- .../apache/jmeter/report/processor/Job.java | 5 +- .../report/processor/ListResultData.java | 5 +- .../report/processor/MapResultData.java | 5 +- .../report/processor/MaxAggregator.java | 5 +- .../processor/MaxAggregatorFactory.java | 5 +- .../report/processor/MeanAggregator.java | 5 +- .../processor/MeanAggregatorFactory.java | 5 +- .../processor/MedianAggregatorFactory.java | 5 +- .../report/processor/MinAggregator.java | 5 +- .../processor/MinAggregatorFactory.java | 5 +- .../processor/NormalizerSampleConsumer.java | 5 +- .../processor/PercentileAggregator.java | 5 +- .../PercentileAggregatorFactory.java | 5 +- .../processor/RequestsSummaryConsumer.java | 5 +- .../jmeter/report/processor/ResultData.java | 5 +- .../report/processor/ResultDataVisitor.java | 5 +- .../report/processor/SampleConsumer.java | 5 +- .../report/processor/SampleContext.java | 5 +- .../report/processor/SampleIndexer.java | 5 +- .../report/processor/SampleProcessor.java | 5 +- .../report/processor/SampleProducer.java | 5 +- .../jmeter/report/processor/SampleSource.java | 5 +- .../processor/SampleWriterConsumer.java | 5 +- .../processor/StatisticsSummaryConsumer.java | 5 +- .../processor/StatisticsSummaryData.java | 5 +- .../report/processor/SumAggregator.java | 5 +- .../processor/SumAggregatorFactory.java | 5 +- .../report/processor/TaggerConsumer.java | 5 +- .../report/processor/ThresholdSelector.java | 5 +- .../report/processor/TimeRateAggregator.java | 5 +- .../processor/TimeRateAggregatorFactory.java | 5 +- .../Top5ErrorsBySamplerConsumer.java | 5 +- .../processor/Top5ErrorsSummaryData.java | 5 +- .../report/processor/ValueResultData.java | 5 +- .../graph/AbstractGraphConsumer.java | 5 +- .../graph/AbstractGraphValueSelector.java | 5 +- .../graph/AbstractOverTimeGraphConsumer.java | 5 +- .../graph/AbstractSeriesSelector.java | 5 +- .../AbstractVersusRequestsGraphConsumer.java | 5 +- .../processor/graph/CodeSeriesSelector.java | 5 +- .../graph/ConnectTimeValueSelector.java | 5 +- .../processor/graph/CountValueSelector.java | 5 +- .../graph/ElapsedTimeValueSelector.java | 5 +- .../processor/graph/GraphKeysSelector.java | 5 +- .../processor/graph/GraphSeriesSelector.java | 5 +- .../processor/graph/GraphValueSelector.java | 5 +- .../report/processor/graph/GroupData.java | 5 +- .../report/processor/graph/GroupInfo.java | 5 +- .../processor/graph/IndexedNameSelector.java | 5 +- .../processor/graph/LatencyValueSelector.java | 5 +- .../processor/graph/NameSeriesSelector.java | 5 +- .../report/processor/graph/SeriesData.java | 5 +- .../processor/graph/StaticSeriesSelector.java | 5 +- .../processor/graph/StatusSeriesSelector.java | 5 +- .../SuccessfulElapsedTimeValueSelector.java | 5 +- .../graph/TimeStampKeysSelector.java | 5 +- .../impl/ActiveThreadsGraphConsumer.java | 5 +- .../impl/BytesThroughputGraphConsumer.java | 5 +- .../impl/CodesPerSecondGraphConsumer.java | 5 +- .../ConnectTimeOverTimeGraphConsumer.java | 5 +- .../graph/impl/CustomGraphConsumer.java | 5 +- .../impl/HitsPerSecondGraphConsumer.java | 5 +- .../impl/LatencyOverTimeGraphConsumer.java | 5 +- .../impl/LatencyVSRequestGraphConsumer.java | 5 +- .../ResponseCustomGraphGraphConsumer.java | 5 +- ...ResponseTimeDistributionGraphConsumer.java | 5 +- .../ResponseTimeOverTimeGraphConsumer.java | 5 +- .../ResponseTimePerSampleGraphConsumer.java | 5 +- .../ResponseTimePercentilesGraphConsumer.java | 5 +- ...eTimePercentilesOverTimeGraphConsumer.java | 5 +- .../ResponseTimeVSRequestGraphConsumer.java | 5 +- ...ResponseTimeDistributionGraphConsumer.java | 5 +- .../graph/impl/TimeVSThreadGraphConsumer.java | 5 +- .../graph/impl/TotalTPSGraphConsumer.java | 5 +- .../TransactionsPerSecondGraphConsumer.java | 5 +- .../jmeter/report/utils/MetricUtils.java | 5 +- .../reporters/AbstractListenerElement.java | 5 +- .../apache/jmeter/reporters/ResultAction.java | 5 +- .../jmeter/reporters/ResultCollector.java | 5 +- .../reporters/ResultCollectorHelper.java | 5 +- .../apache/jmeter/reporters/ResultSaver.java | 5 +- .../apache/jmeter/reporters/Summariser.java | 5 +- .../reporters/SummariserRunningSample.java | 5 +- .../jmeter/reporters/gui/ResultActionGui.java | 5 +- .../jmeter/reporters/gui/ResultSaverGui.java | 5 +- .../jmeter/reporters/gui/SummariserGui.java | 5 +- .../apache/jmeter/rmi/AliasKeyManager.java | 5 +- .../rmi/RMIServerSocketFactoryImpl.java | 5 +- .../java/org/apache/jmeter/rmi/RmiUtils.java | 5 +- .../jmeter/rmi/SSLRMIClientSocketFactory.java | 5 +- .../jmeter/rmi/SSLRMIServerSocketFactory.java | 5 +- .../jmeter/samplers/AbstractSampleSender.java | 5 +- .../jmeter/samplers/AbstractSampler.java | 5 +- .../jmeter/samplers/AsynchSampleSender.java | 5 +- .../jmeter/samplers/BatchSampleSender.java | 5 +- .../org/apache/jmeter/samplers/Clearable.java | 5 +- .../samplers/DataStrippingSampleSender.java | 5 +- .../samplers/DiskStoreSampleSender.java | 5 +- .../org/apache/jmeter/samplers/Entry.java | 5 +- .../jmeter/samplers/HoldSampleSender.java | 5 +- .../apache/jmeter/samplers/Interruptible.java | 5 +- .../samplers/RemoteListenerWrapper.java | 5 +- .../jmeter/samplers/RemoteSampleListener.java | 5 +- .../samplers/RemoteSampleListenerImpl.java | 5 +- .../samplers/RemoteSampleListenerWrapper.java | 5 +- .../samplers/RemoteTestListenerWrapper.java | 5 +- .../apache/jmeter/samplers/Remoteable.java | 5 +- .../apache/jmeter/samplers/SampleEvent.java | 5 +- .../jmeter/samplers/SampleListener.java | 5 +- .../apache/jmeter/samplers/SampleMonitor.java | 5 +- .../apache/jmeter/samplers/SampleResult.java | 5 +- .../samplers/SampleSaveConfiguration.java | 5 +- .../apache/jmeter/samplers/SampleSender.java | 5 +- .../jmeter/samplers/SampleSenderFactory.java | 5 +- .../org/apache/jmeter/samplers/Sampler.java | 5 +- .../jmeter/samplers/StandardSampleSender.java | 5 +- .../samplers/StatisticalSampleResult.java | 5 +- .../samplers/StatisticalSampleSender.java | 5 +- .../samplers/gui/AbstractSamplerGui.java | 5 +- .../apache/jmeter/save/CSVSaveService.java | 5 +- .../jmeter/save/ListenerResultWrapper.java | 5 +- .../jmeter/save/SaveGraphicsService.java | 5 +- .../org/apache/jmeter/save/SaveService.java | 5 +- .../org/apache/jmeter/save/ScriptWrapper.java | 5 +- .../jmeter/save/ScriptWrapperConverter.java | 5 +- .../apache/jmeter/save/TestResultWrapper.java | 5 +- .../converters/BooleanPropertyConverter.java | 5 +- .../save/converters/ConversionHelp.java | 5 +- .../save/converters/HashTreeConverter.java | 5 +- .../converters/IntegerPropertyConverter.java | 5 +- .../converters/LongPropertyConverter.java | 5 +- .../converters/MultiPropertyConverter.java | 5 +- .../save/converters/SampleEventConverter.java | 5 +- .../converters/SampleResultConverter.java | 5 +- .../SampleSaveConfigurationConverter.java | 5 +- .../converters/StringPropertyConverter.java | 5 +- .../save/converters/TestElementConverter.java | 5 +- .../TestElementPropertyConverter.java | 5 +- .../TestResultWrapperConverter.java | 5 +- .../apache/jmeter/services/FileServer.java | 5 +- .../org/apache/jmeter/swing/HtmlPane.java | 5 +- .../jmeter/testbeans/BeanInfoSupport.java | 5 +- .../org/apache/jmeter/testbeans/TestBean.java | 5 +- .../jmeter/testbeans/TestBeanBeanInfo.java | 5 +- .../jmeter/testbeans/TestBeanHelper.java | 5 +- .../testbeans/gui/BooleanPropertyEditor.java | 5 +- .../testbeans/gui/ComboStringEditor.java | 5 +- .../jmeter/testbeans/gui/EnumEditor.java | 5 +- .../testbeans/gui/FieldStringEditor.java | 5 +- .../jmeter/testbeans/gui/FileEditor.java | 5 +- .../gui/GenericTestBeanCustomizer.java | 5 +- .../testbeans/gui/IntegerPropertyEditor.java | 5 +- .../testbeans/gui/LongPropertyEditor.java | 5 +- .../jmeter/testbeans/gui/PasswordEditor.java | 5 +- .../testbeans/gui/SharedCustomizer.java | 5 +- .../jmeter/testbeans/gui/TableEditor.java | 5 +- .../jmeter/testbeans/gui/TestBeanGUI.java | 5 +- .../testbeans/gui/TestBeanPropertyEditor.java | 5 +- .../jmeter/testbeans/gui/TextAreaEditor.java | 5 +- .../jmeter/testbeans/gui/TypeEditor.java | 5 +- .../jmeter/testbeans/gui/WrapperEditor.java | 5 +- .../testelement/AbstractScopedAssertion.java | 5 +- .../AbstractScopedTestElement.java | 5 +- .../testelement/AbstractTestElement.java | 5 +- .../AbstractTestElementBeanInfo.java | 5 +- .../jmeter/testelement/NonTestElement.java | 5 +- .../testelement/OnErrorTestElement.java | 5 +- .../jmeter/testelement/TestCloneable.java | 5 +- .../jmeter/testelement/TestElement.java | 5 +- .../testelement/TestElementTraverser.java | 5 +- .../testelement/TestIterationListener.java | 5 +- .../apache/jmeter/testelement/TestPlan.java | 5 +- .../jmeter/testelement/TestStateListener.java | 5 +- .../jmeter/testelement/ThreadListener.java | 5 +- .../testelement/VariablesCollection.java | 5 +- .../apache/jmeter/testelement/WorkBench.java | 5 +- .../property/AbstractProperty.java | 5 +- .../testelement/property/BooleanProperty.java | 5 +- .../property/CollectionProperty.java | 5 +- .../testelement/property/DoubleProperty.java | 5 +- .../testelement/property/FloatProperty.java | 5 +- .../property/FunctionProperty.java | 5 +- .../testelement/property/IntegerProperty.java | 5 +- .../testelement/property/JMeterProperty.java | 5 +- .../testelement/property/LongProperty.java | 5 +- .../testelement/property/MapProperty.java | 5 +- .../testelement/property/MultiProperty.java | 5 +- .../testelement/property/NullProperty.java | 5 +- .../testelement/property/NumberProperty.java | 5 +- .../testelement/property/ObjectProperty.java | 5 +- .../property/PropertyIterator.java | 5 +- .../property/PropertyIteratorImpl.java | 5 +- .../testelement/property/StringProperty.java | 5 +- .../property/TestElementProperty.java | 5 +- .../jmeter/threads/AbstractThreadGroup.java | 5 +- .../FindTestElementsUpToRootTraverser.java | 5 +- .../apache/jmeter/threads/JMeterContext.java | 5 +- .../jmeter/threads/JMeterContextService.java | 5 +- .../apache/jmeter/threads/JMeterThread.java | 5 +- .../jmeter/threads/JMeterThreadMonitor.java | 5 +- .../jmeter/threads/JMeterVariables.java | 5 +- .../jmeter/threads/ListenerNotifier.java | 5 +- .../jmeter/threads/PostThreadGroup.java | 5 +- .../RemoteThreadsLifeCycleListener.java | 5 +- .../jmeter/threads/RemoteThreadsListener.java | 5 +- .../threads/RemoteThreadsListenerImpl.java | 5 +- .../RemoteThreadsListenerTestElement.java | 5 +- .../threads/RemoteThreadsListenerWrapper.java | 5 +- .../apache/jmeter/threads/SamplePackage.java | 5 +- .../jmeter/threads/SetupThreadGroup.java | 5 +- .../apache/jmeter/threads/TestCompiler.java | 5 +- .../jmeter/threads/TestCompilerHelper.java | 5 +- .../apache/jmeter/threads/ThreadGroup.java | 5 +- .../threads/UnmodifiableJMeterVariables.java | 5 +- .../threads/gui/AbstractThreadGroupGui.java | 5 +- .../threads/gui/PostThreadGroupGui.java | 5 +- .../threads/gui/SetupThreadGroupGui.java | 5 +- .../jmeter/threads/gui/ThreadGroupGui.java | 5 +- .../apache/jmeter/timers/ModifiableTimer.java | 5 +- .../java/org/apache/jmeter/timers/Timer.java | 5 +- .../apache/jmeter/timers/TimerService.java | 5 +- .../jmeter/timers/gui/AbstractTimerGui.java | 5 +- .../jmeter/util/BSFBeanInfoSupport.java | 5 +- .../jmeter/util/BSFJavaScriptEngine.java | 5 +- .../apache/jmeter/util/BSFTestElement.java | 5 +- .../jmeter/util/BeanShellBeanInfoSupport.java | 5 +- .../jmeter/util/BeanShellInterpreter.java | 5 +- .../apache/jmeter/util/BeanShellServer.java | 5 +- .../jmeter/util/BeanShellTestElement.java | 5 +- .../org/apache/jmeter/util/CPSPauser.java | 5 +- .../org/apache/jmeter/util/Calculator.java | 5 +- .../org/apache/jmeter/util/ColorHelper.java | 5 +- .../jmeter/util/CustomX509TrustManager.java | 5 +- .../java/org/apache/jmeter/util/Document.java | 5 +- .../util/HttpSSLProtocolSocketFactory.java | 5 +- .../util/JMeterTreeNodeTransferable.java | 5 +- .../org/apache/jmeter/util/JMeterUtils.java | 5 +- .../jmeter/util/JSR223BeanInfoSupport.java | 5 +- .../apache/jmeter/util/JSR223TestElement.java | 5 +- .../apache/jmeter/util/JsseSSLManager.java | 5 +- .../apache/jmeter/util/LocaleChangeEvent.java | 5 +- .../jmeter/util/LocaleChangeListener.java | 5 +- .../org/apache/jmeter/util/NameUpdater.java | 5 +- .../org/apache/jmeter/util/NamedObject.java | 5 +- .../util/PropertiesBasedPrefixResolver.java | 5 +- ...ropertiesBasedPrefixResolverForXpath2.java | 5 +- .../org/apache/jmeter/util/SSLManager.java | 5 +- .../org/apache/jmeter/util/ScopePanel.java | 5 +- .../jmeter/util/ScriptingBeanInfoSupport.java | 5 +- .../jmeter/util/ScriptingTestElement.java | 5 +- .../apache/jmeter/util/SlowInputStream.java | 5 +- .../apache/jmeter/util/SlowOutputStream.java | 5 +- .../org/apache/jmeter/util/SlowSSLSocket.java | 5 +- .../org/apache/jmeter/util/SlowSocket.java | 5 +- .../apache/jmeter/util/StringUtilities.java | 5 +- .../org/apache/jmeter/util/TemplateUtil.java | 5 +- .../org/apache/jmeter/util/TidyException.java | 5 +- .../jmeter/util/TrustAllSSLSocketFactory.java | 5 +- .../jmeter/util/XPathQueryCacheLoader.java | 5 +- .../org/apache/jmeter/util/XPathUtil.java | 5 +- .../jmeter/util/keystore/JmeterKeyStore.java | 5 +- .../visualizers/CachingStatCalculator.java | 5 +- .../jmeter/visualizers/ImageVisualizer.java | 5 +- .../apache/jmeter/visualizers/Printable.java | 5 +- .../jmeter/visualizers/RunningSample.java | 5 +- .../org/apache/jmeter/visualizers/Sample.java | 5 +- .../visualizers/SamplingStatCalculator.java | 5 +- .../jmeter/visualizers/TableSample.java | 5 +- .../apache/jmeter/visualizers/Visualizer.java | 5 +- .../jmeter/visualizers/backend/Backend.java | 5 +- .../visualizers/gui/AbstractListenerGui.java | 5 +- .../visualizers/gui/AbstractVisualizer.java | 5 +- .../apache/jmeter/gui/action/schematic.xsl | 107 +-- .../jmeter/gui/util/textarea.properties | 4 +- .../jmeter/gui/util/theme/darcula_theme.xml | 29 +- .../org/apache/jmeter/images/icon.properties | 26 +- .../apache/jmeter/images/icon_1.properties | 26 +- .../apache/jmeter/images/icon_old.properties | 26 +- .../images/toolbar/icons-toolbar.properties | 26 +- .../jmeter/resources/messages.properties | 26 +- .../jmeter/resources/messages_de.properties | 26 +- .../jmeter/resources/messages_es.properties | 26 +- .../jmeter/resources/messages_fr.properties | 26 +- .../jmeter/resources/messages_ja.properties | 26 +- .../jmeter/resources/messages_no.properties | 26 +- .../jmeter/resources/messages_pl.properties | 30 +- .../resources/messages_pt_BR.properties | 26 +- .../jmeter/resources/messages_tr.properties | 26 +- .../resources/messages_zh_CN.properties | 26 +- .../resources/messages_zh_TW.properties | 26 +- .../jmeter/gui/HtmlReportGUISpec.groovy | 5 +- .../jmeter/junit/spock/JMeterSpec.groovy | 5 +- .../jmeter/report/core/ConvertersSpec.groovy | 5 +- .../core/SampleMetadataParserSpec.groovy | 5 +- .../processor/ApdexSummaryConsumerSpec.groovy | 5 +- .../FieldSampleComparatorSpec.groovy | 5 +- .../processor/ListResultDataSpec.groovy | 5 +- .../Top5ErrorsBySamplerConsumerSpec.groovy | 5 +- .../Top5ErrorsSummaryDataSpec.groovy | 5 +- ...ercentilesOverTimeGraphConsumerSpec.groovy | 5 +- .../jmeter/services/FileServerSpec.groovy | 5 +- .../util/keystore/JmeterKeyStoreSpec.groovy | 5 +- .../java/org/apache/jmeter/JMeterTest.java | 5 +- .../jmeter/engine/DistributedRunnerTest.java | 5 +- .../apache/jmeter/engine/LocalHostTest.java | 5 +- .../apache/jmeter/engine/TestTreeCloner.java | 5 +- .../jmeter/engine/util/TestValueReplacer.java | 5 +- .../gui/logging/TestGuiLogEventAppender.java | 5 +- .../jmeter/gui/util/JSyntaxTextAreaTest.java | 5 +- .../jmeter/gui/util/TristateCheckBoxTest.java | 5 +- .../apache/jmeter/junit/JMeterTestCase.java | 5 +- .../jmeter/junit/JMeterTestCaseJUnit.java | 5 +- .../apache/jmeter/junit/JMeterTestUtils.java | 5 +- .../categories/ExcludeCategoryFilter.java | 5 +- .../jmeter/junit/categories/NeedGuiTests.java | 5 +- .../jmeter/junit/stubs/TestSampler.java | 5 +- .../jmeter/listeners/TestResultAction.java | 5 +- .../report/core/CsvSampleReaderTest.java | 5 +- .../report/core/SampleMetadataTest.java | 5 +- .../report/core/TestCsvSampleWriter.java | 5 +- .../dashboard/ApdexPerTransactionTest.java | 5 +- .../processor/ErrorsSummaryConsumerTest.java | 5 +- .../graph/impl/CustomGraphConsumerTest.java | 5 +- .../apache/jmeter/resources/PackageTest.java | 5 +- .../resources/ResourceKeyUsageTest.java | 5 +- .../apache/jmeter/samplers/NullSampler.java | 5 +- .../TestDataStrippingSampleSender.java | 5 +- .../jmeter/samplers/TestSampleResult.java | 5 +- .../samplers/TestSampleSaveConfiguration.java | 5 +- .../jmeter/save/TestCSVSaveService.java | 5 +- .../gui/TestBooleanPropertyEditor.java | 5 +- .../testbeans/gui/TestComboStringEditor.java | 5 +- .../testbeans/gui/TestFieldStringEditor.java | 5 +- .../jmeter/testelement/PackageTest.java | 5 +- .../testelement/TestNumberProperty.java | 5 +- .../property/AbstractPropertyTest.java | 5 +- .../testelement/property/MapPropertyTest.java | 5 +- .../testelement/property/PackageTest.java | 5 +- .../threads/JMeterContextServiceHelper.java | 5 +- .../threads/TestJMeterContextService.java | 5 +- .../jmeter/threads/TestJMeterThread.java | 5 +- .../jmeter/threads/TestTestCompiler.java | 5 +- .../TestUnmodifiableJMeterVariables.java | 5 +- .../jmeter/util/JMeterContextExtension.java | 5 +- .../jmeter/util/JSR223TestElementTest.java | 5 +- .../org/apache/jmeter/util/LogRecord.java | 5 +- .../util/LogRecordingDelegatingLogger.java | 5 +- .../org/apache/jmeter/util/PackageTest.java | 5 +- .../jmeter/util/StringUtilitiesTest.java | 5 +- .../apache/jmeter/util/TestJMeterUtils.java | 5 +- .../org/apache/jmeter/util/XPathUtilTest.java | 5 +- .../org/apache/jorphan/TestXMLBuffer.java | 5 +- .../apache/jorphan/reflect/TestFunctor.java | 5 +- .../org/apache/jorphan/test/AllTests.java | 5 +- .../apache/jorphan/test/JMeterSerialTest.java | 5 +- .../src/test/resources/XPathUtilTestXml.xml | 19 +- src/core/src/test/resources/log4j2.xml | 29 +- .../dashboard/reportgenerator_test.properties | 19 +- src/dist-check/build.gradle.kts | 5 +- .../jmeter/engine/util/PackageSpec.groovy | 5 +- .../gui/action/HtmlReportGeneratorSpec.groovy | 5 +- .../jmeter/gui/util/MenuFactorySpec.groovy | 5 +- .../dashboard/ReportGeneratorSpec.groovy | 5 +- .../jmeter/control/TestSwitchController.java | 5 +- .../ComponentReferenceFunctionTest.java | 5 +- .../apache/jmeter/gui/action/TestLoad.java | 5 +- .../org/apache/jmeter/junit/JMeterTest.java | 5 +- .../jmeter/resources/TestPropertiesFiles.java | 5 +- .../apache/jmeter/save/TestSaveService.java | 5 +- .../jmeter/testbeans/gui/PackageTest.java | 5 +- .../jmeter/testelement/TestElementTest.java | 5 +- .../jmeter/threads/ThreadGroupLoad.java | 5 +- .../org/apache/jorphan/TestFunctorUsers.java | 5 +- .../jorphan/reflect/TestClassFinder.java | 5 +- src/dist/build.gradle.kts | 5 +- src/examples/build.gradle.kts | 5 +- .../examples/sampler/ExampleSampler.java | 5 +- .../sampler/gui/ExampleSamplerGui.java | 5 +- .../examples/testbeans/example1/Example1.java | 5 +- .../examples/testbeans/example2/Example2.java | 5 +- .../testbeans/example2/Example2BeanInfo.java | 5 +- .../examples/testbeans/example3/Example3.java | 5 +- .../testbeans/example3/Example3BeanInfo.java | 5 +- .../example2/Example2Resources.properties | 26 +- .../example2/Example2Resources_es.properties | 26 +- .../Example2Resources_pt_BR.properties | 26 +- .../example2/Example2Resources_tr.properties | 26 +- .../Example2Resources_zh_TW.properties | 26 +- .../example3/Example3Resources.properties | 26 +- src/functions/build.gradle.kts | 5 +- .../functions/AbstractFunctionByKey.java | 5 +- .../jmeter/functions/AbstractHostIPName.java | 5 +- .../apache/jmeter/functions/BeanShell.java | 5 +- .../org/apache/jmeter/functions/CSVRead.java | 5 +- .../apache/jmeter/functions/ChangeCase.java | 5 +- .../apache/jmeter/functions/CharFunction.java | 5 +- .../functions/DateTimeConvertFunction.java | 5 +- .../functions/DigestEncodeFunction.java | 5 +- .../apache/jmeter/functions/EscapeHtml.java | 5 +- .../functions/EscapeOroRegexpChars.java | 5 +- .../apache/jmeter/functions/EscapeXml.java | 5 +- .../apache/jmeter/functions/EvalFunction.java | 5 +- .../jmeter/functions/EvalVarFunction.java | 5 +- .../jmeter/functions/FileRowColContainer.java | 5 +- .../apache/jmeter/functions/FileToString.java | 5 +- .../apache/jmeter/functions/FileWrapper.java | 5 +- .../org/apache/jmeter/functions/Groovy.java | 5 +- .../org/apache/jmeter/functions/IntSum.java | 5 +- .../jmeter/functions/IsPropDefined.java | 5 +- .../apache/jmeter/functions/IsVarDefined.java | 5 +- .../jmeter/functions/IterationCounter.java | 5 +- .../apache/jmeter/functions/JavaScript.java | 5 +- .../jmeter/functions/Jexl2Function.java | 5 +- .../jmeter/functions/Jexl3Function.java | 5 +- .../apache/jmeter/functions/LogFunction.java | 5 +- .../apache/jmeter/functions/LogFunction2.java | 5 +- .../org/apache/jmeter/functions/LongSum.java | 5 +- .../apache/jmeter/functions/MachineIP.java | 5 +- .../apache/jmeter/functions/MachineName.java | 5 +- .../org/apache/jmeter/functions/Property.java | 5 +- .../apache/jmeter/functions/Property2.java | 5 +- .../org/apache/jmeter/functions/Random.java | 5 +- .../apache/jmeter/functions/RandomDate.java | 5 +- .../functions/RandomFromMultipleVars.java | 5 +- .../apache/jmeter/functions/RandomString.java | 5 +- .../jmeter/functions/RegexFunction.java | 5 +- .../apache/jmeter/functions/SamplerName.java | 5 +- .../apache/jmeter/functions/SetProperty.java | 5 +- .../jmeter/functions/SplitFunction.java | 5 +- .../jmeter/functions/StringFromFile.java | 5 +- .../apache/jmeter/functions/StringToFile.java | 5 +- .../apache/jmeter/functions/TestPlanName.java | 5 +- .../jmeter/functions/ThreadGroupName.java | 5 +- .../apache/jmeter/functions/ThreadNumber.java | 5 +- .../apache/jmeter/functions/TimeFunction.java | 5 +- .../apache/jmeter/functions/TimeShift.java | 5 +- .../org/apache/jmeter/functions/UnEscape.java | 5 +- .../apache/jmeter/functions/UnEscapeHtml.java | 5 +- .../apache/jmeter/functions/UrlDecode.java | 5 +- .../apache/jmeter/functions/UrlEncode.java | 5 +- .../org/apache/jmeter/functions/Uuid.java | 5 +- .../org/apache/jmeter/functions/Variable.java | 5 +- .../org/apache/jmeter/functions/XPath.java | 5 +- .../jmeter/functions/XPathFileContainer.java | 5 +- .../apache/jmeter/functions/XPathWrapper.java | 5 +- .../jmeter/functions/ChangeCaseSpec.groovy | 5 +- .../functions/IterationCounterSpec.groovy | 5 +- .../functions/gui/FunctionHelperSpec.groovy | 5 +- .../jmeter/functions/CSVReadFunctionTest.java | 5 +- .../jmeter/functions/EvalFunctionTest.java | 5 +- .../jmeter/functions/FunctionTestHelper.java | 5 +- .../apache/jmeter/functions/PackageTest.java | 5 +- .../jmeter/functions/RandomFunctionTest.java | 5 +- .../jmeter/functions/SplitFunctionTest.java | 5 +- .../functions/StringFromFileFunctionTest.java | 5 +- .../jmeter/functions/SumFunctionTest.java | 5 +- .../apache/jmeter/functions/Synchronizer.java | 5 +- .../jmeter/functions/TestChangeCase.java | 5 +- .../TestDateTimeConvertFunction.java | 5 +- .../jmeter/functions/TestDigestFunction.java | 5 +- .../functions/TestEscapeOroRegexpChars.java | 5 +- .../functions/TestFileRowColContainer.java | 5 +- .../jmeter/functions/TestFileToString.java | 5 +- .../jmeter/functions/TestGroovyFunction.java | 5 +- .../jmeter/functions/TestIsPropDefined.java | 5 +- .../jmeter/functions/TestIsVarDefined.java | 5 +- .../functions/TestJavascriptFunction.java | 5 +- .../TestJavascriptFunctionWithRhino.java | 5 +- .../jmeter/functions/TestJexl2Function.java | 5 +- .../jmeter/functions/TestJexl3Function.java | 5 +- .../jmeter/functions/TestMachineIPName.java | 5 +- .../functions/TestRandomFromMultipleVars.java | 5 +- .../jmeter/functions/TestRegexFunction.java | 5 +- .../functions/TestSamplerNameFunction.java | 5 +- .../jmeter/functions/TestSetProperty.java | 5 +- .../jmeter/functions/TestSimpleFunctions.java | 5 +- .../jmeter/functions/TestStringtoFile.java | 5 +- .../jmeter/functions/TestTimeFunction.java | 5 +- .../functions/TestTimeRandomDateFunction.java | 5 +- .../functions/TestTimeShiftFunction.java | 5 +- .../jmeter/functions/TestUrlEncodeDecode.java | 5 +- .../apache/jmeter/functions/VariableTest.java | 5 +- .../functions/XPathConcurrencyTest.java | 5 +- .../ResourceKeyUsageTestFunctions.java | 5 +- .../functions/testfiles/BeanShellTest.bsh | 2 +- .../jmeter/functions/testfiles/XPathTest.xml | 18 +- .../jmeter/functions/testfiles/XPathTest2.xml | 19 +- .../jmeter/functions/xpathfilecontainer.xml | 19 +- src/generator/build.gradle.kts | 5 +- .../jmeter/visualizers/GenerateTreeGui.java | 5 +- src/i18nedit.properties | 26 +- src/jorphan/build.gradle.kts | 5 +- .../cli/avalon/AbstractParserControl.java | 5 +- .../commons/cli/avalon/CLArgsParser.java | 5 +- .../apache/commons/cli/avalon/CLOption.java | 5 +- .../cli/avalon/CLOptionDescriptor.java | 5 +- .../org/apache/commons/cli/avalon/CLUtil.java | 5 +- .../commons/cli/avalon/ParserControl.java | 5 +- .../org/apache/commons/cli/avalon/Token.java | 5 +- .../org/apache/jorphan/collections/Data.java | 5 +- .../apache/jorphan/collections/HashTree.java | 5 +- .../collections/HashTreeTraverser.java | 5 +- .../jorphan/collections/ListedHashTree.java | 5 +- .../jorphan/collections/SearchByClass.java | 5 +- .../documentation/VisibleForTesting.java | 5 +- .../org/apache/jorphan/exec/KeyToolUtils.java | 5 +- .../org/apache/jorphan/exec/StreamCopier.java | 5 +- .../apache/jorphan/exec/SystemCommand.java | 5 +- .../jorphan/gui/AbstractTreeTableModel.java | 5 +- .../org/apache/jorphan/gui/ComponentUtil.java | 5 +- .../jorphan/gui/DefaultTreeTableModel.java | 5 +- .../java/org/apache/jorphan/gui/GuiUtils.java | 5 +- .../apache/jorphan/gui/JLabeledChoice.java | 5 +- .../org/apache/jorphan/gui/JLabeledField.java | 5 +- .../jorphan/gui/JLabeledPasswordField.java | 5 +- .../apache/jorphan/gui/JLabeledTextArea.java | 5 +- .../apache/jorphan/gui/JLabeledTextField.java | 5 +- .../org/apache/jorphan/gui/JTreeTable.java | 5 +- .../org/apache/jorphan/gui/MenuScroller.java | 5 +- .../jorphan/gui/MinMaxLongRenderer.java | 5 +- .../apache/jorphan/gui/NumberRenderer.java | 5 +- .../apache/jorphan/gui/ObjectTableModel.java | 5 +- .../apache/jorphan/gui/ObjectTableSorter.java | 5 +- .../org/apache/jorphan/gui/RateRenderer.java | 5 +- .../org/apache/jorphan/gui/RendererUtils.java | 5 +- .../jorphan/gui/RightAlignRenderer.java | 5 +- .../apache/jorphan/gui/TreeTableModel.java | 5 +- .../jorphan/gui/layout/VerticalLayout.java | 5 +- .../java/org/apache/jorphan/io/TextFile.java | 5 +- .../jorphan/logging/LoggingManager.java | 5 +- .../jorphan/logging/Slf4jLogkitLogger.java | 5 +- .../apache/jorphan/math/NumberComparator.java | 5 +- .../apache/jorphan/math/StatCalculator.java | 5 +- .../jorphan/math/StatCalculatorInteger.java | 5 +- .../jorphan/math/StatCalculatorLong.java | 5 +- .../apache/jorphan/reflect/ClassFilter.java | 5 +- .../apache/jorphan/reflect/ClassFinder.java | 5 +- .../apache/jorphan/reflect/ClassTools.java | 5 +- .../org/apache/jorphan/reflect/Functor.java | 5 +- .../apache/jorphan/test/UnitTestManager.java | 5 +- .../org/apache/jorphan/util/Converter.java | 5 +- .../org/apache/jorphan/util/HeapDumper.java | 5 +- .../org/apache/jorphan/util/JMeterError.java | 5 +- .../apache/jorphan/util/JMeterException.java | 5 +- .../jorphan/util/JMeterStopTestException.java | 5 +- .../util/JMeterStopTestNowException.java | 5 +- .../util/JMeterStopThreadException.java | 5 +- .../org/apache/jorphan/util/JOrphanUtils.java | 5 +- .../org/apache/jorphan/util/ThreadDumper.java | 5 +- .../org/apache/jorphan/util/XMLBuffer.java | 5 +- .../main/java/org/apache/log/ContextMap.java | 5 +- .../main/java/org/apache/log/LogEvent.java | 5 +- .../main/java/org/apache/log/LogTarget.java | 5 +- .../src/main/java/org/apache/log/Logger.java | 5 +- .../main/java/org/apache/log/Priority.java | 5 +- .../org/apache/jorphan/io/TextFileSpec.groovy | 5 +- .../apache/jorphan/util/ConverterSpec.groovy | 5 +- .../commons/cli/avalon/ClutilTestCase.java | 5 +- .../jorphan/collections/PackageTest.java | 5 +- .../apache/jorphan/exec/TestKeyToolUtils.java | 5 +- .../jorphan/gui/MinMaxLongRendererTest.java | 5 +- .../jorphan/gui/ObjectTableModelTest.java | 5 +- .../jorphan/gui/ObjectTableSorterTest.java | 5 +- .../jorphan/gui/TableModelEventBacker.java | 5 +- .../jorphan/math/TestStatCalculator.java | 5 +- .../jorphan/reflect/TestClassTools.java | 5 +- .../apache/jorphan/util/TestConverter.java | 5 +- .../apache/jorphan/util/TestJorphanUtils.java | 5 +- src/launcher/build.gradle.kts | 5 +- .../org/apache/jmeter/DynamicClassLoader.java | 5 +- .../java/org/apache/jmeter/NewDriver.java | 5 +- .../apache/jmeter/util/ShutdownClient.java | 5 +- src/licenses/build.gradle.kts | 5 +- .../bolt/config/BoltConnectionElement.java | 5 +- .../config/BoltConnectionElementBeanInfo.java | 5 +- .../bolt/sampler/AbstractBoltTestElement.java | 5 +- .../protocol/bolt/sampler/BoltSampler.java | 5 +- .../bolt/sampler/BoltSamplerBeanInfo.java | 5 +- .../BoltTestElementBeanInfoSupport.java | 5 +- .../BoltConnectionElementResources.properties | 5 +- .../sampler/BoltSamplerResources.properties | 7 +- .../bolt/sampler/BoltSamplerSpec.groovy | 5 +- .../resources/ResourceKeyUsageTestBolt.java | 5 +- src/protocol/build.gradle.kts | 5 +- .../protocol/ftp/config/gui/FtpConfigGui.java | 5 +- .../ftp/control/gui/FtpTestSamplerGui.java | 5 +- .../protocol/ftp/sampler/FTPSampler.java | 5 +- .../resources/ResourceKeyUsageTestFtp.java | 5 +- .../http/api/auth/DigestParameters.java | 5 +- .../http/config/MultipartUrlConfig.java | 5 +- .../http/config/gui/HttpDefaultsGui.java | 5 +- .../http/config/gui/UrlConfigGui.java | 5 +- .../protocol/http/control/AuthManager.java | 5 +- .../protocol/http/control/Authorization.java | 5 +- .../protocol/http/control/CacheManager.java | 5 +- .../jmeter/protocol/http/control/Cookie.java | 5 +- .../protocol/http/control/CookieHandler.java | 5 +- .../protocol/http/control/CookieManager.java | 5 +- .../http/control/DNSCacheManager.java | 5 +- .../control/DelegatingKerberosScheme.java | 5 +- .../http/control/DelegatingSPNegoScheme.java | 5 +- .../control/DynamicKerberosSchemeFactory.java | 5 +- .../control/DynamicSPNegoSchemeFactory.java | 5 +- .../http/control/HC4CookieHandler.java | 5 +- .../jmeter/protocol/http/control/Header.java | 5 +- .../protocol/http/control/HeaderManager.java | 5 +- .../http/control/HttpMirrorControl.java | 5 +- .../http/control/HttpMirrorServer.java | 5 +- .../http/control/HttpMirrorThread.java | 5 +- .../http/control/KerberosManager.java | 5 +- .../http/control/RecordingController.java | 5 +- .../protocol/http/control/StaticHost.java | 5 +- .../http/control/gui/AjpSamplerGui.java | 5 +- .../control/gui/HttpMirrorControlGui.java | 5 +- .../http/control/gui/HttpTestSampleGui.java | 5 +- .../http/control/gui/RecordController.java | 5 +- .../protocol/http/curl/BasicCurlParser.java | 5 +- .../jmeter/protocol/http/gui/AuthPanel.java | 5 +- .../protocol/http/gui/CacheManagerGui.java | 5 +- .../jmeter/protocol/http/gui/CookiePanel.java | 5 +- .../protocol/http/gui/DNSCachePanel.java | 5 +- .../protocol/http/gui/HTTPArgumentsPanel.java | 5 +- .../protocol/http/gui/HTTPFileArgsPanel.java | 5 +- .../jmeter/protocol/http/gui/HeaderPanel.java | 5 +- .../gui/action/ParseCurlCommandAction.java | 5 +- .../http/modifier/AnchorModifier.java | 5 +- .../http/modifier/RegExUserParameters.java | 5 +- .../http/modifier/URLRewritingModifier.java | 5 +- .../http/modifier/gui/AnchorModifierGui.java | 5 +- .../modifier/gui/RegExUserParametersGui.java | 5 +- .../modifier/gui/URLRewritingModifierGui.java | 5 +- .../protocol/http/parser/BaseParser.java | 5 +- .../parser/CSSParseExceptionCallback.java | 5 +- .../protocol/http/parser/CssParser.java | 5 +- .../http/parser/CssParserCacheLoader.java | 5 +- .../http/parser/HTMLParseException.java | 5 +- .../protocol/http/parser/HTMLParser.java | 5 +- .../http/parser/HtmlParsingUtils.java | 5 +- .../protocol/http/parser/JTidyHTMLParser.java | 5 +- .../http/parser/JsoupBasedHtmlParser.java | 5 +- .../http/parser/LagartoBasedHtmlParser.java | 5 +- .../parser/LinkExtractorParseException.java | 5 +- .../http/parser/LinkExtractorParser.java | 5 +- .../http/parser/RegexpHTMLParser.java | 5 +- .../protocol/http/parser/URLCollection.java | 5 +- .../protocol/http/parser/URLString.java | 5 +- .../http/proxy/AbstractSamplerCreator.java | 5 +- .../jmeter/protocol/http/proxy/Daemon.java | 5 +- .../http/proxy/DefaultSamplerCreator.java | 5 +- .../http/proxy/FormCharSetFinder.java | 5 +- .../protocol/http/proxy/HttpReplyHdr.java | 5 +- .../protocol/http/proxy/HttpRequestHdr.java | 5 +- .../jmeter/protocol/http/proxy/Proxy.java | 5 +- .../protocol/http/proxy/ProxyControl.java | 5 +- .../protocol/http/proxy/SamplerCreator.java | 5 +- .../http/proxy/SamplerCreatorFactory.java | 5 +- .../http/proxy/ServerAliasKeyManager.java | 5 +- .../http/proxy/gui/ProxyControlGui.java | 5 +- .../http/proxy/gui/RecorderDialog.java | 5 +- .../http/sampler/AccessLogSampler.java | 5 +- .../sampler/AccessLogSamplerBeanInfo.java | 5 +- .../protocol/http/sampler/AjpSampler.java | 5 +- .../http/sampler/HTTPAbstractImpl.java | 5 +- .../protocol/http/sampler/HTTPFileImpl.java | 5 +- .../protocol/http/sampler/HTTPHC4Impl.java | 5 +- .../http/sampler/HTTPHCAbstractImpl.java | 5 +- .../protocol/http/sampler/HTTPJavaImpl.java | 5 +- .../http/sampler/HTTPSampleResult.java | 5 +- .../protocol/http/sampler/HTTPSampler.java | 5 +- .../http/sampler/HTTPSamplerBase.java | 5 +- .../http/sampler/HTTPSamplerBaseBeanInfo.java | 5 +- .../sampler/HTTPSamplerBaseConverter.java | 5 +- .../http/sampler/HTTPSamplerFactory.java | 5 +- .../http/sampler/HTTPSamplerProxy.java | 5 +- .../sampler/HttpClientDefaultParameters.java | 5 +- .../protocol/http/sampler/HttpWebdav.java | 5 +- .../protocol/http/sampler/PostWriter.java | 5 +- .../protocol/http/sampler/PutWriter.java | 5 +- .../http/sampler/ResourcesDownloader.java | 5 +- .../sampler/hc/LaxDeflateInputStream.java | 5 +- .../http/sampler/hc/LaxGZIPInputStream.java | 5 +- .../LazyLayeredConnectionSocketFactory.java | 5 +- .../protocol/http/util/Base64Encoder.java | 5 +- .../protocol/http/util/ConversionUtils.java | 5 +- .../DirectAccessByteArrayOutputStream.java | 5 +- .../protocol/http/util/EncoderCache.java | 5 +- .../protocol/http/util/HTTPArgument.java | 5 +- .../protocol/http/util/HTTPConstants.java | 5 +- .../http/util/HTTPConstantsInterface.java | 5 +- .../protocol/http/util/HTTPFileArg.java | 5 +- .../protocol/http/util/HTTPFileArgs.java | 5 +- .../http/util/HTTPResultConverter.java | 5 +- .../http/util/LoopbackHTTPSocket.java | 5 +- .../SlowHCPlainConnectionSocketFactory.java | 5 +- .../protocol/http/util/accesslog/Filter.java | 5 +- .../http/util/accesslog/Generator.java | 5 +- .../http/util/accesslog/LogFilter.java | 5 +- .../http/util/accesslog/LogParser.java | 5 +- .../protocol/http/util/accesslog/NVPair.java | 5 +- .../accesslog/OrderPreservingLogParser.java | 5 +- .../http/util/accesslog/SessionFilter.java | 5 +- .../util/accesslog/SharedTCLogParser.java | 5 +- .../util/accesslog/StandardGenerator.java | 5 +- .../http/util/accesslog/TCLogParser.java | 5 +- .../http/visualizers/RequestViewHTTP.java | 5 +- .../AccessLogSamplerResources.properties | 26 +- .../AccessLogSamplerResources_es.properties | 26 +- .../AccessLogSamplerResources_fr.properties | 26 +- ...AccessLogSamplerResources_pt_BR.properties | 26 +- .../AccessLogSamplerResources_tr.properties | 26 +- ...AccessLogSamplerResources_zh_TW.properties | 26 +- .../http/control/DNSCacheManagerSpec.groovy | 5 +- .../protocol/http/util/HTTPUtilsSpec.groovy | 5 +- .../jmeter/curl/BasicCurlParserTest.java | 5 +- .../action/ParseCurlCommandActionTest.java | 5 +- .../http/config/MultipartUrlConfigTest.java | 5 +- .../protocol/http/config/UrlConfigTest.java | 5 +- .../protocol/http/control/DnsManagerTest.java | 5 +- .../http/control/TestAuthManager.java | 5 +- .../TestAuthManagerThreadIteration.java | 5 +- .../http/control/TestAuthorization.java | 5 +- .../http/control/TestCacheManagerBase.java | 5 +- .../http/control/TestCacheManagerHC4.java | 5 +- .../TestCacheManagerThreadIteration.java | 5 +- .../TestCacheManagerUrlConnection.java | 5 +- .../TestCacheManagerUrlConnectionBase.java | 5 +- .../TestCookieManagerThreadIteration.java | 5 +- .../http/control/TestHC4CookieManager.java | 5 +- .../http/control/TestHTTPMirrorThread.java | 5 +- .../control/gui/TestHttpTestSampleGui.java | 5 +- .../http/modifier/TestAnchorModifier.java | 5 +- .../modifier/TestURLRewritingModifier.java | 5 +- .../http/parser/NotReusableParser.java | 5 +- .../protocol/http/parser/ReusableParser.java | 5 +- .../protocol/http/parser/TestBaseParser.java | 5 +- .../http/parser/TestBug60842HtmlParser.java | 5 +- .../protocol/http/parser/TestCssParser.java | 5 +- .../protocol/http/parser/TestHTMLParser.java | 5 +- .../http/parser/TestHtmlParsingUtils.java | 5 +- .../http/proxy/NonGuiProxySample.java | 5 +- .../http/proxy/TestHttpRequestHdr.java | 5 +- .../protocol/http/proxy/TestProxyControl.java | 5 +- .../http/sampler/HTTPNullSampler.java | 5 +- .../protocol/http/sampler/HTTPSampler3.java | 5 +- .../http/sampler/NullURLConnection.java | 5 +- .../protocol/http/sampler/PackageTest.java | 5 +- .../sampler/ParallelResourcesAndIpSource.java | 5 +- .../protocol/http/sampler/PostWriterTest.java | 5 +- .../protocol/http/sampler/PutWriterTest.java | 5 +- .../protocol/http/sampler/ResultAsString.java | 5 +- .../http/sampler/SamplingNamingTest.java | 5 +- .../http/sampler/TestDecompression.java | 5 +- .../http/sampler/TestHTTPHC4Impl.java | 5 +- .../http/sampler/TestHTTPSamplers.java | 5 +- ...stHTTPSamplersAgainstHttpMirrorServer.java | 5 +- .../protocol/http/sampler/TestHttpWebdav.java | 5 +- .../sampler/TestSerializedHTTPSampler.java | 5 +- .../protocol/http/util/TestHTTPArgument.java | 5 +- .../protocol/http/util/TestHTTPFileArg.java | 5 +- .../protocol/http/util/TestHTTPFileArgs.java | 5 +- .../http/util/accesslog/TestLogFilter.java | 5 +- .../util/accesslog/TestSessionFilter.java | 5 +- .../http/util/accesslog/TestTCLogParser.java | 5 +- .../http/visualizers/RequestViewHTTPTest.java | 5 +- .../resources/ResourceKeyUsageTestHttp.java | 5 +- .../jmeter/testelement/TestHeaderManager.java | 5 +- .../protocol/java/config/JavaConfig.java | 5 +- .../java/config/gui/JavaConfigGui.java | 5 +- .../java/control/gui/BeanShellSamplerGui.java | 5 +- .../java/control/gui/JavaTestSamplerGui.java | 5 +- .../sampler/AbstractJavaSamplerClient.java | 5 +- .../protocol/java/sampler/BSFSampler.java | 5 +- .../java/sampler/BSFSamplerBeanInfo.java | 5 +- .../java/sampler/BeanShellSampler.java | 5 +- .../protocol/java/sampler/JSR223Sampler.java | 5 +- .../java/sampler/JSR223SamplerBeanInfo.java | 5 +- .../protocol/java/sampler/JavaSampler.java | 5 +- .../java/sampler/JavaSamplerClient.java | 5 +- .../java/sampler/JavaSamplerContext.java | 5 +- .../jmeter/protocol/java/test/JavaTest.java | 5 +- .../jmeter/protocol/java/test/SleepTest.java | 5 +- .../sampler/BSFSamplerResources.properties | 27 +- .../sampler/BSFSamplerResources_fr.properties | 26 +- .../BSFSamplerResources_zh_CN.properties | 26 +- .../sampler/JSR223SamplerResources.properties | 26 +- .../JSR223SamplerResources_fr.properties | 26 +- .../JSR223SamplerResources_zh_CN.properties | 26 +- .../resources/ResourceKeyUsageTestJava.java | 5 +- .../jdbc/AbstractJDBCTestElement.java | 5 +- .../jdbc/JDBCTestElementBeanInfoSupport.java | 5 +- .../jdbc/config/DataSourceElement.java | 5 +- .../config/DataSourceElementBeanInfo.java | 5 +- .../jdbc/processor/AbstractJDBCProcessor.java | 5 +- .../jdbc/processor/JDBCPostProcessor.java | 5 +- .../processor/JDBCPostProcessorBeanInfo.java | 5 +- .../jdbc/processor/JDBCPreProcessor.java | 5 +- .../processor/JDBCPreProcessorBeanInfo.java | 5 +- .../protocol/jdbc/sampler/JDBCSampler.java | 5 +- .../jdbc/sampler/JDBCSamplerBeanInfo.java | 5 +- .../DataSourceElementResources.properties | 28 +- .../DataSourceElementResources_es.properties | 26 +- .../DataSourceElementResources_fr.properties | 26 +- ...ataSourceElementResources_pt_BR.properties | 26 +- .../DataSourceElementResources_tr.properties | 26 +- ...ataSourceElementResources_zh_TW.properties | 26 +- .../JDBCPostProcessorResources.properties | 26 +- .../JDBCPostProcessorResources_fr.properties | 26 +- ...DBCPostProcessorResources_zh_CN.properties | 26 +- .../JDBCPreProcessorResources.properties | 26 +- .../JDBCPreProcessorResources_fr.properties | 26 +- ...JDBCPreProcessorResources_zh_CN.properties | 26 +- .../sampler/JDBCSamplerResources.properties | 26 +- .../JDBCSamplerResources_es.properties | 27 +- .../JDBCSamplerResources_fr.properties | 26 +- .../JDBCSamplerResources_pt_BR.properties | 26 +- .../JDBCSamplerResources_tr.properties | 26 +- .../JDBCSamplerResources_zh_TW.properties | 26 +- .../jdbc/sampler/JDBCSamplerSpec.groovy | 5 +- .../resources/ResourceKeyUsageTestJdbc.java | 5 +- .../org/apache/jmeter/protocol/jms/Utils.java | 5 +- .../protocol/jms/client/ClientPool.java | 5 +- .../jms/client/InitialContextFactory.java | 5 +- .../jmeter/protocol/jms/client/Publisher.java | 5 +- .../jms/client/ReceiveSubscriber.java | 5 +- .../jms/control/gui/JMSPropertiesPanel.java | 5 +- .../jms/control/gui/JMSPublisherGui.java | 5 +- .../jms/control/gui/JMSSamplerGui.java | 5 +- .../jms/control/gui/JMSSubscriberGui.java | 5 +- .../protocol/jms/sampler/BaseJMSSampler.java | 5 +- .../jms/sampler/FixedQueueExecutor.java | 5 +- .../protocol/jms/sampler/JMSProperties.java | 5 +- .../protocol/jms/sampler/JMSProperty.java | 5 +- .../protocol/jms/sampler/JMSSampler.java | 5 +- .../protocol/jms/sampler/MessageAdmin.java | 5 +- .../jms/sampler/PublisherSampler.java | 5 +- .../protocol/jms/sampler/QueueExecutor.java | 5 +- .../jmeter/protocol/jms/sampler/Receiver.java | 5 +- .../jms/sampler/SubscriberSampler.java | 5 +- .../jms/sampler/TemporaryQueueExecutor.java | 5 +- .../sampler/TimeoutEnabledQueueRequestor.java | 5 +- .../sampler/render/BinaryMessageRenderer.java | 5 +- .../protocol/jms/sampler/render/FileKey.java | 5 +- .../sampler/render/MapMessageRenderer.java | 5 +- .../jms/sampler/render/MessageRenderer.java | 5 +- .../sampler/render/ObjectMessageRenderer.java | 5 +- .../jms/sampler/render/RendererFactory.java | 5 +- .../jms/sampler/render/Renderers.java | 5 +- .../sampler/render/TextMessageRenderer.java | 5 +- .../jms/sampler/render/package-info.java | 4 +- .../jms/sampler/PublisherSamplerTest.java | 5 +- .../render/BinaryMessageRendererTest.java | 5 +- .../sampler/render/MessageRendererTest.java | 5 +- .../render/ObjectMessageRendererTest.java | 5 +- .../protocol/jms/sampler/render/Person.java | 5 +- .../render/TextMessageRendererTest.java | 5 +- .../resources/ResourceKeyUsageTestJms.java | 5 +- .../main/java/test/AfterAnnotatedTest.java | 5 +- .../main/java/test/BeforeAnnotatedTest.java | 5 +- .../main/java/test/DummyAnnotatedTest.java | 5 +- .../main/java/test/Junit4AnnotationsTest.java | 5 +- .../src/main/java/test/RerunTest.java | 5 +- .../src/main/java/test/SetupTestError.java | 5 +- .../src/main/java/test/SetupTestFail.java | 5 +- .../src/main/java/test/TearDownTestFail.java | 5 +- .../src/main/java/woolfel/DummyTestCase.java | 5 +- .../src/main/java/woolfel/SubDummyTest.java | 5 +- .../src/main/java/woolfel/SubDummyTest2.java | 5 +- .../java/control/gui/ClassFilter.java | 5 +- .../java/control/gui/JUnitTestSamplerGui.java | 5 +- .../protocol/java/sampler/JUnitSampler.java | 5 +- .../resources/ResourceKeyUsageTestJUnit.java | 5 +- .../ldap/config/gui/LDAPArgument.java | 5 +- .../ldap/config/gui/LDAPArguments.java | 5 +- .../ldap/config/gui/LDAPArgumentsPanel.java | 5 +- .../ldap/config/gui/LdapConfigGui.java | 5 +- .../ldap/config/gui/LdapExtConfigGui.java | 5 +- .../control/gui/LdapExtTestSamplerGui.java | 5 +- .../ldap/control/gui/LdapTestSamplerGui.java | 5 +- .../protocol/ldap/sampler/LDAPExtSampler.java | 5 +- .../protocol/ldap/sampler/LDAPSampler.java | 5 +- .../protocol/ldap/sampler/LdapClient.java | 5 +- .../protocol/ldap/sampler/LdapExtClient.java | 5 +- .../protocol/ldap/config/gui/PackageTest.java | 5 +- .../resources/ResourceKeyUsageTestLdap.java | 5 +- .../protocol/mail/sampler/MailFileFolder.java | 5 +- .../mail/sampler/MailFileMessage.java | 5 +- .../protocol/mail/sampler/MailFileStore.java | 5 +- .../mail/sampler/MailReaderSampler.java | 5 +- .../sampler/gui/MailReaderSamplerGui.java | 5 +- .../protocol/smtp/sampler/SmtpSampler.java | 5 +- .../sampler/gui/SecuritySettingsPanel.java | 5 +- .../protocol/smtp/sampler/gui/SmtpPanel.java | 5 +- .../smtp/sampler/gui/SmtpSamplerGui.java | 5 +- .../LocalTrustStoreSSLSocketFactory.java | 5 +- .../sampler/protocol/SendMailCommand.java | 5 +- .../SynchronousTransportListener.java | 5 +- .../protocol/TrustAllSSLSocketFactory.java | 5 +- .../mail/sampler/TestMailReaderSampler.java | 5 +- .../resources/ResourceKeyUsageTestMail.java | 5 +- .../mongodb/config/MongoDBHolder.java | 5 +- .../mongodb/config/MongoSourceElement.java | 5 +- .../config/MongoSourceElementBeanInfo.java | 5 +- .../mongodb/mongo/EvalResultHandler.java | 5 +- .../protocol/mongodb/mongo/MongoDB.java | 5 +- .../protocol/mongodb/mongo/MongoUtils.java | 5 +- .../mongodb/sampler/MongoScriptRunner.java | 5 +- .../mongodb/sampler/MongoScriptSampler.java | 5 +- .../sampler/MongoScriptSamplerBeanInfo.java | 5 +- .../MongoSourceElementResources.properties | 26 +- .../MongoSourceElementResources_fr.properties | 26 +- .../MongoScriptSamplerResources.properties | 26 +- .../MongoScriptSamplerResources_fr.properties | 26 +- .../ResourceKeyUsageTestMongodb.java | 5 +- .../jmeter/protocol/system/SystemSampler.java | 5 +- .../protocol/system/gui/SystemSamplerGui.java | 5 +- .../resources/ResourceKeyUsageTestNative.java | 5 +- .../protocol/tcp/config/gui/TCPConfigGui.java | 5 +- .../tcp/control/gui/TCPSamplerGui.java | 5 +- .../tcp/sampler/AbstractTCPClient.java | 5 +- .../tcp/sampler/BinaryTCPClientImpl.java | 5 +- .../LengthPrefixedBinaryTCPClientImpl.java | 5 +- .../protocol/tcp/sampler/ReadException.java | 5 +- .../protocol/tcp/sampler/TCPClient.java | 5 +- .../tcp/sampler/TCPClientDecorator.java | 5 +- .../protocol/tcp/sampler/TCPClientImpl.java | 5 +- .../protocol/tcp/sampler/TCPSampler.java | 5 +- .../tcp/sampler/BinaryTCPClientImplTest.java | 5 +- ...LengthPrefixedBinaryTCPClientImplTest.java | 5 +- .../tcp/sampler/TCPClientDecoratorTest.java | 5 +- .../resources/ResourceKeyUsageTestTcp.java | 5 +- src/release/build.gradle.kts | 5 +- src/testkit-wiremock/build.gradle.kts | 5 +- .../jmeter/wiremock/RequestCountDown.java | 5 +- .../jmeter/wiremock/WireMockExtension.java | 5 +- src/testkit/build.gradle.kts | 5 +- .../java/org/apache/jmeter/testkit/BugId.java | 5 +- .../jmeter/testkit/ResourceLocator.java | 5 +- xdocs/building.xml | 29 +- xdocs/changes.xml | 29 +- xdocs/changes_history.xml | 631 +++++++++--------- xdocs/creating-templates.xml | 32 +- xdocs/demos/BeanShellAssertion.bsh | 4 +- xdocs/devguide-dashboard.xml | 27 +- xdocs/download_jmeter.xml | 50 +- xdocs/extending.xml | 33 +- xdocs/extending/JMeter Extension Scenario.xml | 35 +- xdocs/extending/index.xml | 31 +- xdocs/index.xml | 43 +- xdocs/issues.xml | 33 +- xdocs/jmeter_irc.xml | 53 +- xdocs/localising/index.xml | 36 +- xdocs/mail.xml | 65 +- xdocs/mail2.xml | 36 +- xdocs/nightly.xml | 55 +- xdocs/stylesheets/printable_project.xml | 31 +- xdocs/stylesheets/project.xml | 31 +- xdocs/stylesheets/site.xsl | 32 +- xdocs/stylesheets/website-style.xsl | 27 +- xdocs/svnindex.xml | 29 +- xdocs/usermanual/best-practices.xml | 48 +- xdocs/usermanual/boss.xml | 34 +- xdocs/usermanual/build-adv-web-test-plan.xml | 32 +- xdocs/usermanual/build-db-test-plan.xml | 30 +- xdocs/usermanual/build-ftp-test-plan.xml | 30 +- .../build-jms-point-to-point-test-plan.xml | 38 +- .../usermanual/build-jms-topic-test-plan.xml | 61 +- xdocs/usermanual/build-ldap-test-plan.xml | 30 +- xdocs/usermanual/build-ldapext-test-plan.xml | 52 +- xdocs/usermanual/build-monitor-test-plan.xml | 41 +- xdocs/usermanual/build-test-plan.xml | 37 +- xdocs/usermanual/build-web-test-plan.xml | 36 +- xdocs/usermanual/build-ws-test-plan.xml | 34 +- xdocs/usermanual/component_reference.xml | 585 ++++++++-------- xdocs/usermanual/curl.xml | 41 +- xdocs/usermanual/functions.xml | 30 +- xdocs/usermanual/generating-dashboard.xml | 41 +- xdocs/usermanual/get-started.xml | 61 +- xdocs/usermanual/glossary.xml | 37 +- xdocs/usermanual/hints_and_tips.xml | 35 +- xdocs/usermanual/history_future.xml | 31 +- .../include_controller_tutorial.xml | 30 +- xdocs/usermanual/index.xml | 40 +- .../jmeter_accesslog_sampler_step_by_step.xml | 30 +- ...meter_distributed_testing_step_by_step.xml | 30 +- .../usermanual/jmeter_proxy_step_by_step.xml | 34 +- xdocs/usermanual/jmeter_tutorial.xml | 32 +- xdocs/usermanual/junitsampler_tutorial.xml | 30 +- xdocs/usermanual/ldapanswer_xml.xml | 59 +- xdocs/usermanual/ldapops_tutor.xml | 43 +- xdocs/usermanual/listeners.xml | 58 +- xdocs/usermanual/properties_reference.xml | 61 +- xdocs/usermanual/realtime-results.xml | 42 +- xdocs/usermanual/regular_expressions.xml | 71 +- xdocs/usermanual/remote-test.xml | 30 +- xdocs/usermanual/test_plan.xml | 80 +-- xdocs/velocity.properties | 26 +- 1709 files changed, 7954 insertions(+), 8755 deletions(-) diff --git a/bin/create-rmi-keystore.bat b/bin/create-rmi-keystore.bat index 6d624bf891..369e108942 100644 --- a/bin/create-rmi-keystore.bat +++ b/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'" diff --git a/bin/create-rmi-keystore.sh b/bin/create-rmi-keystore.sh index 1f9dd4cd5d..a84207a25c 100755 --- a/bin/create-rmi-keystore.sh +++ b/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'" diff --git a/bin/heapdump.cmd b/bin/heapdump.cmd index 0befc5d399..4c2a98ba1f 100644 --- a/bin/heapdump.cmd +++ b/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 \ No newline at end of file +pause diff --git a/bin/heapdump.sh b/bin/heapdump.sh index 010db9b01c..2f8265734f 100755 --- a/bin/heapdump.sh +++ b/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 diff --git a/bin/jmeter-n-r.cmd b/bin/jmeter-n-r.cmd index eb963b5b01..447c7d4ef9 100644 --- a/bin/jmeter-n-r.cmd +++ b/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 \ No newline at end of file +:END diff --git a/bin/jmeter-n.cmd b/bin/jmeter-n.cmd index d33a143d08..c25ef8bf1b 100644 --- a/bin/jmeter-n.cmd +++ b/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 \ No newline at end of file +:END diff --git a/bin/jmeter-server.bat b/bin/jmeter-server.bat index d1d302a046..065e28048d 100644 --- a/bin/jmeter-server.bat +++ b/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 \ No newline at end of file +:exit diff --git a/bin/jmeter-t.cmd b/bin/jmeter-t.cmd index 9e519522e9..201a8d08fb 100644 --- a/bin/jmeter-t.cmd +++ b/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 \ No newline at end of file +:END diff --git a/bin/jmeter.bat b/bin/jmeter.bat index b329b3f970..80fc534f57 100644 --- a/bin/jmeter.bat +++ b/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 - diff --git a/bin/jmeter.properties b/bin/jmeter.properties index 0462f4eb9c..da881c61ce 100644 --- a/bin/jmeter.properties +++ b/bin/jmeter.properties @@ -1,17 +1,19 @@ -## 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. +# ################################################################################ # Apache JMeter Property file diff --git a/bin/jmeter.sh b/bin/jmeter.sh index 64fbce0b64..2f4f79036a 100755 --- a/bin/jmeter.sh +++ b/bin/jmeter.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. +# ## This is a simple wrapper for the script bin/jmeter ## diff --git a/bin/jmeterw.cmd b/bin/jmeterw.cmd index 0f62da4f83..cbe449a94a 100644 --- a/bin/jmeterw.cmd +++ b/bin/jmeterw.cmd @@ -1,18 +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 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 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 JMeter using javaw diff --git a/bin/log4j2.xml b/bin/log4j2.xml index 2cb9bf8f23..e0a1adbac9 100644 --- a/bin/log4j2.xml +++ b/bin/log4j2.xml @@ -1,20 +1,21 @@ - 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. ---> diff --git a/bin/mirror-server.cmd b/bin/mirror-server.cmd index 28c22586ea..6f76adf595 100644 --- a/bin/mirror-server.cmd +++ b/bin/mirror-server.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 Run the JMeter mirror server in non-GUI mode rem P1 = port to use (default 8080) diff --git a/bin/mirror-server.sh b/bin/mirror-server.sh index 66dc4893a4..7e96962625 100755 --- a/bin/mirror-server.sh +++ b/bin/mirror-server.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. +# # Run the JMeter mirror server in non-GUI mode # P1 = port to use (default 8080) diff --git a/bin/report-template/sbadmin2-1.0.7/bower_components/flot-axislabels/README.md b/bin/report-template/sbadmin2-1.0.7/bower_components/flot-axislabels/README.md index 1df6814eac..920427bd8b 100644 --- a/bin/report-template/sbadmin2-1.0.7/bower_components/flot-axislabels/README.md +++ b/bin/report-template/sbadmin2-1.0.7/bower_components/flot-axislabels/README.md @@ -99,4 +99,3 @@ License ------- flot-axislabels is released under the terms of [the MIT License](http://www.opensource.org/licenses/MIT). - diff --git a/bin/reportgenerator.properties b/bin/reportgenerator.properties index 0ce7007d43..0b087dc3b6 100644 --- a/bin/reportgenerator.properties +++ b/bin/reportgenerator.properties @@ -1,17 +1,19 @@ -## 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. +# ################################################################################ # Apache JMeter Property file for Report Generator @@ -196,4 +198,4 @@ jmeter.reportgenerator.exporter.html.classname=org.apache.jmeter.report.dashboar # JSON Export that generates statistics.json jmeter.reportgenerator.exporter.json.classname=org.apache.jmeter.report.dashboard.JsonExporter -jmeter.reportgenerator.exporter.json.property.output_dir=report-output \ No newline at end of file +jmeter.reportgenerator.exporter.json.property.output_dir=report-output diff --git a/bin/saveservice.properties b/bin/saveservice.properties index 249e0d2503..6f0b44bc65 100644 --- a/bin/saveservice.properties +++ b/bin/saveservice.properties @@ -1,17 +1,19 @@ -## 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. +# #--------------------------------------------------------- # SAVESERVICE PROPERTIES - JMETER INTERNAL USE ONLY @@ -426,4 +428,4 @@ _org.apache.jmeter.save.converters.TestResultWrapperConverter=collection _org.apache.jmeter.save.ScriptWrapperConverter=mapping # # Remember to update the _version entry -# \ No newline at end of file +# diff --git a/bin/shutdown.cmd b/bin/shutdown.cmd index 835535c3a1..056dae9f44 100644 --- a/bin/shutdown.cmd +++ b/bin/shutdown.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 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 +pause diff --git a/bin/shutdown.sh b/bin/shutdown.sh index a9420ce4db..49c6e99d7c 100755 --- a/bin/shutdown.sh +++ b/bin/shutdown.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. +# # Run the Shutdown client to stop a non-GUI instance gracefully diff --git a/bin/stoptest.cmd b/bin/stoptest.cmd index c71f80ae93..2bcebad461 100644 --- a/bin/stoptest.cmd +++ b/bin/stoptest.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 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 +pause diff --git a/bin/stoptest.sh b/bin/stoptest.sh index 745288ce66..3e1a6a1680 100755 --- a/bin/stoptest.sh +++ b/bin/stoptest.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. +# # Run the Shutdown client to stop a non-GUI instance abruptly diff --git a/bin/system.properties b/bin/system.properties index c0e3576582..6b6a334e34 100644 --- a/bin/system.properties +++ b/bin/system.properties @@ -1,17 +1,19 @@ -## 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. +# # Sample system.properties file diff --git a/bin/templates/templates.xml b/bin/templates/templates.xml index 87672867c9..5e4da9a653 100644 --- a/bin/templates/templates.xml +++ b/bin/templates/templates.xml @@ -1,21 +1,22 @@ - 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. ---> - @@ -40,7 +41,7 @@ + ]]> @@ -68,7 +69,7 @@ + ]]>