This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 39959a9 Add a note about core.autocrlf to build instructions.
add 318c4e1 Remove trailing whitespaces
add 4fa9dd6 Checkstyle: prevent trailing whitespace from re-appearing
No new revisions were added by this update.
Summary of changes:
bin/jmeter.properties | 12 +-
bin/reportgenerator.properties | 18 +-
bin/saveservice.properties | 6 +-
bin/system.properties | 6 +-
bin/templates/templates.dtd | 4 +-
bin/testfiles/jmeter-batch.properties | 4 +-
bin/upgrade.properties | 4 +-
bin/user.properties | 6 +-
build.properties | 4 +-
checkstyle.xml | 4 +
.../org/apache/jmeter/assertions/BSFAssertion.java | 2 +-
.../assertions/BSFAssertionResources.properties | 4 +-
.../assertions/BSFAssertionResources_fr.properties | 10 +-
.../BSFAssertionResources_pt_BR.properties | 4 +-
.../apache/jmeter/assertions/CompareAssertion.java | 2 +-
.../CompareAssertionResources.properties | 4 +-
.../CompareAssertionResources_fr.properties | 10 +-
.../jmeter/assertions/DurationAssertion.java | 6 +-
.../apache/jmeter/assertions/HTMLAssertion.java | 32 ++--
.../jmeter/assertions/JSONPathAssertion.java | 2 +-
.../assertions/JSR223AssertionResources.properties | 4 +-
.../JSR223AssertionResources_fr.properties | 8 +-
.../apache/jmeter/assertions/LogErrorHandler.java | 2 +-
.../apache/jmeter/assertions/MD5HexAssertion.java | 4 +-
.../jmeter/assertions/ResponseAssertion.java | 20 +-
.../apache/jmeter/assertions/SMIMEAssertion.java | 12 +-
.../assertions/SMIMEAssertionTestElement.java | 6 +-
.../apache/jmeter/assertions/SizeAssertion.java | 30 +--
.../org/apache/jmeter/assertions/XMLAssertion.java | 12 +-
.../jmeter/assertions/XMLSchemaAssertion.java | 6 +-
.../apache/jmeter/assertions/XPathAssertion.java | 4 +-
.../apache/jmeter/assertions/gui/AssertionGui.java | 24 +--
.../assertions/gui/BeanShellAssertionGui.java | 4 +-
.../jmeter/assertions/gui/SizeAssertionGui.java | 8 +-
.../jmeter/assertions/gui/XMLAssertionGui.java | 4 +-
.../apache/jmeter/assertions/gui/XPath2Panel.java | 28 +--
.../apache/jmeter/assertions/gui/XPathPanel.java | 22 +--
.../org/apache/jmeter/assertions/package.html | 2 +-
.../org/apache/jmeter/config/CSVDataSet.java | 16 +-
.../apache/jmeter/config/CSVDataSetBeanInfo.java | 6 +-
.../jmeter/config/CSVDataSetResources.properties | 4 +-
.../config/CSVDataSetResources_de.properties | 4 +-
.../config/CSVDataSetResources_es.properties | 4 +-
.../config/CSVDataSetResources_fr.properties | 20 +-
.../config/CSVDataSetResources_pl.properties | 4 +-
.../config/CSVDataSetResources_pt_BR.properties | 4 +-
.../config/CSVDataSetResources_tr.properties | 4 +-
.../config/CSVDataSetResources_zh_CN.properties | 4 +-
.../config/CSVDataSetResources_zh_TW.properties | 4 +-
.../org/apache/jmeter/config/KeystoreConfig.java | 14 +-
.../jmeter/config/KeystoreConfigBeanInfo.java | 2 +-
.../config/KeystoreConfigResources.properties | 4 +-
.../config/KeystoreConfigResources_fr.properties | 6 +-
.../KeystoreConfigResources_zh_CN.properties | 4 +-
.../apache/jmeter/config/RandomVariableConfig.java | 6 +-
.../RandomVariableConfigResources.properties | 4 +-
.../RandomVariableConfigResources_es.properties | 4 +-
.../RandomVariableConfigResources_fr.properties | 4 +-
.../RandomVariableConfigResources_pt_BR.properties | 4 +-
.../RandomVariableConfigResources_zh_CN.properties | 4 +-
.../jmeter/control/CriticalSectionController.java | 14 +-
.../apache/jmeter/control/ForeachController.java | 10 +-
.../apache/jmeter/control/IncludeController.java | 8 +-
.../apache/jmeter/control/InterleaveControl.java | 6 +-
.../apache/jmeter/control/ModuleController.java | 2 +-
.../apache/jmeter/control/SwitchController.java | 2 +-
.../jmeter/control/ThroughputController.java | 2 +-
.../control/gui/CriticalSectionControllerGui.java | 10 +-
.../jmeter/control/gui/InterleaveControlGui.java | 6 +-
.../jmeter/control/gui/ModuleControllerGui.java | 72 ++++----
.../apache/jmeter/extractor/BSFPostProcessor.java | 2 +-
.../extractor/BSFPostProcessorResources.properties | 4 +-
.../BSFPostProcessorResources_fr.properties | 6 +-
.../BSFPostProcessorResources_pt_BR.properties | 4 +-
.../jmeter/extractor/BeanShellPostProcessor.java | 4 +-
.../BeanShellPostProcessorResources.properties | 4 +-
.../BeanShellPostProcessorResources_de.properties | 4 +-
.../BeanShellPostProcessorResources_fr.properties | 10 +-
...eanShellPostProcessorResources_pt_BR.properties | 6 +-
.../BeanShellPostProcessorResources_tr.properties | 4 +-
.../DebugPostProcessorResources.properties | 4 +-
.../DebugPostProcessorResources_de.properties | 4 +-
.../DebugPostProcessorResources_fr.properties | 4 +-
.../DebugPostProcessorResources_pt_BR.properties | 4 +-
.../DebugPostProcessorResources_tr.properties | 4 +-
.../org/apache/jmeter/extractor/Extractor.java | 8 +-
.../org/apache/jmeter/extractor/HtmlExtractor.java | 28 +--
.../jmeter/extractor/JSR223PostProcessor.java | 2 +-
.../JSR223PostProcessorResources.properties | 4 +-
.../JSR223PostProcessorResources_fr.properties | 8 +-
.../apache/jmeter/extractor/JSoupExtractor.java | 8 +-
.../org/apache/jmeter/extractor/JoddExtractor.java | 10 +-
.../apache/jmeter/extractor/RegexExtractor.java | 10 +-
.../apache/jmeter/extractor/XPath2Extractor.java | 4 +-
.../apache/jmeter/extractor/XPathExtractor.java | 4 +-
.../jmeter/extractor/gui/BoundaryExtractorGui.java | 20 +-
.../jmeter/extractor/gui/HtmlExtractorGui.java | 14 +-
.../jmeter/extractor/gui/RegexExtractorGui.java | 6 +-
.../jmeter/extractor/gui/XPath2ExtractorGui.java | 6 +-
.../extractor/json/jsonpath/JSONManager.java | 6 +-
.../extractor/json/jsonpath/JSONPostProcessor.java | 10 +-
.../json/jsonpath/gui/JSONPostProcessorGui.java | 14 +-
.../json/render/RenderAsJsonRenderer.java | 6 +-
.../action/ExportTransactionAndSamplerNames.java | 28 +--
.../apache/jmeter/modifiers/BSFPreProcessor.java | 6 +-
.../modifiers/BSFPreProcessorResources.properties | 4 +-
.../BSFPreProcessorResources_fr.properties | 8 +-
.../BSFPreProcessorResources_pt_BR.properties | 4 +-
.../jmeter/modifiers/BeanShellPreProcessor.java | 2 +-
.../BeanShellPreProcessorResources.properties | 4 +-
.../BeanShellPreProcessorResources_de.properties | 4 +-
.../BeanShellPreProcessorResources_fr.properties | 10 +-
...BeanShellPreProcessorResources_pt_BR.properties | 6 +-
.../BeanShellPreProcessorResources_tr.properties | 4 +-
.../jmeter/modifiers/JSR223PreProcessor.java | 2 +-
.../JSR223PreProcessorResources.properties | 4 +-
.../JSR223PreProcessorResources_fr.properties | 8 +-
.../org/apache/jmeter/modifiers/SampleTimeout.java | 16 +-
.../apache/jmeter/modifiers/UserParameters.java | 8 +-
.../org/apache/jmeter/reporters/MailerModel.java | 2 +-
.../sampler/DebugSamplerResources.properties | 4 +-
.../sampler/DebugSamplerResources_de.properties | 4 +-
.../sampler/DebugSamplerResources_fr.properties | 10 +-
.../sampler/DebugSamplerResources_pt_BR.properties | 4 +-
.../sampler/DebugSamplerResources_tr.properties | 4 +-
.../org/apache/jmeter/sampler/TestAction.java | 6 +-
.../apache/jmeter/sampler/gui/TestActionGui.java | 22 +--
.../jmeter/thinktime/DefaultThinkTimeCreator.java | 20 +-
.../org/apache/jmeter/timers/BSFTimer.java | 2 +-
.../jmeter/timers/BSFTimerResources.properties | 4 +-
.../jmeter/timers/BSFTimerResources_fr.properties | 4 +-
.../org/apache/jmeter/timers/BeanShellTimer.java | 6 +-
.../timers/BeanShellTimerResources.properties | 4 +-
.../timers/BeanShellTimerResources_de.properties | 4 +-
.../timers/BeanShellTimerResources_fr.properties | 4 +-
.../BeanShellTimerResources_pt_BR.properties | 6 +-
.../timers/BeanShellTimerResources_tr.properties | 4 +-
.../jmeter/timers/ConstantThroughputTimer.java | 6 +-
.../ConstantThroughputTimerResources.properties | 4 +-
.../ConstantThroughputTimerResources_de.properties | 4 +-
.../ConstantThroughputTimerResources_es.properties | 6 +-
.../ConstantThroughputTimerResources_fr.properties | 8 +-
.../ConstantThroughputTimerResources_ja.properties | 4 +-
...nstantThroughputTimerResources_pt_BR.properties | 4 +-
.../ConstantThroughputTimerResources_tr.properties | 4 +-
...nstantThroughputTimerResources_zh_TW.properties | 4 +-
.../org/apache/jmeter/timers/JSR223Timer.java | 2 +-
.../jmeter/timers/JSR223TimerResources.properties | 4 +-
.../timers/JSR223TimerResources_fr.properties | 4 +-
.../org/apache/jmeter/timers/RandomTimer.java | 2 +-
.../org/apache/jmeter/timers/SyncTimer.java | 8 +-
.../jmeter/timers/SyncTimerResources.properties | 4 +-
.../jmeter/timers/SyncTimerResources_de.properties | 4 +-
.../jmeter/timers/SyncTimerResources_es.properties | 4 +-
.../jmeter/timers/SyncTimerResources_fr.properties | 6 +-
.../timers/SyncTimerResources_pt_BR.properties | 4 +-
.../jmeter/timers/SyncTimerResources_tr.properties | 4 +-
.../ConstantPoissonProcessGenerator.java | 2 +-
.../poissonarrivals/PreciseThroughputTimer.java | 2 +-
.../ComponentTreeClonerForValidation.java | 2 +-
.../org/apache/jmeter/visualizers/AxisGraph.java | 10 +-
.../org/apache/jmeter/visualizers/BSFListener.java | 2 +-
.../visualizers/BSFListenerResources.properties | 4 +-
.../visualizers/BSFListenerResources_fr.properties | 12 +-
.../BSFListenerResources_pt_BR.properties | 4 +-
.../org/apache/jmeter/visualizers/BarGraph.java | 16 +-
.../jmeter/visualizers/BeanShellListener.java | 2 +-
.../BeanShellListenerResources.properties | 4 +-
.../BeanShellListenerResources_de.properties | 4 +-
.../BeanShellListenerResources_fr.properties | 10 +-
.../BeanShellListenerResources_pt_BR.properties | 4 +-
.../BeanShellListenerResources_tr.properties | 4 +-
.../apache/jmeter/visualizers/JSR223Listener.java | 2 +-
.../visualizers/JSR223ListenerResources.properties | 4 +-
.../JSR223ListenerResources_fr.properties | 12 +-
.../org/apache/jmeter/visualizers/LineGraph.java | 6 +-
.../jmeter/visualizers/MailerVisualizer.java | 36 ++--
.../jmeter/visualizers/PropertyControlGui.java | 6 +-
.../visualizers/RenderAsBoundaryExtractor.java | 20 +-
.../jmeter/visualizers/RenderAsCssJQuery.java | 12 +-
.../jmeter/visualizers/RenderAsDocument.java | 2 +-
.../apache/jmeter/visualizers/RenderAsHTML.java | 2 +-
.../apache/jmeter/visualizers/RenderAsXPath.java | 22 +--
.../apache/jmeter/visualizers/RenderAsXPath2.java | 20 +-
.../apache/jmeter/visualizers/RenderInBrowser.java | 2 +-
.../apache/jmeter/visualizers/RequestPanel.java | 14 +-
.../org/apache/jmeter/visualizers/RequestView.java | 18 +-
.../apache/jmeter/visualizers/RequestViewRaw.java | 14 +-
.../jmeter/visualizers/RespTimeGraphChart.java | 36 ++--
.../jmeter/visualizers/RespTimeGraphDataBean.java | 18 +-
.../jmeter/visualizers/RespTimeGraphLineBean.java | 8 +-
.../visualizers/RespTimeGraphVisualizer.java | 50 ++---
.../jmeter/visualizers/SamplerResultTab.java | 42 ++---
.../jmeter/visualizers/SearchTextExtension.java | 30 +--
.../apache/jmeter/visualizers/SearchTreePanel.java | 20 +-
.../jmeter/visualizers/SearchableTreeNode.java | 10 +-
.../jmeter/visualizers/StatGraphProperties.java | 12 +-
.../jmeter/visualizers/StatGraphVisualizer.java | 42 ++---
.../apache/jmeter/visualizers/SummaryReport.java | 8 +-
.../visualizers/ViewResultsFullVisualizer.java | 8 +-
.../backend/AbstractBackendListenerClient.java | 8 +-
.../visualizers/backend/BackendListener.java | 10 +-
.../visualizers/backend/BackendListenerClient.java | 2 +-
.../backend/BackendListenerContext.java | 2 +-
.../jmeter/visualizers/backend/ErrorMetric.java | 10 +-
.../jmeter/visualizers/backend/SamplerMetric.java | 62 +++----
.../jmeter/visualizers/backend/UserMetric.java | 14 +-
.../graphite/AbstractGraphiteMetricsSender.java | 6 +-
.../graphite/GraphiteBackendListenerClient.java | 42 ++---
.../backend/graphite/GraphiteMetricsSender.java | 8 +-
.../graphite/PickleGraphiteMetricsSender.java | 18 +-
.../backend/graphite/SocketConnectionInfos.java | 4 +-
.../graphite/SocketOutputStreamPoolFactory.java | 4 +-
.../graphite/TextGraphiteMetricsSender.java | 8 +-
.../influxdb/AbstractInfluxdbMetricsSender.java | 2 +-
.../backend/influxdb/HttpMetricsSender.java | 22 +--
.../influxdb/InfluxdbBackendListenerClient.java | 18 +-
.../backend/influxdb/InfluxdbMetricsSender.java | 2 +-
.../backend/influxdb/UdpMetricsSender.java | 6 +-
.../apache/jmeter/visualizers/utils/Colors.java | 18 +-
.../jmeter/visualizers/utils/colors.properties | 4 +-
src/core/org/apache/jmeter/JMeter.java | 78 ++++----
src/core/org/apache/jmeter/NewDriver.java | 6 +-
.../apache/jmeter/assertions/AssertionResult.java | 2 +-
.../jmeter/assertions/CompareAssertionResult.java | 2 +-
.../assertions/gui/AbstractAssertionGui.java | 2 +-
src/core/org/apache/jmeter/config/Argument.java | 8 +-
.../apache/jmeter/config/gui/ArgumentsPanel.java | 50 ++---
.../apache/jmeter/config/gui/SimpleConfigGui.java | 2 +-
.../apache/jmeter/control/GenericController.java | 26 +--
.../org/apache/jmeter/control/IfController.java | 36 ++--
.../apache/jmeter/control/IteratingController.java | 6 +-
.../org/apache/jmeter/control/LoopController.java | 18 +-
.../apache/jmeter/control/NextIsNullException.java | 4 +-
.../jmeter/control/ReplaceableController.java | 2 +-
.../jmeter/control/TransactionController.java | 18 +-
.../apache/jmeter/control/TransactionSampler.java | 2 +-
.../org/apache/jmeter/control/WhileController.java | 4 +-
.../jmeter/control/gui/IfControllerPanel.java | 2 +-
.../control/gui/TestFragmentControllerGui.java | 4 +-
.../jmeter/control/gui/WhileControllerGui.java | 2 +-
.../apache/jmeter/control/gui/WorkBenchGui.java | 4 +-
.../apache/jmeter/engine/ClientJMeterEngine.java | 16 +-
.../org/apache/jmeter/engine/ConvertListeners.java | 4 +-
.../apache/jmeter/engine/DistributedRunner.java | 2 +-
.../org/apache/jmeter/engine/JMeterEngine.java | 4 +-
src/core/org/apache/jmeter/engine/PreCompiler.java | 8 +-
.../jmeter/engine/RemoteJMeterEngineImpl.java | 16 +-
.../apache/jmeter/engine/StandardJMeterEngine.java | 46 ++---
src/core/org/apache/jmeter/engine/TreeCloner.java | 6 +-
.../apache/jmeter/engine/TreeClonerNoTimer.java | 2 +-
.../jmeter/engine/event/LoopIterationListener.java | 2 +-
.../jmeter/engine/util/CompoundVariable.java | 8 +-
.../engine/util/ConfigMergabilityIndicator.java | 6 +-
.../apache/jmeter/engine/util/FunctionParser.java | 4 +-
.../apache/jmeter/engine/util/NoConfigMerge.java | 6 +-
.../apache/jmeter/engine/util/NoThreadClone.java | 4 +-
.../engine/util/ReplaceFunctionsWithStrings.java | 4 +-
.../engine/util/ReplaceStringWithFunctions.java | 2 +-
.../engine/util/UndoVariableReplacement.java | 2 +-
.../apache/jmeter/engine/util/ValueReplacer.java | 4 +-
.../apache/jmeter/functions/AbstractFunction.java | 8 +-
.../jmeter/functions/gui/FunctionHelper.java | 24 +--
.../jmeter/gui/AbstractJMeterGuiComponent.java | 4 +-
.../gui/AbstractScopedJMeterGuiComponent.java | 4 +-
src/core/org/apache/jmeter/gui/ClearGui.java | 2 +-
src/core/org/apache/jmeter/gui/GuiPackage.java | 38 ++--
src/core/org/apache/jmeter/gui/HtmlReportUI.java | 6 +-
src/core/org/apache/jmeter/gui/LoggerPanel.java | 2 +-
src/core/org/apache/jmeter/gui/MainFrame.java | 14 +-
src/core/org/apache/jmeter/gui/NamePanel.java | 4 +-
src/core/org/apache/jmeter/gui/OnErrorPanel.java | 4 +-
.../org/apache/jmeter/gui/SavePropertyDialog.java | 2 +-
src/core/org/apache/jmeter/gui/ServerPanel.java | 6 +-
.../org/apache/jmeter/gui/TestPlanListener.java | 2 +-
src/core/org/apache/jmeter/gui/UndoHistory.java | 10 +-
.../org/apache/jmeter/gui/UndoHistoryItem.java | 2 +-
.../org/apache/jmeter/gui/UnsharedComponent.java | 4 +-
.../org/apache/jmeter/gui/action/AboutCommand.java | 2 +-
.../apache/jmeter/gui/action/AbstractAction.java | 14 +-
.../action/AbstractActionWithNoRunningTest.java | 2 +-
.../org/apache/jmeter/gui/action/ActionNames.java | 2 +-
.../org/apache/jmeter/gui/action/ActionRouter.java | 8 +-
.../gui/action/AddThinkTimeBetweenEachStep.java | 28 +--
.../jmeter/gui/action/ApplyNamingConvention.java | 4 +-
.../org/apache/jmeter/gui/action/ChangeParent.java | 6 +-
.../org/apache/jmeter/gui/action/CheckDirty.java | 4 +-
.../gui/action/CompileJSR223TestElements.java | 10 +-
src/core/org/apache/jmeter/gui/action/Copy.java | 10 +-
src/core/org/apache/jmeter/gui/action/Help.java | 12 +-
.../jmeter/gui/action/HtmlReportGenerator.java | 10 +-
.../org/apache/jmeter/gui/action/KeyStrokes.java | 2 +-
.../jmeter/gui/action/LookAndFeelCommand.java | 2 +-
src/core/org/apache/jmeter/gui/action/Move.java | 2 +-
src/core/org/apache/jmeter/gui/action/Remove.java | 6 +-
src/core/org/apache/jmeter/gui/action/Restart.java | 16 +-
src/core/org/apache/jmeter/gui/action/Save.java | 58 +++---
.../apache/jmeter/gui/action/SaveBeforeRun.java | 2 +-
.../apache/jmeter/gui/action/SchematicView.java | 16 +-
.../jmeter/gui/action/SearchTreeCommand.java | 4 +-
.../apache/jmeter/gui/action/SearchTreeDialog.java | 26 +--
.../jmeter/gui/action/SelectTemplatesDialog.java | 72 ++++----
src/core/org/apache/jmeter/gui/action/Start.java | 36 ++--
.../apache/jmeter/gui/action/StopStoppables.java | 6 +-
.../apache/jmeter/gui/action/TemplatesCommand.java | 4 +-
.../jmeter/gui/action/TreeNodeNamingPolicy.java | 10 +-
.../action/impl/DefaultTreeNodeNamingPolicy.java | 4 +-
.../jmeter/gui/action/template/Template.java | 16 +-
.../gui/action/template/TemplateManager.java | 18 +-
.../jmeter/gui/action/template/templates.dtd | 4 +-
.../gui/action/thinktime/ThinkTimeCreator.java | 2 +-
.../action/validation/TreeClonerForValidation.java | 6 +-
.../org/apache/jmeter/gui/plugin/MenuCreator.java | 2 +-
.../apache/jmeter/gui/tree/JMeterCellRenderer.java | 4 +-
.../apache/jmeter/gui/tree/JMeterTreeListener.java | 2 +-
.../apache/jmeter/gui/tree/JMeterTreeModel.java | 6 +-
.../org/apache/jmeter/gui/tree/JMeterTreeNode.java | 8 +-
.../jmeter/gui/tree/JMeterTreeTransferHandler.java | 68 +++----
.../org/apache/jmeter/gui/util/CheckBoxPanel.java | 4 +-
.../org/apache/jmeter/gui/util/EscapeDialog.java | 4 +-
.../org/apache/jmeter/gui/util/FileDialoger.java | 20 +-
src/core/org/apache/jmeter/gui/util/FilePanel.java | 6 +-
.../org/apache/jmeter/gui/util/FilePanelEntry.java | 6 +-
.../jmeter/gui/util/HeaderAsPropertyRenderer.java | 6 +-
.../gui/util/HeaderAsPropertyRendererWrapper.java | 8 +-
.../apache/jmeter/gui/util/IconToolbarBean.java | 18 +-
.../org/apache/jmeter/gui/util/JDateField.java | 6 +-
.../apache/jmeter/gui/util/JLabeledRadioI18N.java | 2 +-
.../org/apache/jmeter/gui/util/JMeterMenuBar.java | 18 +-
.../org/apache/jmeter/gui/util/JMeterToolBar.java | 50 ++---
.../jmeter/gui/util/JSyntaxSearchToolBar.java | 22 +--
.../apache/jmeter/gui/util/JSyntaxTextArea.java | 16 +-
.../apache/jmeter/gui/util/JTextScrollPane.java | 8 +-
.../org/apache/jmeter/gui/util/MenuFactory.java | 6 +-
src/core/org/apache/jmeter/gui/util/MenuInfo.java | 2 +-
.../jmeter/gui/util/TextAreaCellRenderer.java | 2 +-
.../apache/jmeter/gui/util/TextBoxDialoger.java | 58 +++---
.../apache/jmeter/gui/util/TristateCheckBox.java | 8 +-
src/core/org/apache/jmeter/images/icon.properties | 4 +-
.../org/apache/jmeter/images/icon_1.properties | 4 +-
.../org/apache/jmeter/images/icon_old.properties | 4 +-
.../jmeter/images/toolbar/icons-toolbar.properties | 4 +-
.../processor/gui/AbstractPostProcessorGui.java | 2 +-
.../jmeter/report/config/ConfigurationUtils.java | 2 +-
.../report/config/ExporterConfiguration.java | 6 +-
.../config/ReportGeneratorConfiguration.java | 34 ++--
.../org/apache/jmeter/report/config/package.html | 2 +-
.../jmeter/report/core/AbstractSampleWriter.java | 10 +-
.../report/core/ControllerSamplePredicate.java | 4 +-
.../jmeter/report/core/ConvertException.java | 2 +-
.../org/apache/jmeter/report/core/Converters.java | 4 +-
.../org/apache/jmeter/report/core/CsvFile.java | 2 +-
.../apache/jmeter/report/core/CsvSampleReader.java | 2 +-
.../apache/jmeter/report/core/CsvSampleWriter.java | 12 +-
.../org/apache/jmeter/report/core/DataContext.java | 2 +-
.../org/apache/jmeter/report/core/JsonUtil.java | 2 +-
src/core/org/apache/jmeter/report/core/Sample.java | 22 +--
.../apache/jmeter/report/core/SampleBuilder.java | 2 +-
.../apache/jmeter/report/core/SampleException.java | 4 +-
.../jmeter/report/core/SampleMetaDataParser.java | 2 +-
.../apache/jmeter/report/core/SampleMetadata.java | 14 +-
.../apache/jmeter/report/core/SamplePredicate.java | 2 +-
.../apache/jmeter/report/core/SampleWriter.java | 4 +-
.../org/apache/jmeter/report/core/TimeHelper.java | 2 +-
.../org/apache/jmeter/report/core/package.html | 4 +-
.../report/dashboard/AbstractDataExporter.java | 8 +-
.../jmeter/report/dashboard/DataExporter.java | 2 +-
.../report/dashboard/HtmlTemplateExporter.java | 26 +--
.../jmeter/report/dashboard/JsonExporter.java | 12 +-
.../jmeter/report/dashboard/JsonizerVisitor.java | 6 +-
.../jmeter/report/dashboard/ReportGenerator.java | 32 ++--
.../jmeter/report/dashboard/TemplateVisitor.java | 4 +-
.../apache/jmeter/report/dashboard/package.html | 2 +-
.../processor/AbstractAggregatorFactory.java | 8 +-
.../report/processor/AbstractSampleConsumer.java | 4 +-
.../report/processor/AbstractSampleProcessor.java | 12 +-
.../report/processor/AbstractSampleSource.java | 12 +-
.../report/processor/AbstractSummaryConsumer.java | 6 +-
.../jmeter/report/processor/AggregateConsumer.java | 8 +-
.../report/processor/ApdexSummaryConsumer.java | 10 +-
.../jmeter/report/processor/ChannelContext.java | 2 +-
.../report/processor/CsvFileSampleSource.java | 10 +-
.../report/processor/ErrorsSummaryConsumer.java | 24 +--
.../report/processor/ExternalSampleSorter.java | 22 +--
.../jmeter/report/processor/FilterConsumer.java | 4 +-
.../org/apache/jmeter/report/processor/Job.java | 4 +-
.../jmeter/report/processor/MapResultData.java | 4 +-
.../jmeter/report/processor/MaxAggregator.java | 10 +-
.../report/processor/MaxAggregatorFactory.java | 2 +-
.../jmeter/report/processor/MeanAggregator.java | 10 +-
.../report/processor/MeanAggregatorFactory.java | 2 +-
.../report/processor/MedianAggregatorFactory.java | 2 +-
.../jmeter/report/processor/MinAggregator.java | 10 +-
.../report/processor/NormalizerSampleConsumer.java | 14 +-
.../report/processor/PercentileAggregator.java | 10 +-
.../processor/PercentileAggregatorFactory.java | 2 +-
.../report/processor/RequestsSummaryConsumer.java | 4 +-
.../apache/jmeter/report/processor/ResultData.java | 2 +-
.../jmeter/report/processor/SampleConsumer.java | 4 +-
.../jmeter/report/processor/SampleContext.java | 4 +-
.../jmeter/report/processor/SampleIndexer.java | 2 +-
.../jmeter/report/processor/SampleProcessor.java | 6 +-
.../jmeter/report/processor/SampleProducer.java | 4 +-
.../jmeter/report/processor/SampleSource.java | 8 +-
.../report/processor/SampleWriterConsumer.java | 4 +-
.../processor/StatisticsSummaryConsumer.java | 12 +-
.../report/processor/StatisticsSummaryData.java | 8 +-
.../jmeter/report/processor/SumAggregator.java | 10 +-
.../report/processor/SumAggregatorFactory.java | 2 +-
.../jmeter/report/processor/TaggerConsumer.java | 2 +-
.../report/processor/TimeRateAggregator.java | 10 +-
.../processor/TimeRateAggregatorFactory.java | 2 +-
.../processor/Top5ErrorsBySamplerConsumer.java | 16 +-
.../jmeter/report/processor/ValueResultData.java | 4 +-
.../graph/AbstractGraphValueSelector.java | 2 +-
.../graph/AbstractOverTimeGraphConsumer.java | 8 +-
.../processor/graph/AbstractSeriesSelector.java | 2 +-
.../graph/AbstractVersusRequestsGraphConsumer.java | 12 +-
.../report/processor/graph/CodeSeriesSelector.java | 4 +-
.../processor/graph/ConnectTimeValueSelector.java | 6 +-
.../processor/graph/GraphSeriesSelector.java | 4 +-
.../jmeter/report/processor/graph/GroupInfo.java | 2 +-
.../processor/graph/IndexedNameSelector.java | 2 +-
.../processor/graph/LatencyValueSelector.java | 4 +-
.../report/processor/graph/NameSeriesSelector.java | 6 +-
.../jmeter/report/processor/graph/SeriesData.java | 2 +-
.../processor/graph/StaticSeriesSelector.java | 4 +-
.../processor/graph/StatusSeriesSelector.java | 2 +-
.../graph/SuccessfulElapsedTimeValueSelector.java | 2 +-
.../processor/graph/TimeStampKeysSelector.java | 2 +-
.../graph/impl/ActiveThreadsGraphConsumer.java | 6 +-
.../graph/impl/BytesThroughputGraphConsumer.java | 8 +-
.../graph/impl/CodesPerSecondGraphConsumer.java | 8 +-
.../impl/ConnectTimeOverTimeGraphConsumer.java | 4 +-
.../processor/graph/impl/CustomGraphConsumer.java | 52 +++---
.../graph/impl/HitsPerSecondGraphConsumer.java | 10 +-
.../graph/impl/LatencyOverTimeGraphConsumer.java | 4 +-
.../graph/impl/LatencyVSRequestGraphConsumer.java | 4 +-
.../impl/ResponseCustomGraphGraphConsumer.java | 6 +-
.../ResponseTimeDistributionGraphConsumer.java | 6 +-
.../impl/ResponseTimeOverTimeGraphConsumer.java | 6 +-
.../impl/ResponseTimePerSampleGraphConsumer.java | 8 +-
.../impl/ResponseTimePercentilesGraphConsumer.java | 8 +-
.../impl/ResponseTimeVSRequestGraphConsumer.java | 4 +-
...heticResponseTimeDistributionGraphConsumer.java | 12 +-
.../graph/impl/TimeVSThreadGraphConsumer.java | 6 +-
.../graph/impl/TotalTPSGraphConsumer.java | 12 +-
.../impl/TransactionsPerSecondGraphConsumer.java | 4 +-
.../report/processor/graph/impl/package.html | 4 +-
.../jmeter/report/processor/graph/package.html | 4 +-
.../apache/jmeter/report/processor/package.html | 4 +-
.../apache/jmeter/report/utils/MetricUtils.java | 4 +-
.../apache/jmeter/reporters/ResultCollector.java | 20 +-
.../org/apache/jmeter/reporters/ResultSaver.java | 14 +-
.../org/apache/jmeter/reporters/Summariser.java | 2 +-
.../jmeter/reporters/gui/ResultSaverGui.java | 12 +-
.../apache/jmeter/resources/messages.properties | 104 +++++------
.../apache/jmeter/resources/messages_de.properties | 6 +-
.../apache/jmeter/resources/messages_es.properties | 18 +-
.../apache/jmeter/resources/messages_fr.properties | 138 +++++++-------
.../apache/jmeter/resources/messages_ja.properties | 4 +-
.../apache/jmeter/resources/messages_no.properties | 4 +-
.../jmeter/resources/messages_pt_BR.properties | 6 +-
.../apache/jmeter/resources/messages_tr.properties | 16 +-
.../jmeter/resources/messages_zh_CN.properties | 2 +-
.../jmeter/resources/messages_zh_TW.properties | 4 +-
.../org/apache/jmeter/rmi/AliasKeyManager.java | 2 +-
.../jmeter/rmi/RMIServerSocketFactoryImpl.java | 2 +-
src/core/org/apache/jmeter/rmi/RmiUtils.java | 4 +-
.../jmeter/rmi/SSLRMIServerSocketFactory.java | 2 +-
.../jmeter/samplers/AbstractSampleSender.java | 6 +-
.../apache/jmeter/samplers/AbstractSampler.java | 2 +-
.../apache/jmeter/samplers/AsynchSampleSender.java | 24 +--
.../apache/jmeter/samplers/BatchSampleSender.java | 12 +-
src/core/org/apache/jmeter/samplers/Clearable.java | 2 +-
.../jmeter/samplers/DataStrippingSampleSender.java | 14 +-
.../jmeter/samplers/DiskStoreSampleSender.java | 2 +-
src/core/org/apache/jmeter/samplers/Entry.java | 2 +-
.../apache/jmeter/samplers/HoldSampleSender.java | 6 +-
.../jmeter/samplers/RemoteSampleListener.java | 6 +-
.../jmeter/samplers/RemoteSampleListenerImpl.java | 6 +-
.../samplers/RemoteSampleListenerWrapper.java | 2 +-
.../org/apache/jmeter/samplers/Remoteable.java | 2 +-
.../org/apache/jmeter/samplers/SampleEvent.java | 14 +-
.../org/apache/jmeter/samplers/SampleListener.java | 6 +-
.../org/apache/jmeter/samplers/SampleResult.java | 100 +++++-----
.../jmeter/samplers/SampleSaveConfiguration.java | 28 +--
.../org/apache/jmeter/samplers/SampleSender.java | 4 +-
src/core/org/apache/jmeter/samplers/Sampler.java | 2 +-
.../jmeter/samplers/StandardSampleSender.java | 4 +-
.../jmeter/samplers/StatisticalSampleResult.java | 6 +-
.../org/apache/jmeter/save/CSVSaveService.java | 56 +++---
src/core/org/apache/jmeter/save/SaveService.java | 24 +--
.../apache/jmeter/save/ScriptWrapperConverter.java | 2 +-
.../save/converters/BooleanPropertyConverter.java | 2 +-
.../jmeter/save/converters/ConversionHelp.java | 30 +--
.../jmeter/save/converters/HashTreeConverter.java | 2 +-
.../save/converters/IntegerPropertyConverter.java | 2 +-
.../save/converters/LongPropertyConverter.java | 2 +-
.../save/converters/MultiPropertyConverter.java | 4 +-
.../save/converters/SampleEventConverter.java | 2 +-
.../save/converters/SampleResultConverter.java | 8 +-
.../SampleSaveConfigurationConverter.java | 2 +-
.../save/converters/StringPropertyConverter.java | 2 +-
.../save/converters/TestElementConverter.java | 2 +-
.../converters/TestElementPropertyConverter.java | 2 +-
.../converters/TestResultWrapperConverter.java | 2 +-
.../org/apache/jmeter/services/FileServer.java | 26 +--
.../apache/jmeter/testbeans/BeanInfoSupport.java | 2 +-
.../apache/jmeter/testbeans/TestBeanHelper.java | 6 +-
.../testbeans/gui/BooleanPropertyEditor.java | 6 +-
.../jmeter/testbeans/gui/ComboStringEditor.java | 6 +-
.../apache/jmeter/testbeans/gui/FileEditor.java | 2 +-
.../testbeans/gui/GenericTestBeanCustomizer.java | 22 +--
.../testbeans/gui/IntegerPropertyEditor.java | 2 +-
.../jmeter/testbeans/gui/LongPropertyEditor.java | 2 +-
.../jmeter/testbeans/gui/SharedCustomizer.java | 2 +-
.../apache/jmeter/testbeans/gui/TableEditor.java | 30 +--
.../apache/jmeter/testbeans/gui/TestBeanGUI.java | 12 +-
.../jmeter/testbeans/gui/TextAreaEditor.java | 2 +-
.../apache/jmeter/testbeans/gui/TypeEditor.java | 4 +-
.../apache/jmeter/testbeans/gui/WrapperEditor.java | 2 +-
.../testelement/AbstractScopedAssertion.java | 4 +-
.../jmeter/testelement/AbstractTestElement.java | 14 +-
.../jmeter/testelement/OnErrorTestElement.java | 6 +-
.../org/apache/jmeter/testelement/TestElement.java | 6 +-
.../apache/jmeter/testelement/ThreadListener.java | 2 +-
.../testelement/property/AbstractProperty.java | 2 +-
.../testelement/property/PropertyIterator.java | 2 +-
.../apache/jmeter/threads/AbstractThreadGroup.java | 16 +-
.../threads/FindTestElementsUpToRootTraverser.java | 6 +-
.../org/apache/jmeter/threads/JMeterContext.java | 28 +--
.../jmeter/threads/JMeterContextService.java | 8 +-
.../org/apache/jmeter/threads/JMeterThread.java | 28 +--
.../apache/jmeter/threads/JMeterThreadMonitor.java | 2 +-
.../org/apache/jmeter/threads/JMeterVariables.java | 16 +-
.../apache/jmeter/threads/ListenerNotifier.java | 4 +-
.../threads/RemoteThreadsLifeCycleListener.java | 4 +-
.../jmeter/threads/RemoteThreadsListener.java | 2 +-
.../jmeter/threads/RemoteThreadsListenerImpl.java | 10 +-
.../threads/RemoteThreadsListenerTestElement.java | 4 +-
.../threads/RemoteThreadsListenerWrapper.java | 2 +-
.../org/apache/jmeter/threads/SamplePackage.java | 8 +-
.../apache/jmeter/threads/SetupThreadGroup.java | 2 +-
.../org/apache/jmeter/threads/TestCompiler.java | 2 +-
.../apache/jmeter/threads/TestCompilerHelper.java | 14 +-
.../org/apache/jmeter/threads/ThreadGroup.java | 36 ++--
.../threads/UnmodifiableJMeterVariables.java | 6 +-
.../jmeter/threads/gui/AbstractThreadGroupGui.java | 6 +-
.../apache/jmeter/threads/gui/ThreadGroupGui.java | 6 +-
src/core/org/apache/jmeter/timers/Timer.java | 2 +-
.../org/apache/jmeter/timers/TimerService.java | 8 +-
.../apache/jmeter/util/BSFJavaScriptEngine.java | 2 +-
.../apache/jmeter/util/BeanShellInterpreter.java | 2 +-
.../org/apache/jmeter/util/BeanShellServer.java | 2 +-
.../apache/jmeter/util/BeanShellTestElement.java | 2 +-
src/core/org/apache/jmeter/util/Calculator.java | 14 +-
src/core/org/apache/jmeter/util/Document.java | 14 +-
.../jmeter/util/HttpSSLProtocolSocketFactory.java | 6 +-
.../jmeter/util/JMeterTreeNodeTransferable.java | 8 +-
src/core/org/apache/jmeter/util/JMeterUtils.java | 58 +++---
src/core/org/apache/jmeter/util/JMeterVersion.java | 2 +-
.../apache/jmeter/util/JSR223BeanInfoSupport.java | 10 +-
.../org/apache/jmeter/util/JSR223TestElement.java | 22 +--
.../org/apache/jmeter/util/JsseSSLManager.java | 18 +-
src/core/org/apache/jmeter/util/NameUpdater.java | 12 +-
.../jmeter/util/PropertiesBasedPrefixResolver.java | 2 +-
.../PropertiesBasedPrefixResolverForXpath2.java | 2 +-
src/core/org/apache/jmeter/util/SSLManager.java | 4 +-
src/core/org/apache/jmeter/util/ScopePanel.java | 6 +-
.../jmeter/util/ScriptingBeanInfoSupport.java | 24 +--
.../apache/jmeter/util/ScriptingTestElement.java | 8 +-
src/core/org/apache/jmeter/util/SlowSocket.java | 2 +-
src/core/org/apache/jmeter/util/TemplateUtil.java | 16 +-
.../jmeter/util/TrustAllSSLSocketFactory.java | 2 +-
.../apache/jmeter/util/XPathQueryCacheLoader.java | 4 +-
src/core/org/apache/jmeter/util/XPathUtil.java | 36 ++--
.../jmeter/util/keystore/JmeterKeyStore.java | 8 +-
.../jmeter/visualizers/CachingStatCalculator.java | 2 +-
.../apache/jmeter/visualizers/RunningSample.java | 4 +-
src/core/org/apache/jmeter/visualizers/Sample.java | 2 +-
.../jmeter/visualizers/SamplingStatCalculator.java | 4 +-
.../org/apache/jmeter/visualizers/TableSample.java | 8 +-
.../jmeter/visualizers/gui/AbstractVisualizer.java | 2 +-
.../org/apache/jmeter/visualizers/package.html | 4 +-
.../example2/Example2Resources.properties | 4 +-
.../example2/Example2Resources_es.properties | 4 +-
.../example2/Example2Resources_pt_BR.properties | 4 +-
.../example2/Example2Resources_tr.properties | 4 +-
.../example2/Example2Resources_zh_TW.properties | 4 +-
.../example3/Example3Resources.properties | 4 +-
.../jmeter/functions/AbstractFunctionByKey.java | 6 +-
.../org/apache/jmeter/functions/ChangeCase.java | 10 +-
.../jmeter/functions/DateTimeConvertFunction.java | 4 +-
.../jmeter/functions/DigestEncodeFunction.java | 4 +-
.../org/apache/jmeter/functions/EscapeHtml.java | 6 +-
.../jmeter/functions/EscapeOroRegexpChars.java | 8 +-
.../jmeter/functions/FileRowColContainer.java | 4 +-
.../org/apache/jmeter/functions/FileWrapper.java | 2 +-
.../org/apache/jmeter/functions/Groovy.java | 12 +-
.../org/apache/jmeter/functions/IntSum.java | 2 +-
.../org/apache/jmeter/functions/IsPropDefined.java | 2 +-
.../org/apache/jmeter/functions/IsVarDefined.java | 2 +-
.../org/apache/jmeter/functions/JavaScript.java | 12 +-
.../org/apache/jmeter/functions/Jexl2Function.java | 2 +-
.../org/apache/jmeter/functions/Jexl3Function.java | 4 +-
.../org/apache/jmeter/functions/LongSum.java | 2 +-
.../org/apache/jmeter/functions/Random.java | 2 +-
.../org/apache/jmeter/functions/RandomDate.java | 8 +-
.../jmeter/functions/RandomFromMultipleVars.java | 8 +-
.../org/apache/jmeter/functions/RandomString.java | 6 +-
.../org/apache/jmeter/functions/RegexFunction.java | 4 +-
.../org/apache/jmeter/functions/SplitFunction.java | 2 +-
.../apache/jmeter/functions/StringFromFile.java | 6 +-
.../org/apache/jmeter/functions/StringToFile.java | 10 +-
.../apache/jmeter/functions/ThreadGroupName.java | 4 +-
.../org/apache/jmeter/functions/TimeFunction.java | 2 +-
.../org/apache/jmeter/functions/TimeShift.java | 10 +-
.../org/apache/jmeter/functions/UnEscape.java | 4 +-
.../org/apache/jmeter/functions/UnEscapeHtml.java | 4 +-
.../org/apache/jmeter/functions/UrlDecode.java | 6 +-
.../org/apache/jmeter/functions/UrlEncode.java | 6 +-
.../org/apache/jmeter/functions/Variable.java | 2 +-
.../jmeter/functions/XPathFileContainer.java | 2 +-
.../org/apache/jmeter/functions/package.html | 12 +-
.../org/apache/commons/cli/avalon/package.html | 8 +-
.../org/apache/jorphan/collections/Data.java | 4 +-
.../org/apache/jorphan/collections/HashTree.java | 4 +-
.../jorphan/documentation/VisibleForTesting.java | 2 +-
.../org/apache/jorphan/exec/StreamCopier.java | 4 +-
.../org/apache/jorphan/exec/SystemCommand.java | 8 +-
.../apache/jorphan/gui/AbstractTreeTableModel.java | 2 +-
src/jorphan/org/apache/jorphan/gui/GuiUtils.java | 10 +-
.../org/apache/jorphan/gui/JLabeledChoice.java | 2 +-
.../org/apache/jorphan/gui/JLabeledTextArea.java | 2 +-
.../org/apache/jorphan/gui/JLabeledTextField.java | 4 +-
.../org/apache/jorphan/gui/MenuScroller.java | 56 +++---
.../org/apache/jorphan/gui/ObjectTableModel.java | 14 +-
.../org/apache/jorphan/gui/TreeTableModel.java | 2 +-
.../org/apache/jorphan/logging/LoggingManager.java | 18 +-
.../org/apache/jorphan/math/StatCalculator.java | 10 +-
.../apache/jorphan/math/StatCalculatorInteger.java | 4 +-
.../apache/jorphan/math/StatCalculatorLong.java | 6 +-
.../org/apache/jorphan/reflect/ClassFinder.java | 2 +-
.../org/apache/jorphan/reflect/Functor.java | 6 +-
.../org/apache/jorphan/util/JMeterException.java | 2 +-
.../jorphan/util/JMeterStopTestException.java | 6 +-
.../jorphan/util/JMeterStopTestNowException.java | 6 +-
.../jorphan/util/JMeterStopThreadException.java | 2 +-
.../org/apache/jorphan/util/JOrphanUtils.java | 28 +--
.../org/apache/jorphan/util/ThreadDumper.java | 2 +-
src/jorphan/org/apache/log/ContextMap.java | 4 +-
src/jorphan/org/apache/log/LogEvent.java | 2 +-
src/jorphan/org/apache/log/LogTarget.java | 2 +-
src/jorphan/org/apache/log/Logger.java | 2 +-
src/jorphan/org/apache/log/Priority.java | 2 +-
.../java/control/gui/JUnitTestSamplerGui.java | 2 +-
.../jmeter/protocol/java/sampler/JUnitSampler.java | 16 +-
src/junit/test/Junit4AnnotationsTest.java | 4 +-
src/junit/test/RerunTest.java | 2 +-
.../jmeter/protocol/ftp/sampler/FTPSampler.java | 6 +-
.../protocol/http/api/auth/DigestParameters.java | 4 +-
.../protocol/http/config/MultipartUrlConfig.java | 2 +-
.../protocol/http/config/gui/HttpDefaultsGui.java | 26 +--
.../protocol/http/config/gui/UrlConfigGui.java | 42 ++---
.../jmeter/protocol/http/control/AuthManager.java | 24 +--
.../jmeter/protocol/http/control/CacheManager.java | 22 +--
.../jmeter/protocol/http/control/Cookie.java | 2 +-
.../protocol/http/control/CookieHandler.java | 4 +-
.../protocol/http/control/CookieManager.java | 10 +-
.../protocol/http/control/DNSCacheManager.java | 6 +-
.../protocol/http/control/HC4CookieHandler.java | 32 ++--
.../protocol/http/control/HeaderManager.java | 10 +-
.../protocol/http/control/HttpMirrorControl.java | 12 +-
.../protocol/http/control/HttpMirrorServer.java | 4 +-
.../protocol/http/control/HttpMirrorThread.java | 2 +-
.../protocol/http/control/KerberosManager.java | 4 +-
.../protocol/http/control/RecordingController.java | 2 +-
.../jmeter/protocol/http/control/StaticHost.java | 4 +-
.../http/control/gui/HttpMirrorControlGui.java | 8 +-
.../http/control/gui/HttpTestSampleGui.java | 28 +--
.../http/control/gui/RecordController.java | 16 +-
.../jmeter/protocol/http/curl/BasicCurlParser.java | 12 +-
.../apache/jmeter/protocol/http/gui/AuthPanel.java | 10 +-
.../jmeter/protocol/http/gui/CacheManagerGui.java | 2 +-
.../jmeter/protocol/http/gui/CookiePanel.java | 4 +-
.../protocol/http/gui/HTTPArgumentsPanel.java | 26 +--
.../protocol/http/gui/HTTPFileArgsPanel.java | 8 +-
.../jmeter/protocol/http/gui/HeaderPanel.java | 2 +-
.../http/gui/action/ParseCurlCommandAction.java | 26 +--
.../protocol/http/modifier/AnchorModifier.java | 4 +-
.../http/modifier/RegExUserParameters.java | 12 +-
.../http/modifier/URLRewritingModifier.java | 2 +-
.../http/modifier/gui/RegExUserParametersGui.java | 12 +-
.../jmeter/protocol/http/parser/BaseParser.java | 6 +-
.../jmeter/protocol/http/parser/HTMLParser.java | 10 +-
.../protocol/http/parser/JTidyHTMLParser.java | 12 +-
.../protocol/http/parser/JsoupBasedHtmlParser.java | 2 +-
.../http/parser/LagartoBasedHtmlParser.java | 20 +-
.../http/parser/LinkExtractorParseException.java | 4 +-
.../protocol/http/parser/LinkExtractorParser.java | 6 +-
.../protocol/http/parser/RegexpHTMLParser.java | 2 +-
.../jmeter/protocol/http/parser/URLCollection.java | 2 +-
.../http/proxy/AbstractSamplerCreator.java | 14 +-
.../protocol/http/proxy/DefaultSamplerCreator.java | 40 ++--
.../protocol/http/proxy/FormCharSetFinder.java | 2 +-
.../jmeter/protocol/http/proxy/HttpRequestHdr.java | 8 +-
.../apache/jmeter/protocol/http/proxy/Proxy.java | 16 +-
.../jmeter/protocol/http/proxy/ProxyControl.java | 38 ++--
.../jmeter/protocol/http/proxy/SamplerCreator.java | 8 +-
.../protocol/http/proxy/SamplerCreatorFactory.java | 12 +-
.../protocol/http/proxy/ServerAliasKeyManager.java | 4 +-
.../protocol/http/proxy/gui/ProxyControlGui.java | 58 +++---
.../protocol/http/proxy/gui/RecorderDialog.java | 14 +-
.../protocol/http/sampler/AccessLogSampler.java | 4 +-
.../http/sampler/AccessLogSamplerBeanInfo.java | 2 +-
.../sampler/AccessLogSamplerResources.properties | 4 +-
.../AccessLogSamplerResources_es.properties | 4 +-
.../AccessLogSamplerResources_fr.properties | 16 +-
.../AccessLogSamplerResources_pt_BR.properties | 4 +-
.../AccessLogSamplerResources_tr.properties | 6 +-
.../AccessLogSamplerResources_zh_TW.properties | 4 +-
.../protocol/http/sampler/HTTPAbstractImpl.java | 48 ++---
.../jmeter/protocol/http/sampler/HTTPFileImpl.java | 2 +-
.../jmeter/protocol/http/sampler/HTTPHC4Impl.java | 170 ++++++++---------
.../protocol/http/sampler/HTTPHCAbstractImpl.java | 26 +--
.../jmeter/protocol/http/sampler/HTTPJavaImpl.java | 20 +-
.../protocol/http/sampler/HTTPSampleResult.java | 6 +-
.../jmeter/protocol/http/sampler/HTTPSampler.java | 2 +-
.../protocol/http/sampler/HTTPSamplerBase.java | 52 +++---
.../http/sampler/HTTPSamplerBaseConverter.java | 4 +-
.../protocol/http/sampler/HTTPSamplerFactory.java | 2 +-
.../protocol/http/sampler/HTTPSamplerProxy.java | 10 +-
.../http/sampler/HttpClientDefaultParameters.java | 8 +-
.../jmeter/protocol/http/sampler/HttpWebdav.java | 6 +-
.../jmeter/protocol/http/sampler/PostWriter.java | 4 +-
.../protocol/http/sampler/ResourcesDownloader.java | 68 +++----
.../http/sampler/hc/LaxDeflateInputStream.java | 12 +-
.../http/sampler/hc/LaxGZIPInputStream.java | 12 +-
.../hc/LazyLayeredConnectionSocketFactory.java | 16 +-
.../jmeter/protocol/http/util/ConversionUtils.java | 16 +-
.../util/DirectAccessByteArrayOutputStream.java | 6 +-
.../jmeter/protocol/http/util/HTTPArgument.java | 6 +-
.../jmeter/protocol/http/util/HTTPConstants.java | 2 +-
.../jmeter/protocol/http/util/HTTPFileArg.java | 2 +-
.../protocol/http/util/HTTPResultConverter.java | 2 +-
.../util/SlowHCPlainConnectionSocketFactory.java | 4 +-
.../util/accesslog/OrderPreservingLogParser.java | 4 +-
.../http/util/accesslog/SessionFilter.java | 2 +-
.../protocol/http/util/accesslog/TCLogParser.java | 4 +-
.../protocol/http/visualizers/RequestViewHTTP.java | 40 ++--
.../protocol/java/config/gui/JavaConfigGui.java | 6 +-
.../java/sampler/AbstractJavaSamplerClient.java | 2 +-
.../jmeter/protocol/java/sampler/BSFSampler.java | 6 +-
.../java/sampler/BSFSamplerResources.properties | 4 +-
.../java/sampler/BSFSamplerResources_fr.properties | 8 +-
.../protocol/java/sampler/BeanShellSampler.java | 4 +-
.../protocol/java/sampler/JSR223Sampler.java | 2 +-
.../java/sampler/JSR223SamplerResources.properties | 4 +-
.../sampler/JSR223SamplerResources_fr.properties | 10 +-
.../jmeter/protocol/java/sampler/JavaSampler.java | 14 +-
.../protocol/java/sampler/JavaSamplerContext.java | 10 +-
.../protocol/jdbc/AbstractJDBCTestElement.java | 20 +-
.../jdbc/JDBCTestElementBeanInfoSupport.java | 4 +-
.../protocol/jdbc/config/DataSourceElement.java | 14 +-
.../jdbc/config/DataSourceElementBeanInfo.java | 6 +-
.../config/DataSourceElementResources.properties | 6 +-
.../DataSourceElementResources_es.properties | 4 +-
.../DataSourceElementResources_fr.properties | 26 +--
.../DataSourceElementResources_pt_BR.properties | 4 +-
.../DataSourceElementResources_tr.properties | 4 +-
.../DataSourceElementResources_zh_TW.properties | 4 +-
.../jdbc/processor/AbstractJDBCProcessor.java | 2 +-
.../protocol/jdbc/processor/JDBCPostProcessor.java | 2 +-
.../JDBCPostProcessorResources.properties | 4 +-
.../JDBCPostProcessorResources_fr.properties | 20 +-
.../protocol/jdbc/processor/JDBCPreProcessor.java | 2 +-
.../processor/JDBCPreProcessorResources.properties | 4 +-
.../JDBCPreProcessorResources_fr.properties | 20 +-
.../jmeter/protocol/jdbc/sampler/JDBCSampler.java | 4 +-
.../jdbc/sampler/JDBCSamplerResources.properties | 4 +-
.../sampler/JDBCSamplerResources_es.properties | 4 +-
.../sampler/JDBCSamplerResources_fr.properties | 18 +-
.../sampler/JDBCSamplerResources_pt_BR.properties | 4 +-
.../sampler/JDBCSamplerResources_tr.properties | 4 +-
.../sampler/JDBCSamplerResources_zh_TW.properties | 4 +-
.../jms/org/apache/jmeter/protocol/jms/Utils.java | 12 +-
.../jmeter/protocol/jms/client/ClientPool.java | 4 +-
.../protocol/jms/client/InitialContextFactory.java | 10 +-
.../jmeter/protocol/jms/client/Publisher.java | 26 +--
.../protocol/jms/client/ReceiveSubscriber.java | 56 +++---
.../jms/control/gui/JMSPropertiesPanel.java | 10 +-
.../protocol/jms/control/gui/JMSPublisherGui.java | 14 +-
.../protocol/jms/control/gui/JMSSamplerGui.java | 8 +-
.../protocol/jms/control/gui/JMSSubscriberGui.java | 18 +-
.../protocol/jms/sampler/BaseJMSSampler.java | 4 +-
.../protocol/jms/sampler/FixedQueueExecutor.java | 14 +-
.../jmeter/protocol/jms/sampler/JMSProperties.java | 2 +-
.../jmeter/protocol/jms/sampler/JMSProperty.java | 8 +-
.../jmeter/protocol/jms/sampler/JMSSampler.java | 34 ++--
.../jmeter/protocol/jms/sampler/MessageAdmin.java | 20 +-
.../protocol/jms/sampler/PublisherSampler.java | 14 +-
.../jmeter/protocol/jms/sampler/QueueExecutor.java | 6 +-
.../jmeter/protocol/jms/sampler/Receiver.java | 4 +-
.../protocol/jms/sampler/SubscriberSampler.java | 56 +++---
.../jms/sampler/TemporaryQueueExecutor.java | 10 +-
.../jms/sampler/render/MessageRenderer.java | 4 +-
.../protocol/ldap/config/gui/LdapConfigGui.java | 2 +-
.../protocol/ldap/config/gui/LdapExtConfigGui.java | 12 +-
.../protocol/ldap/sampler/LDAPExtSampler.java | 8 +-
.../jmeter/protocol/ldap/sampler/LDAPSampler.java | 4 +-
.../jmeter/protocol/ldap/sampler/LdapClient.java | 2 +-
.../protocol/ldap/sampler/LdapExtClient.java | 30 +--
.../protocol/mail/sampler/MailFileMessage.java | 2 +-
.../protocol/mail/sampler/MailReaderSampler.java | 2 +-
.../mail/sampler/gui/MailReaderSamplerGui.java | 12 +-
.../jmeter/protocol/smtp/sampler/SmtpSampler.java | 2 +-
.../protocol/smtp/sampler/gui/SmtpPanel.java | 18 +-
.../protocol/smtp/sampler/gui/SmtpSamplerGui.java | 4 +-
.../smtp/sampler/protocol/SendMailCommand.java | 16 +-
.../protocol/SynchronousTransportListener.java | 4 +-
.../sampler/protocol/TrustAllSSLSocketFactory.java | 2 +-
.../protocol/mongodb/config/MongoDBHolder.java | 2 +-
.../mongodb/config/MongoSourceElement.java | 6 +-
.../config/MongoSourceElementResources.properties | 6 +-
.../MongoSourceElementResources_fr.properties | 34 ++--
.../jmeter/protocol/mongodb/mongo/MongoDB.java | 2 +-
.../mongodb/sampler/MongoScriptRunner.java | 4 +-
.../sampler/MongoScriptSamplerBeanInfo.java | 2 +-
.../sampler/MongoScriptSamplerResources.properties | 6 +-
.../MongoScriptSamplerResources_fr.properties | 16 +-
.../jmeter/protocol/system/SystemSampler.java | 50 ++---
.../protocol/system/gui/SystemSamplerGui.java | 20 +-
.../protocol/tcp/config/gui/TCPConfigGui.java | 10 +-
.../protocol/tcp/sampler/BinaryTCPClientImpl.java | 2 +-
.../sampler/LengthPrefixedBinaryTCPClientImpl.java | 8 +-
.../jmeter/protocol/tcp/sampler/TCPClient.java | 4 +-
.../jmeter/protocol/tcp/sampler/TCPClientImpl.java | 4 +-
.../jmeter/protocol/tcp/sampler/TCPSampler.java | 22 +--
.../dashboard/reportgenerator_test.properties | 6 +-
.../apache/commons/cli/avalon/ClutilTestCase.java | 46 ++---
test/src/org/apache/jmeter/JMeterTest.java | 2 +-
.../jmeter/assertions/DurationAssertionTest.java | 8 +-
.../jmeter/assertions/ResponseAssertionTest.java | 78 ++++----
.../jmeter/assertions/SMIMEAssertionTest.java | 24 +--
.../jmeter/assertions/SizeAssertionTest.java | 2 +-
.../jmeter/assertions/XMLSchemaAssertionTest.java | 2 +-
.../jmeter/assertions/XPath2AssertionTest.java | 10 +-
.../jmeter/assertions/XPathAssertionTest.java | 28 +--
.../apache/jmeter/assertions/XmlAssertionTest.java | 6 +-
.../jmeter/config/TestRandomVariableConfig.java | 6 +-
.../jmeter/config/gui/TestArgumentsPanel.java | 8 +-
.../jmeter/control/TestGenericController.java | 2 +-
.../apache/jmeter/control/TestIfController.java | 12 +-
.../jmeter/control/TestInterleaveControl.java | 2 +-
.../apache/jmeter/control/TestLoopController.java | 10 +-
.../jmeter/control/TestOnceOnlyController.java | 18 +-
.../jmeter/control/TestRandomController.java | 4 +-
.../jmeter/control/TestSwitchController.java | 16 +-
.../apache/jmeter/control/TestWhileController.java | 6 +-
.../jmeter/control/ThroughputControllerSpec.groovy | 2 +-
.../apache/jmeter/curl/BasicCurlParserTest.java | 16 +-
.../org/apache/jmeter/engine/LocalHostTest.java | 4 +-
.../org/apache/jmeter/engine/TestTreeCloner.java | 4 +-
.../jmeter/engine/util/TestValueReplacer.java | 4 +-
.../jmeter/extractor/BoundaryExtractorSpec.groovy | 2 +-
.../jmeter/extractor/TestHtmlExtractorJSoup.java | 24 +--
.../jmeter/extractor/TestHtmlExtractorJodd.java | 2 +-
.../jmeter/extractor/TestJSONPostProcessor.java | 6 +-
.../jmeter/extractor/TestRegexExtractor.java | 8 +-
.../jmeter/extractor/TestXPath2Extractor.java | 2 +-
.../jmeter/extractor/TestXPathExtractor.java | 36 ++--
.../json/render/RenderAsJsonRendererSpec.groovy | 14 +-
.../jmeter/functions/CSVReadFunctionTest.java | 16 +-
.../functions/ComponentReferenceFunctionTest.java | 28 +--
.../apache/jmeter/functions/EvalFunctionTest.java | 12 +-
.../jmeter/functions/FunctionTestHelper.java | 2 +-
.../org/apache/jmeter/functions/PackageTest.java | 22 +--
.../jmeter/functions/RandomFunctionTest.java | 18 +-
.../apache/jmeter/functions/SplitFunctionTest.java | 12 +-
.../functions/StringFromFileFunctionTest.java | 4 +-
.../apache/jmeter/functions/SumFunctionTest.java | 2 +-
.../functions/TestDateTimeConvertFunction.java | 6 +-
.../jmeter/functions/TestDigestFunction.java | 28 +--
.../jmeter/functions/TestEscapeOroRegexpChars.java | 8 +-
.../jmeter/functions/TestFileRowColContainer.java | 4 +-
.../apache/jmeter/functions/TestFileToString.java | 12 +-
.../jmeter/functions/TestGroovyFunction.java | 10 +-
.../apache/jmeter/functions/TestIsPropDefined.java | 4 +-
.../apache/jmeter/functions/TestIsVarDefined.java | 6 +-
.../jmeter/functions/TestJavascriptFunction.java | 8 +-
.../functions/TestJavascriptFunctionWithRhino.java | 6 +-
.../apache/jmeter/functions/TestJexl2Function.java | 4 +-
.../apache/jmeter/functions/TestJexl3Function.java | 2 +-
.../apache/jmeter/functions/TestMachineIPName.java | 8 +-
.../functions/TestRandomFromMultipleVars.java | 18 +-
.../apache/jmeter/functions/TestRegexFunction.java | 10 +-
.../jmeter/functions/TestSamplerNameFunction.java | 6 +-
.../apache/jmeter/functions/TestSetProperty.java | 4 +-
.../jmeter/functions/TestSimpleFunctions.java | 2 +-
.../apache/jmeter/functions/TestStringtoFile.java | 8 +-
.../apache/jmeter/functions/TestTimeFunction.java | 18 +-
.../functions/TestTimeRandomDateFunction.java | 16 +-
.../jmeter/functions/TestTimeShiftFunction.java | 20 +-
.../jmeter/functions/TestUrlEncodeDecode.java | 4 +-
.../org/apache/jmeter/functions/VariableTest.java | 28 +--
.../gui/action/HtmlReportGeneratorSpec.groovy | 12 +-
.../src/org/apache/jmeter/gui/action/TestLoad.java | 16 +-
.../src/org/apache/jmeter/gui/action/TestSave.java | 2 +-
.../gui/action/template/TestTemplateManager.java | 8 +-
.../gui/logging/TestGuiLogEventAppender.java | 2 +-
.../jmeter/gui/util/JSyntaxTextAreaTest.java | 4 +-
test/src/org/apache/jmeter/junit/JMeterTest.java | 46 ++---
.../org/apache/jmeter/junit/JMeterTestCase.java | 4 +-
.../apache/jmeter/junit/JMeterTestCaseJUnit.java | 4 +-
.../org/apache/jmeter/junit/JMeterTestUtils.java | 2 +-
.../junit/categories/ExcludeCategoryFilter.java | 8 +-
.../jmeter/junit/categories/NeedGuiTests.java | 2 +-
.../apache/jmeter/junit/spock/JMeterSpec.groovy | 2 +-
.../org/apache/jmeter/junit/stubs/TestSampler.java | 2 +-
.../apache/jmeter/listeners/TestResultAction.java | 10 +-
.../http/config/MultipartUrlConfigTest.java | 2 +-
.../jmeter/protocol/http/config/UrlConfigTest.java | 2 +-
.../http/control/DNSCacheManagerSpec.groovy | 2 +-
.../protocol/http/control/TestAuthManager.java | 2 +-
.../http/control/TestCacheManagerBase.java | 6 +-
.../protocol/http/control/TestCacheManagerHC4.java | 10 +-
.../control/TestCacheManagerUrlConnection.java | 4 +-
.../http/control/TestHC4CookieManager.java | 102 +++++------
.../http/control/TestHTTPMirrorThread.java | 2 +-
.../http/control/gui/TestHttpTestSampleGui.java | 2 +-
.../protocol/http/modifier/TestAnchorModifier.java | 10 +-
.../http/modifier/TestURLRewritingModifier.java | 32 ++--
.../jmeter/protocol/http/parser/TestCssParser.java | 6 +-
.../protocol/http/parser/TestHTMLParser.java | 22 +--
.../protocol/http/parser/TestHtmlParsingUtils.java | 16 +-
.../protocol/http/proxy/TestHttpRequestHdr.java | 80 ++++----
.../protocol/http/proxy/TestProxyControl.java | 50 ++---
.../protocol/http/sampler/HTTPNullSampler.java | 4 +-
.../jmeter/protocol/http/sampler/HTTPSampler3.java | 2 +-
.../jmeter/protocol/http/sampler/PackageTest.java | 2 +-
.../protocol/http/sampler/PostWriterTest.java | 204 ++++++++++-----------
.../protocol/http/sampler/SamplingNamingTest.java | 8 +-
.../protocol/http/sampler/TestHTTPSamplers.java | 16 +-
.../TestHTTPSamplersAgainstHttpMirrorServer.java | 100 +++++-----
.../http/sampler/TestSerializedHTTPSampler.java | 2 +-
.../protocol/http/util/TestHTTPArgument.java | 12 +-
.../protocol/http/util/TestHTTPFileArgs.java | 2 +-
.../http/util/accesslog/TestLogFilter.java | 2 +-
.../http/util/accesslog/TestTCLogParser.java | 2 +-
.../http/visualizers/RequestViewHTTPTest.java | 106 +++++------
.../protocol/jms/sampler/PublisherSamplerTest.java | 2 +-
.../protocol/ldap/config/gui/PackageTest.java | 6 +-
.../tcp/sampler/BinaryTCPClientImplTest.java | 8 +-
.../LengthPrefixedBinaryTCPClientImplTest.java | 2 +-
.../tcp/sampler/TCPClientDecoratorTest.java | 22 +--
.../report/dashboard/ApdexPerTransactionTest.java | 38 ++--
.../report/dashboard/ReportGeneratorSpec.groovy | 8 +-
.../processor/ErrorsSummaryConsumerTest.java | 16 +-
.../graph/impl/CustomGraphConsumerTest.java | 40 ++--
...TimePercentilesOverTimeGraphConsumerSpec.groovy | 2 +-
.../apache/jmeter/reporters/TestResultSaver.java | 18 +-
.../org/apache/jmeter/resources/PackageTest.java | 32 ++--
.../jmeter/resources/TestPropertiesFiles.java | 2 +-
.../org/apache/jmeter/samplers/NullSampler.java | 4 +-
.../apache/jmeter/samplers/TestSampleResult.java | 6 +-
.../samplers/TestSampleSaveConfiguration.java | 16 +-
.../org/apache/jmeter/save/TestCSVSaveService.java | 22 +--
.../org/apache/jmeter/save/TestSaveService.java | 18 +-
.../apache/jmeter/testbeans/gui/PackageTest.java | 8 +-
.../testbeans/gui/TestBooleanPropertyEditor.java | 6 +-
.../org/apache/jmeter/testelement/PackageTest.java | 2 +-
.../apache/jmeter/testelement/TestElementTest.java | 18 +-
.../jmeter/testelement/TestHeaderManager.java | 14 +-
.../jmeter/testelement/TestNumberProperty.java | 2 +-
.../testelement/property/MapPropertyTest.java | 2 +-
.../jmeter/testelement/property/PackageTest.java | 2 +-
.../jmeter/threads/TestJMeterContextService.java | 4 +-
.../apache/jmeter/threads/TestJMeterThread.java | 6 +-
.../apache/jmeter/threads/TestTestCompiler.java | 2 +-
.../jmeter/timers/ConstantThroughputTimerTest.java | 26 +--
test/src/org/apache/jmeter/util/PackageTest.java | 4 +-
.../apache/jmeter/util/StringUtilitiesTest.java | 4 +-
.../org/apache/jmeter/util/TestJMeterUtils.java | 6 +-
test/src/org/apache/jmeter/util/XPathUtilTest.java | 18 +-
.../jmeter/visualizers/TestRenderAsJson.java | 2 +-
.../visualizers/TestSamplingStatCalculator.java | 2 +-
test/src/org/apache/jorphan/TestFunctorUsers.java | 16 +-
test/src/org/apache/jorphan/TestXMLBuffer.java | 4 +-
.../apache/jorphan/collections/PackageTest.java | 2 +-
.../org/apache/jorphan/exec/TestKeyToolUtils.java | 6 +-
test/src/org/apache/jorphan/io/TextFileSpec.groovy | 8 +-
.../apache/jorphan/math/TestStatCalculator.java | 18 +-
.../org/apache/jorphan/reflect/TestClassTools.java | 8 +-
.../org/apache/jorphan/reflect/TestFunctor.java | 30 +--
.../org/apache/jorphan/test/JMeterSerialTest.java | 2 +-
.../src/org/apache/jorphan/util/TestConverter.java | 2 +-
.../org/apache/jorphan/util/TestJorphanUtils.java | 26 +--
xdocs/velocity.properties | 4 +-
999 files changed, 5221 insertions(+), 5217 deletions(-)
