From f6dafdf60d669a815ae677f9a87fcafd28c6197c Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Sat, 2 Mar 2019 10:57:08 +0300 Subject: [PATCH 1/7] Move source files to new layout Former-commit-id: 6a199bf495bfece845b42bc304f4b5eee5f0bd5b --- .../apache/jmeter/util/BeanShellClient.java | 0 .../jmeter/assertions/BSFAssertion.java | 0 .../assertions/BSFAssertionBeanInfo.java | 0 .../jmeter/assertions/BeanShellAssertion.java | 0 .../jmeter/assertions/CompareAssertion.java | 0 .../assertions/CompareAssertionBeanInfo.java | 0 .../jmeter/assertions/DurationAssertion.java | 0 .../jmeter/assertions/HTMLAssertion.java | 0 .../jmeter/assertions/JSONPathAssertion.java | 0 .../jmeter/assertions/JSR223Assertion.java | 0 .../assertions/JSR223AssertionBeanInfo.java | 0 .../jmeter/assertions/LogErrorHandler.java | 0 .../jmeter/assertions/MD5HexAssertion.java | 0 .../jmeter/assertions/ResponseAssertion.java | 0 .../jmeter/assertions/SMIMEAssertion.java | 0 .../assertions/SMIMEAssertionTestElement.java | 0 .../jmeter/assertions/SizeAssertion.java | 0 .../assertions/SubstitutionElement.java | 0 .../jmeter/assertions/XMLAssertion.java | 0 .../jmeter/assertions/XMLSchemaAssertion.java | 0 .../jmeter/assertions/XPath2Assertion.java | 0 .../jmeter/assertions/XPathAssertion.java | 0 .../jmeter/assertions/gui/AssertionGui.java | 0 .../assertions/gui/BeanShellAssertionGui.java | 0 .../assertions/gui/DurationAssertionGui.java | 0 .../assertions/gui/HTMLAssertionGui.java | 0 .../assertions/gui/JSONPathAssertionGui.java | 0 .../assertions/gui/MD5HexAssertionGUI.java | 0 .../assertions/gui/SMIMEAssertionGui.java | 0 .../assertions/gui/SizeAssertionGui.java | 0 .../assertions/gui/XMLAssertionGui.java | 0 .../jmeter/assertions/gui/XMLConfPanel.java | 0 .../assertions/gui/XMLSchemaAssertionGUI.java | 0 .../assertions/gui/XPath2AssertionGui.java | 0 .../jmeter/assertions/gui/XPath2Panel.java | 0 .../assertions/gui/XPathAssertionGui.java | 0 .../jmeter/assertions/gui/XPathPanel.java | 0 .../org/apache/jmeter/config/CSVDataSet.java | 0 .../jmeter/config/CSVDataSetBeanInfo.java | 0 .../apache/jmeter/config/KeystoreConfig.java | 0 .../jmeter/config/KeystoreConfigBeanInfo.java | 0 .../jmeter/config/RandomVariableConfig.java | 0 .../config/RandomVariableConfigBeanInfo.java | 0 .../control/CriticalSectionController.java | 0 .../jmeter/control/ForeachController.java | 0 .../jmeter/control/IncludeController.java | 0 .../jmeter/control/InterleaveControl.java | 0 .../jmeter/control/ModuleController.java | 0 .../jmeter/control/OnceOnlyController.java | 0 .../jmeter/control/RandomController.java | 0 .../jmeter/control/RandomOrderController.java | 0 .../jmeter/control/SwitchController.java | 0 .../jmeter/control/ThroughputController.java | 0 .../gui/CriticalSectionControllerGui.java | 0 .../control/gui/ForeachControlPanel.java | 0 .../control/gui/IncludeControllerGui.java | 0 .../control/gui/InterleaveControlGui.java | 0 .../control/gui/ModuleControllerGui.java | 0 .../control/gui/OnceOnlyControllerGui.java | 0 .../jmeter/control/gui/RandomControlGui.java | 0 .../control/gui/RandomOrderControllerGui.java | 0 .../control/gui/SwitchControllerGui.java | 0 .../control/gui/ThroughputControllerGui.java | 0 .../jmeter/control/gui/TreeNodeWrapper.java | 0 .../jmeter/extractor/BSFPostProcessor.java | 0 .../extractor/BSFPostProcessorBeanInfo.java | 0 .../extractor/BeanShellPostProcessor.java | 0 .../BeanShellPostProcessorBeanInfo.java | 0 .../jmeter/extractor/BoundaryExtractor.java | 0 .../jmeter/extractor/DebugPostProcessor.java | 0 .../extractor/DebugPostProcessorBeanInfo.java | 0 .../apache/jmeter/extractor/Extractor.java | 0 .../jmeter/extractor/HtmlExtractor.java | 0 .../jmeter/extractor/JSR223PostProcessor.java | 0 .../JSR223PostProcessorBeanInfo.java | 0 .../jmeter/extractor/JSoupExtractor.java | 0 .../jmeter/extractor/JoddExtractor.java | 0 .../jmeter/extractor/RegexExtractor.java | 0 .../jmeter/extractor/XPath2Extractor.java | 0 .../jmeter/extractor/XPathExtractor.java | 0 .../extractor/gui/BoundaryExtractorGui.java | 0 .../extractor/gui/HtmlExtractorGui.java | 0 .../extractor/gui/RegexExtractorGui.java | 0 .../extractor/gui/XPath2ExtractorGui.java | 0 .../extractor/gui/XPathExtractorGui.java | 0 .../extractor/json/jsonpath/JSONManager.java | 0 .../json/jsonpath/JSONPostProcessor.java | 0 .../jsonpath/gui/JSONPostProcessorGui.java | 0 .../json/render/RenderAsJsonRenderer.java | 0 .../ExportTransactionAndSamplerNames.java | 0 .../jmeter/modifiers/BSFPreProcessor.java | 0 .../modifiers/BSFPreProcessorBeanInfo.java | 0 .../modifiers/BeanShellPreProcessor.java | 0 .../BeanShellPreProcessorBeanInfo.java | 0 .../jmeter/modifiers/CounterConfig.java | 0 .../jmeter/modifiers/JSR223PreProcessor.java | 0 .../modifiers/JSR223PreProcessorBeanInfo.java | 0 .../jmeter/modifiers/SampleTimeout.java | 0 .../jmeter/modifiers/UserParameters.java | 0 .../modifiers/gui/CounterConfigGui.java | 0 .../modifiers/gui/SampleTimeoutGui.java | 0 .../modifiers/gui/UserParametersGui.java | 0 .../apache/jmeter/reporters/MailerModel.java | 0 .../reporters/MailerResultCollector.java | 0 .../apache/jmeter/sampler/DebugSampler.java | 0 .../jmeter/sampler/DebugSamplerBeanInfo.java | 0 .../org/apache/jmeter/sampler/TestAction.java | 0 .../jmeter/sampler/gui/TestActionGui.java | 0 .../thinktime/DefaultThinkTimeCreator.java | 0 .../org/apache/jmeter/timers/BSFTimer.java | 0 .../jmeter/timers/BSFTimerBeanInfo.java | 0 .../apache/jmeter/timers/BeanShellTimer.java | 0 .../jmeter/timers/BeanShellTimerBeanInfo.java | 0 .../timers/ConstantThroughputTimer.java | 0 .../ConstantThroughputTimerBeanInfo.java | 0 .../apache/jmeter/timers/ConstantTimer.java | 0 .../jmeter/timers/GaussianRandomTimer.java | 0 .../org/apache/jmeter/timers/JSR223Timer.java | 0 .../jmeter/timers/JSR223TimerBeanInfo.java | 0 .../jmeter/timers/PoissonRandomTimer.java | 0 .../org/apache/jmeter/timers/RandomTimer.java | 0 .../org/apache/jmeter/timers/SyncTimer.java | 0 .../jmeter/timers/SyncTimerBeanInfo.java | 0 .../jmeter/timers/UniformRandomTimer.java | 0 .../timers/gui/AbstractRandomTimerGui.java | 0 .../jmeter/timers/gui/ConstantTimerGui.java | 0 .../timers/gui/GaussianRandomTimerGui.java | 0 .../timers/gui/PoissonRandomTimerGui.java | 0 .../timers/gui/UniformRandomTimerGui.java | 0 .../ConstantPoissonProcessGenerator.java | 0 .../poissonarrivals/DurationProvider.java | 0 .../timers/poissonarrivals/EventProducer.java | 0 .../PreciseThroughputTimer.java | 0 .../PreciseThroughputTimerBeanInfo.java | 0 .../poissonarrivals/ThroughputProvider.java | 0 .../ComponentTreeClonerForValidation.java | 0 .../jmeter/visualizers/AccumListener.java | 0 .../visualizers/AssertionVisualizer.java | 0 .../apache/jmeter/visualizers/AxisGraph.java | 0 .../jmeter/visualizers/BSFListener.java | 0 .../visualizers/BSFListenerBeanInfo.java | 0 .../apache/jmeter/visualizers/BarGraph.java | 0 .../jmeter/visualizers/BeanShellListener.java | 0 .../BeanShellListenerBeanInfo.java | 0 .../visualizers/ComparisonVisualizer.java | 0 .../org/apache/jmeter/visualizers/Graph.java | 0 .../jmeter/visualizers/GraphListener.java | 0 .../jmeter/visualizers/GraphVisualizer.java | 0 .../jmeter/visualizers/JSR223Listener.java | 0 .../visualizers/JSR223ListenerBeanInfo.java | 0 .../apache/jmeter/visualizers/LineGraph.java | 0 .../jmeter/visualizers/MailerVisualizer.java | 0 .../visualizers/PropertyControlGui.java | 0 .../RenderAsBoundaryExtractor.java | 0 .../jmeter/visualizers/RenderAsCssJQuery.java | 0 .../jmeter/visualizers/RenderAsDocument.java | 0 .../jmeter/visualizers/RenderAsHTML.java | 0 .../visualizers/RenderAsHTMLFormatted.java | 0 .../visualizers/RenderAsHTMLWithEmbedded.java | 0 .../jmeter/visualizers/RenderAsJSON.java | 0 .../jmeter/visualizers/RenderAsRegexp.java | 0 .../jmeter/visualizers/RenderAsText.java | 0 .../jmeter/visualizers/RenderAsXML.java | 0 .../jmeter/visualizers/RenderAsXPath.java | 0 .../jmeter/visualizers/RenderAsXPath2.java | 0 .../jmeter/visualizers/RenderInBrowser.java | 0 .../jmeter/visualizers/RequestPanel.java | 0 .../jmeter/visualizers/RequestView.java | 0 .../jmeter/visualizers/RequestViewRaw.java | 0 .../visualizers/RespTimeGraphChart.java | 0 .../visualizers/RespTimeGraphDataBean.java | 0 .../visualizers/RespTimeGraphLineBean.java | 0 .../visualizers/RespTimeGraphVisualizer.java | 0 .../jmeter/visualizers/ResultRenderer.java | 0 .../jmeter/visualizers/SamplerResultTab.java | 0 .../visualizers/SearchTextExtension.java | 0 .../jmeter/visualizers/SearchTreePanel.java | 0 .../visualizers/SearchableTreeNode.java | 0 .../jmeter/visualizers/SimpleDataWriter.java | 0 .../visualizers/StatGraphProperties.java | 0 .../visualizers/StatGraphVisualizer.java | 0 .../jmeter/visualizers/StatVisualizer.java | 0 .../jmeter/visualizers/SummaryReport.java | 0 .../jmeter/visualizers/TableVisualizer.java | 0 .../jmeter/visualizers/TreeNodeRenderer.java | 0 .../ViewResultsFullVisualizer.java | 0 .../XMLDefaultMutableTreeNode.java | 0 .../AbstractBackendListenerClient.java | 0 .../visualizers/backend/BackendListener.java | 0 .../backend/BackendListenerClient.java | 0 .../backend/BackendListenerContext.java | 0 .../backend/BackendListenerGui.java | 0 .../visualizers/backend/ErrorMetric.java | 0 .../visualizers/backend/SamplerMetric.java | 0 .../visualizers/backend/UserMetric.java | 0 .../visualizers/backend/WindowMode.java | 0 .../AbstractGraphiteMetricsSender.java | 0 .../GraphiteBackendListenerClient.java | 0 .../graphite/GraphiteMetricsSender.java | 0 .../graphite/PickleGraphiteMetricsSender.java | 0 .../graphite/SocketConnectionInfos.java | 0 .../backend/graphite/SocketOutputStream.java | 0 .../SocketOutputStreamPoolFactory.java | 0 .../graphite/TextGraphiteMetricsSender.java | 0 .../AbstractInfluxdbMetricsSender.java | 0 .../backend/influxdb/HttpMetricsSender.java | 0 .../InfluxdbBackendListenerClient.java | 0 .../influxdb/InfluxdbMetricsSender.java | 0 .../backend/influxdb/UdpMetricsSender.java | 0 .../jmeter/visualizers/utils/Colors.java | 0 .../BSFAssertionResources.properties | 0 .../BSFAssertionResources_fr.properties | 0 .../BSFAssertionResources_pl.properties | 0 .../BSFAssertionResources_pt_BR.properties | 0 .../BSFAssertionResources_zh_CN.properties | 0 .../CompareAssertionResources.properties | 0 .../CompareAssertionResources_fr.properties | 0 ...CompareAssertionResources_zh_CN.properties | 0 .../JSR223AssertionResources.properties | 0 .../JSR223AssertionResources_fr.properties | 0 .../JSR223AssertionResources_zh_CN.properties | 0 .../org/apache/jmeter/assertions/package.html | 0 .../config/CSVDataSetResources.properties | 0 .../config/CSVDataSetResources_de.properties | 0 .../config/CSVDataSetResources_es.properties | 0 .../config/CSVDataSetResources_fr.properties | 0 .../config/CSVDataSetResources_pl.properties | 0 .../CSVDataSetResources_pt_BR.properties | 0 .../config/CSVDataSetResources_tr.properties | 0 .../CSVDataSetResources_zh_CN.properties | 0 .../CSVDataSetResources_zh_TW.properties | 0 .../config/KeystoreConfigResources.properties | 0 .../KeystoreConfigResources_fr.properties | 0 .../KeystoreConfigResources_zh_CN.properties | 0 .../RandomVariableConfigResources.properties | 0 ...andomVariableConfigResources_es.properties | 0 ...andomVariableConfigResources_fr.properties | 0 ...andomVariableConfigResources_pl.properties | 0 ...omVariableConfigResources_pt_BR.properties | 0 ...omVariableConfigResources_zh_CN.properties | 0 .../BSFPostProcessorResources.properties | 0 .../BSFPostProcessorResources_fr.properties | 0 .../BSFPostProcessorResources_pl.properties | 0 ...BSFPostProcessorResources_pt_BR.properties | 0 ...BSFPostProcessorResources_zh_CN.properties | 0 ...BeanShellPostProcessorResources.properties | 0 ...nShellPostProcessorResources_de.properties | 0 ...nShellPostProcessorResources_fr.properties | 0 ...nShellPostProcessorResources_pl.properties | 0 ...ellPostProcessorResources_pt_BR.properties | 0 ...nShellPostProcessorResources_tr.properties | 0 ...ellPostProcessorResources_zh_CN.properties | 0 .../DebugPostProcessorResources.properties | 0 .../DebugPostProcessorResources_de.properties | 0 .../DebugPostProcessorResources_fr.properties | 0 ...bugPostProcessorResources_pt_BR.properties | 0 .../DebugPostProcessorResources_tr.properties | 0 ...bugPostProcessorResources_zh_CN.properties | 0 .../JSR223PostProcessorResources.properties | 0 ...JSR223PostProcessorResources_fr.properties | 0 ...223PostProcessorResources_zh_CN.properties | 0 .../BSFPreProcessorResources.properties | 0 .../BSFPreProcessorResources_fr.properties | 0 .../BSFPreProcessorResources_pt_BR.properties | 0 .../BSFPreProcessorResources_zh_CN.properties | 0 .../BeanShellPreProcessorResources.properties | 0 ...anShellPreProcessorResources_de.properties | 0 ...anShellPreProcessorResources_fr.properties | 0 ...hellPreProcessorResources_pt_BR.properties | 0 ...anShellPreProcessorResources_tr.properties | 0 ...hellPreProcessorResources_zh_CN.properties | 0 .../JSR223PreProcessorResources.properties | 0 .../JSR223PreProcessorResources_fr.properties | 0 ...R223PreProcessorResources_zh_CN.properties | 0 .../sampler/DebugSamplerResources.properties | 0 .../DebugSamplerResources_de.properties | 0 .../DebugSamplerResources_fr.properties | 0 .../DebugSamplerResources_pt_BR.properties | 0 .../DebugSamplerResources_tr.properties | 0 .../DebugSamplerResources_zh_CN.properties | 0 .../timers/BSFTimerResources.properties | 0 .../timers/BSFTimerResources_fr.properties | 0 .../timers/BSFTimerResources_zh_CN.properties | 0 .../timers/BeanShellTimerResources.properties | 0 .../BeanShellTimerResources_de.properties | 0 .../BeanShellTimerResources_fr.properties | 0 .../BeanShellTimerResources_pt_BR.properties | 0 .../BeanShellTimerResources_tr.properties | 0 .../BeanShellTimerResources_zh_CN.properties | 0 ...onstantThroughputTimerResources.properties | 0 ...tantThroughputTimerResources_de.properties | 0 ...tantThroughputTimerResources_es.properties | 0 ...tantThroughputTimerResources_fr.properties | 0 ...tantThroughputTimerResources_ja.properties | 0 ...tThroughputTimerResources_pt_BR.properties | 0 ...tantThroughputTimerResources_tr.properties | 0 ...tThroughputTimerResources_zh_CN.properties | 0 ...tThroughputTimerResources_zh_TW.properties | 0 .../timers/JSR223TimerResources.properties | 0 .../timers/JSR223TimerResources_fr.properties | 0 .../JSR223TimerResources_zh_CN.properties | 0 .../timers/SyncTimerResources.properties | 0 .../timers/SyncTimerResources_de.properties | 0 .../timers/SyncTimerResources_es.properties | 0 .../timers/SyncTimerResources_fr.properties | 0 .../SyncTimerResources_pt_BR.properties | 0 .../timers/SyncTimerResources_tr.properties | 0 .../SyncTimerResources_zh_CN.properties | 0 ...PreciseThroughputTimerResources.properties | 0 ...ciseThroughputTimerResources_fr.properties | 0 ...eThroughputTimerResources_zh_CN.properties | 0 .../BSFListenerResources.properties | 0 .../BSFListenerResources_fr.properties | 0 .../BSFListenerResources_pt_BR.properties | 0 .../BSFListenerResources_zh_CN.properties | 0 .../BeanShellListenerResources.properties | 0 .../BeanShellListenerResources_de.properties | 0 .../BeanShellListenerResources_fr.properties | 0 ...eanShellListenerResources_pt_BR.properties | 0 .../BeanShellListenerResources_tr.properties | 0 ...eanShellListenerResources_zh_CN.properties | 0 .../JSR223ListenerResources.properties | 0 .../JSR223ListenerResources_fr.properties | 0 .../JSR223ListenerResources_zh_CN.properties | 0 .../visualizers/utils/colors.properties | 0 .../assertions/MD5HexAssertionSpec.groovy | 0 .../assertions/gui/AssertionGuiSpec.groovy | 0 .../control/RandomOrderControllerSpec.groovy | 0 .../apache/jmeter/control/RunTimeSpec.groovy | 0 .../control/ThroughputControllerSpec.groovy | 0 .../extractor/BoundaryExtractorSpec.groovy | 0 .../jmeter/extractor/JoddExtractorSpec.groovy | 0 .../render/RenderAsJsonRendererSpec.groovy | 0 .../timers/UniformRandomTimerSpec.groovy | 0 .../org/apache/jmeter/JMeterVersionTest.java | 0 .../assertions/DurationAssertionTest.java | 0 .../assertions/ResponseAssertionTest.java | 0 .../jmeter/assertions/SMIMEAssertionTest.java | 0 .../jmeter/assertions/SizeAssertionTest.java | 0 .../assertions/TestJSONPathAssertion.java | 0 .../assertions/TestJSONPathAssertionGui.java | 0 .../assertions/XMLSchemaAssertionTest.java | 0 .../assertions/XPath2AssertionTest.java | 19 +++ .../jmeter/assertions/XPathAssertionTest.java | 0 .../jmeter/assertions/XmlAssertionTest.java | 0 .../apache/jmeter/config/TestCVSDataSet.java | 0 .../config/TestRandomVariableConfig.java | 0 .../jmeter/config/gui/TestArgumentsPanel.java | 0 .../jmeter/control/TestGenericController.java | 0 .../jmeter/control/TestIfController.java | 0 .../jmeter/control/TestInterleaveControl.java | 0 .../jmeter/control/TestLoopController.java | 0 .../control/TestOnceOnlyController.java | 0 .../jmeter/control/TestRandomController.java | 0 .../control/TestTransactionController.java | 0 .../jmeter/control/TestWhileController.java | 0 .../extractor/TestHtmlExtractorJSoup.java | 0 .../extractor/TestHtmlExtractorJodd.java | 0 .../extractor/TestJSONPostProcessor.java | 0 .../jmeter/extractor/TestRegexExtractor.java | 0 .../jmeter/extractor/TestXPath2Extractor.java | 0 .../jmeter/extractor/TestXPathExtractor.java | 0 .../apache/jmeter/gui/action/TestSave.java | 0 .../action/template/TestTemplateManager.java | 0 .../jmeter/reporters/TestResultSaver.java | 0 .../timers/ConstantThroughputTimerTest.java | 0 .../apache/jmeter/timers/SyncTimerTest.java | 0 .../jmeter/timers/TimerServiceTest.java | 0 .../PreciseThroughputTimerTest.java | 0 .../jmeter/visualizers/TestRenderAsJson.java | 0 .../visualizers/TestSampleCompareTo.java | 0 .../TestSamplingStatCalculator.java | 0 .../backend/SamplerMetricFixedModeTest.java | 0 .../backend/SamplerMetricTimedModeTest.java | 0 .../org/apache/jmeter/assertions/email.pem | 0 .../apache/jmeter/assertions/signed_email.eml | 0 .../gui/action/template/invalidTemplates.xml | 0 .../gui/action/template/validTemplates.xml | 0 .../main/java}/org/apache/jmeter/JMeter.java | 3 +- .../org/apache/jmeter/ProxyAuthenticator.java | 0 .../java}/org/apache/jmeter/SplashScreen.java | 0 .../apache/jmeter/assertions/Assertion.java | 0 .../jmeter/assertions/AssertionResult.java | 0 .../assertions/CompareAssertionResult.java | 0 .../assertions/gui/AbstractAssertionGui.java | 0 .../org/apache/jmeter/config/Argument.java | 0 .../org/apache/jmeter/config/Arguments.java | 0 .../apache/jmeter/config/ConfigElement.java | 0 .../jmeter/config/ConfigTestElement.java | 0 .../org/apache/jmeter/config/LoginConfig.java | 0 .../jmeter/config/gui/AbstractConfigGui.java | 0 .../jmeter/config/gui/ArgumentsPanel.java | 0 .../jmeter/config/gui/LoginConfigGui.java | 0 .../apache/jmeter/config/gui/ObsoleteGui.java | 0 .../jmeter/config/gui/RowDetailDialog.java | 0 .../jmeter/config/gui/SimpleConfigGui.java | 0 .../org/apache/jmeter/control/Controller.java | 0 .../jmeter/control/GenericController.java | 0 .../apache/jmeter/control/IfController.java | 0 .../jmeter/control/IteratingController.java | 0 .../apache/jmeter/control/LoopController.java | 0 .../jmeter/control/NextIsNullException.java | 0 .../jmeter/control/ReplaceableController.java | 0 .../org/apache/jmeter/control/RunTime.java | 0 .../control/TestFragmentController.java | 0 .../jmeter/control/TransactionController.java | 0 .../jmeter/control/TransactionSampler.java | 0 .../jmeter/control/WhileController.java | 0 .../control/gui/AbstractControllerGui.java | 0 .../jmeter/control/gui/IfControllerPanel.java | 0 .../control/gui/LogicControllerGui.java | 0 .../jmeter/control/gui/LoopControlPanel.java | 0 .../apache/jmeter/control/gui/RunTimeGui.java | 0 .../gui/TestFragmentControllerGui.java | 0 .../jmeter/control/gui/TestPlanGui.java | 0 .../control/gui/TransactionControllerGui.java | 0 .../control/gui/WhileControllerGui.java | 0 .../jmeter/control/gui/WorkBenchGui.java | 0 .../jmeter/engine/ClientJMeterEngine.java | 0 .../jmeter/engine/ConvertListeners.java | 0 .../jmeter/engine/DistributedRunner.java | 0 .../apache/jmeter/engine/JMeterEngine.java | 0 .../jmeter/engine/JMeterEngineException.java | 0 .../org/apache/jmeter/engine/PreCompiler.java | 0 .../jmeter/engine/RemoteJMeterEngine.java | 0 .../jmeter/engine/RemoteJMeterEngineImpl.java | 0 .../jmeter/engine/StandardJMeterEngine.java | 0 .../org/apache/jmeter/engine/TreeCloner.java | 0 .../jmeter/engine/TreeClonerNoTimer.java | 0 .../apache/jmeter/engine/TurnElementsOn.java | 0 .../engine/event/LoopIterationEvent.java | 0 .../engine/event/LoopIterationListener.java | 0 .../apache/jmeter/engine/package-info.java | 0 .../engine/util/AbstractTransformer.java | 0 .../jmeter/engine/util/CompoundVariable.java | 0 .../util/ConfigMergabilityIndicator.java | 0 .../jmeter/engine/util/FunctionParser.java | 0 .../jmeter/engine/util/NoConfigMerge.java | 0 .../jmeter/engine/util/NoThreadClone.java | 0 .../util/ReplaceFunctionsWithStrings.java | 0 .../util/ReplaceStringWithFunctions.java | 0 .../jmeter/engine/util/SimpleVariable.java | 0 .../engine/util/UndoVariableReplacement.java | 0 .../jmeter/engine/util/ValueReplacer.java | 0 .../jmeter/engine/util/ValueTransformer.java | 0 .../IllegalUserActionException.java | 0 .../jmeter/functions/AbstractFunction.java | 0 .../org/apache/jmeter/functions/Function.java | 0 .../functions/InvalidVariableException.java | 0 .../jmeter/functions/gui/FunctionHelper.java | 0 .../gui/AbstractJMeterGuiComponent.java | 0 .../gui/AbstractScopedJMeterGuiComponent.java | 0 .../java}/org/apache/jmeter/gui/ClearGui.java | 0 .../org/apache/jmeter/gui/CommentPanel.java | 0 .../org/apache/jmeter/gui/GUIFactory.java | 0 .../apache/jmeter/gui/GUIMenuSortOrder.java | 0 .../apache/jmeter/gui/GlobalUndoableEdit.java | 0 .../org/apache/jmeter/gui/GuiPackage.java | 0 .../apache/jmeter/gui/HtmlReportAction.java | 0 .../org/apache/jmeter/gui/HtmlReportUI.java | 0 .../apache/jmeter/gui/JMeterFileFilter.java | 0 .../apache/jmeter/gui/JMeterGUIComponent.java | 0 .../org/apache/jmeter/gui/LoggerPanel.java | 0 .../org/apache/jmeter/gui/MainFrame.java | 0 .../org/apache/jmeter/gui/NamePanel.java | 0 .../org/apache/jmeter/gui/OnErrorPanel.java | 0 .../org/apache/jmeter/gui/Replaceable.java | 0 .../apache/jmeter/gui/SavePropertyDialog.java | 0 .../org/apache/jmeter/gui/Searchable.java | 0 .../org/apache/jmeter/gui/ServerPanel.java | 0 .../apache/jmeter/gui/SimpleCompoundEdit.java | 0 .../org/apache/jmeter/gui/Stoppable.java | 0 .../apache/jmeter/gui/TestPlanListener.java | 0 .../org/apache/jmeter/gui/TreeState.java | 0 .../org/apache/jmeter/gui/UndoHistory.java | 0 .../apache/jmeter/gui/UndoHistoryItem.java | 0 .../apache/jmeter/gui/UnsharedComponent.java | 0 .../jmeter/gui/action/AboutCommand.java | 0 .../jmeter/gui/action/AbstractAction.java | 0 .../AbstractActionWithNoRunningTest.java | 0 .../apache/jmeter/gui/action/ActionNames.java | 0 .../jmeter/gui/action/ActionRouter.java | 0 .../apache/jmeter/gui/action/AddParent.java | 0 .../action/AddThinkTimeBetweenEachStep.java | 0 .../apache/jmeter/gui/action/AddToTree.java | 0 .../gui/action/ApplyNamingConvention.java | 0 .../jmeter/gui/action/ChangeLanguage.java | 0 .../jmeter/gui/action/ChangeParent.java | 0 .../apache/jmeter/gui/action/CheckDirty.java | 0 .../org/apache/jmeter/gui/action/Clear.java | 0 .../org/apache/jmeter/gui/action/Close.java | 0 .../jmeter/gui/action/CollapseExpand.java | 0 .../gui/action/CollapseExpandTreeBranch.java | 0 .../org/apache/jmeter/gui/action/Command.java | 0 .../gui/action/CompileJSR223TestElements.java | 0 .../org/apache/jmeter/gui/action/Copy.java | 0 .../gui/action/CreateFunctionDialog.java | 0 .../org/apache/jmeter/gui/action/Cut.java | 0 .../apache/jmeter/gui/action/Duplicate.java | 0 .../apache/jmeter/gui/action/EditCommand.java | 0 .../jmeter/gui/action/EnableComponent.java | 0 .../apache/jmeter/gui/action/ExitCommand.java | 0 .../org/apache/jmeter/gui/action/Help.java | 0 .../gui/action/HtmlReportGenerator.java | 0 .../apache/jmeter/gui/action/KeyStrokes.java | 0 .../org/apache/jmeter/gui/action/Load.java | 0 .../jmeter/gui/action/LoadDraggedFile.java | 0 .../jmeter/gui/action/LoadRecentProject.java | 0 .../jmeter/gui/action/LogLevelCommand.java | 0 .../gui/action/LoggerPanelEnableDisable.java | 0 .../jmeter/gui/action/LookAndFeelCommand.java | 0 .../org/apache/jmeter/gui/action/Move.java | 0 .../jmeter/gui/action/OpenLinkAction.java | 0 .../org/apache/jmeter/gui/action/Paste.java | 0 .../jmeter/gui/action/RawTextSearcher.java | 0 .../jmeter/gui/action/RegexpSearcher.java | 0 .../apache/jmeter/gui/action/RemoteStart.java | 0 .../org/apache/jmeter/gui/action/Remove.java | 0 .../jmeter/gui/action/ResetSearchCommand.java | 0 .../org/apache/jmeter/gui/action/Restart.java | 0 .../jmeter/gui/action/RevertProject.java | 0 .../jmeter/gui/action/SSLManagerCommand.java | 0 .../org/apache/jmeter/gui/action/Save.java | 0 .../jmeter/gui/action/SaveBeforeRun.java | 0 .../jmeter/gui/action/SaveGraphics.java | 0 .../jmeter/gui/action/SchematicView.java | 0 .../jmeter/gui/action/SearchTreeCommand.java | 0 .../jmeter/gui/action/SearchTreeDialog.java | 0 .../apache/jmeter/gui/action/Searcher.java | 0 .../gui/action/SelectTemplatesDialog.java | 0 .../org/apache/jmeter/gui/action/Start.java | 0 .../jmeter/gui/action/StopStoppables.java | 0 .../jmeter/gui/action/TemplatesCommand.java | 0 .../gui/action/TreeNodeNamingPolicy.java | 0 .../apache/jmeter/gui/action/UndoCommand.java | 0 .../org/apache/jmeter/gui/action/What.java | 0 .../apache/jmeter/gui/action/ZoomInOut.java | 0 .../impl/DefaultTreeNodeNamingPolicy.java | 0 .../jmeter/gui/action/template/Template.java | 0 .../gui/action/template/TemplateManager.java | 0 .../action/thinktime/ThinkTimeCreator.java | 0 .../validation/TreeClonerForValidation.java | 0 .../gui/logging/GuiLogEventAppender.java | 0 .../jmeter/gui/logging/GuiLogEventBus.java | 0 .../gui/logging/GuiLogEventListener.java | 0 .../jmeter/gui/logging/LogEventObject.java | 0 .../apache/jmeter/gui/plugin/MenuCreator.java | 0 .../jmeter/gui/tree/JMeterCellRenderer.java | 0 .../jmeter/gui/tree/JMeterTreeListener.java | 0 .../jmeter/gui/tree/JMeterTreeModel.java | 0 .../jmeter/gui/tree/JMeterTreeNode.java | 0 .../gui/tree/JMeterTreeTransferHandler.java | 0 .../apache/jmeter/gui/tree/NamedTreeNode.java | 0 .../apache/jmeter/gui/util/CheckBoxPanel.java | 0 .../apache/jmeter/gui/util/EscapeDialog.java | 0 .../apache/jmeter/gui/util/FileDialoger.java | 0 .../apache/jmeter/gui/util/FileListPanel.java | 0 .../org/apache/jmeter/gui/util/FilePanel.java | 0 .../jmeter/gui/util/FilePanelEntry.java | 0 .../jmeter/gui/util/FocusRequester.java | 0 .../gui/util/HeaderAsPropertyRenderer.java | 0 .../util/HeaderAsPropertyRendererWrapper.java | 0 .../jmeter/gui/util/HorizontalPanel.java | 0 .../jmeter/gui/util/IconToolbarBean.java | 0 .../apache/jmeter/gui/util/JDateField.java | 0 .../jmeter/gui/util/JLabeledRadioI18N.java | 0 .../apache/jmeter/gui/util/JMeterColor.java | 0 .../apache/jmeter/gui/util/JMeterMenuBar.java | 0 .../apache/jmeter/gui/util/JMeterToolBar.java | 0 .../jmeter/gui/util/JSyntaxSearchToolBar.java | 0 .../jmeter/gui/util/JSyntaxTextArea.java | 0 .../jmeter/gui/util/JTextScrollPane.java | 0 .../apache/jmeter/gui/util/MenuFactory.java | 0 .../org/apache/jmeter/gui/util/MenuInfo.java | 0 .../jmeter/gui/util/MenuSeparatorInfo.java | 0 .../gui/util/NumberFieldErrorListener.java | 0 .../jmeter/gui/util/PowerTableModel.java | 0 .../jmeter/gui/util/TextAreaCellRenderer.java | 0 .../gui/util/TextAreaTableCellEditor.java | 0 .../jmeter/gui/util/TextBoxDialoger.java | 0 .../jmeter/gui/util/TristateCheckBox.java | 0 .../apache/jmeter/gui/util/TristateState.java | 0 .../apache/jmeter/gui/util/VerticalPanel.java | 0 .../apache/jmeter/plugin/JMeterPlugin.java | 0 .../apache/jmeter/plugin/PluginManager.java | 0 .../jmeter/processor/PostProcessor.java | 0 .../apache/jmeter/processor/PreProcessor.java | 0 .../gui/AbstractPostProcessorGui.java | 0 .../gui/AbstractPreProcessorGui.java | 0 .../report/config/ConfigurationException.java | 0 .../report/config/ConfigurationUtils.java | 0 .../report/config/ExporterConfiguration.java | 0 .../report/config/GraphConfiguration.java | 0 .../report/config/InstanceConfiguration.java | 0 .../config/ReportGeneratorConfiguration.java | 0 .../report/config/SubConfiguration.java | 0 .../report/core/AbstractSampleWriter.java | 0 .../core/ControllerSamplePredicate.java | 0 .../jmeter/report/core/ConvertException.java | 0 .../apache/jmeter/report/core/Converters.java | 0 .../apache/jmeter/report/core/CsvFile.java | 0 .../jmeter/report/core/CsvSampleReader.java | 0 .../jmeter/report/core/CsvSampleWriter.java | 0 .../jmeter/report/core/DataContext.java | 0 .../apache/jmeter/report/core/JsonUtil.java | 0 .../org/apache/jmeter/report/core/Sample.java | 0 .../jmeter/report/core/SampleBuilder.java | 0 .../jmeter/report/core/SampleComparator.java | 0 .../jmeter/report/core/SampleException.java | 0 .../report/core/SampleMetaDataParser.java | 0 .../jmeter/report/core/SampleMetadata.java | 0 .../jmeter/report/core/SamplePredicate.java | 0 .../jmeter/report/core/SampleSelector.java | 0 .../jmeter/report/core/SampleWriter.java | 0 .../jmeter/report/core/StringConverter.java | 0 .../apache/jmeter/report/core/TimeHelper.java | 0 .../dashboard/AbstractDataExporter.java | 0 .../jmeter/report/dashboard/DataExporter.java | 0 .../report/dashboard/ExportException.java | 0 .../report/dashboard/GenerationException.java | 0 .../dashboard/HtmlTemplateExporter.java | 0 .../jmeter/report/dashboard/JsonExporter.java | 0 .../report/dashboard/JsonizerVisitor.java | 0 .../report/dashboard/ReportGenerator.java | 0 .../report/dashboard/SamplingStatistic.java | 0 .../report/dashboard/TemplateVisitor.java | 0 .../processor/AbstractAggregatorFactory.java | 0 .../processor/AbstractSampleConsumer.java | 0 .../processor/AbstractSampleProcessor.java | 0 .../processor/AbstractSampleSource.java | 0 .../processor/AbstractSummaryConsumer.java | 0 .../report/processor/AggregateConsumer.java | 0 .../jmeter/report/processor/Aggregator.java | 0 .../report/processor/AggregatorFactory.java | 0 .../processor/ApdexSummaryConsumer.java | 0 .../report/processor/ApdexSummaryData.java | 0 .../report/processor/ApdexThresholdsInfo.java | 0 .../report/processor/ChannelContext.java | 0 .../report/processor/CsvFileSampleSource.java | 0 .../processor/ErrorsSummaryConsumer.java | 0 .../processor/ExternalSampleSorter.java | 0 .../processor/FieldSampleComparator.java | 0 .../report/processor/FilterConsumer.java | 0 .../apache/jmeter/report/processor/Job.java | 0 .../report/processor/ListResultData.java | 0 .../report/processor/MapResultData.java | 0 .../report/processor/MaxAggregator.java | 0 .../processor/MaxAggregatorFactory.java | 0 .../report/processor/MeanAggregator.java | 0 .../processor/MeanAggregatorFactory.java | 0 .../processor/MedianAggregatorFactory.java | 0 .../report/processor/MinAggregator.java | 0 .../processor/MinAggregatorFactory.java | 0 .../processor/NormalizerSampleConsumer.java | 0 .../processor/PercentileAggregator.java | 0 .../PercentileAggregatorFactory.java | 0 .../processor/RequestsSummaryConsumer.java | 0 .../jmeter/report/processor/ResultData.java | 0 .../report/processor/ResultDataVisitor.java | 0 .../report/processor/SampleConsumer.java | 0 .../report/processor/SampleContext.java | 0 .../report/processor/SampleIndexer.java | 0 .../report/processor/SampleProcessor.java | 0 .../report/processor/SampleProducer.java | 0 .../jmeter/report/processor/SampleSource.java | 0 .../processor/SampleWriterConsumer.java | 0 .../processor/StatisticsSummaryConsumer.java | 0 .../processor/StatisticsSummaryData.java | 0 .../report/processor/SumAggregator.java | 0 .../processor/SumAggregatorFactory.java | 0 .../report/processor/TaggerConsumer.java | 0 .../report/processor/ThresholdSelector.java | 0 .../report/processor/TimeRateAggregator.java | 0 .../processor/TimeRateAggregatorFactory.java | 0 .../Top5ErrorsBySamplerConsumer.java | 0 .../processor/Top5ErrorsSummaryData.java | 0 .../report/processor/ValueResultData.java | 0 .../graph/AbstractGraphConsumer.java | 0 .../graph/AbstractGraphValueSelector.java | 0 .../graph/AbstractOverTimeGraphConsumer.java | 0 .../graph/AbstractSeriesSelector.java | 0 .../AbstractVersusRequestsGraphConsumer.java | 0 .../processor/graph/CodeSeriesSelector.java | 0 .../graph/ConnectTimeValueSelector.java | 0 .../processor/graph/CountValueSelector.java | 0 .../graph/ElapsedTimeValueSelector.java | 0 .../processor/graph/GraphKeysSelector.java | 0 .../processor/graph/GraphSeriesSelector.java | 0 .../processor/graph/GraphValueSelector.java | 0 .../report/processor/graph/GroupData.java | 0 .../report/processor/graph/GroupInfo.java | 0 .../processor/graph/IndexedNameSelector.java | 0 .../processor/graph/LatencyValueSelector.java | 0 .../processor/graph/NameSeriesSelector.java | 0 .../report/processor/graph/SeriesData.java | 0 .../processor/graph/StaticSeriesSelector.java | 0 .../processor/graph/StatusSeriesSelector.java | 0 .../SuccessfulElapsedTimeValueSelector.java | 0 .../graph/TimeStampKeysSelector.java | 0 .../impl/ActiveThreadsGraphConsumer.java | 0 .../impl/BytesThroughputGraphConsumer.java | 0 .../impl/CodesPerSecondGraphConsumer.java | 0 .../ConnectTimeOverTimeGraphConsumer.java | 0 .../graph/impl/CustomGraphConsumer.java | 0 .../impl/HitsPerSecondGraphConsumer.java | 0 .../impl/LatencyOverTimeGraphConsumer.java | 0 .../impl/LatencyVSRequestGraphConsumer.java | 0 .../ResponseCustomGraphGraphConsumer.java | 0 ...ResponseTimeDistributionGraphConsumer.java | 0 .../ResponseTimeOverTimeGraphConsumer.java | 0 .../ResponseTimePerSampleGraphConsumer.java | 0 .../ResponseTimePercentilesGraphConsumer.java | 0 ...eTimePercentilesOverTimeGraphConsumer.java | 0 .../ResponseTimeVSRequestGraphConsumer.java | 0 ...ResponseTimeDistributionGraphConsumer.java | 0 .../graph/impl/TimeVSThreadGraphConsumer.java | 0 .../graph/impl/TotalTPSGraphConsumer.java | 0 .../TransactionsPerSecondGraphConsumer.java | 0 .../jmeter/report/utils/MetricUtils.java | 0 .../reporters/AbstractListenerElement.java | 0 .../apache/jmeter/reporters/ResultAction.java | 0 .../jmeter/reporters/ResultCollector.java | 0 .../reporters/ResultCollectorHelper.java | 0 .../apache/jmeter/reporters/ResultSaver.java | 0 .../apache/jmeter/reporters/Summariser.java | 0 .../reporters/SummariserRunningSample.java | 0 .../jmeter/reporters/gui/ResultActionGui.java | 0 .../jmeter/reporters/gui/ResultSaverGui.java | 0 .../jmeter/reporters/gui/SummariserGui.java | 0 .../apache/jmeter/rmi/AliasKeyManager.java | 0 .../rmi/RMIServerSocketFactoryImpl.java | 0 .../java}/org/apache/jmeter/rmi/RmiUtils.java | 0 .../jmeter/rmi/SSLRMIClientSocketFactory.java | 0 .../jmeter/rmi/SSLRMIServerSocketFactory.java | 0 .../jmeter/samplers/AbstractSampleSender.java | 0 .../jmeter/samplers/AbstractSampler.java | 0 .../jmeter/samplers/AsynchSampleSender.java | 0 .../jmeter/samplers/BatchSampleSender.java | 0 .../org/apache/jmeter/samplers/Clearable.java | 0 .../samplers/DataStrippingSampleSender.java | 0 .../samplers/DiskStoreSampleSender.java | 0 .../org/apache/jmeter/samplers/Entry.java | 0 .../jmeter/samplers/HoldSampleSender.java | 0 .../apache/jmeter/samplers/Interruptible.java | 0 .../samplers/RemoteListenerWrapper.java | 0 .../jmeter/samplers/RemoteSampleListener.java | 0 .../samplers/RemoteSampleListenerImpl.java | 0 .../samplers/RemoteSampleListenerWrapper.java | 0 .../samplers/RemoteTestListenerWrapper.java | 0 .../apache/jmeter/samplers/Remoteable.java | 0 .../apache/jmeter/samplers/SampleEvent.java | 3 - .../jmeter/samplers/SampleListener.java | 0 .../apache/jmeter/samplers/SampleMonitor.java | 0 .../apache/jmeter/samplers/SampleResult.java | 0 .../samplers/SampleSaveConfiguration.java | 0 .../apache/jmeter/samplers/SampleSender.java | 0 .../jmeter/samplers/SampleSenderFactory.java | 0 .../org/apache/jmeter/samplers/Sampler.java | 0 .../jmeter/samplers/StandardSampleSender.java | 0 .../samplers/StatisticalSampleResult.java | 0 .../samplers/StatisticalSampleSender.java | 0 .../samplers/gui/AbstractSamplerGui.java | 0 .../apache/jmeter/save/CSVSaveService.java | 0 .../jmeter/save/ListenerResultWrapper.java | 0 .../jmeter/save/SaveGraphicsService.java | 0 .../org/apache/jmeter/save/SaveService.java | 0 .../org/apache/jmeter/save/ScriptWrapper.java | 0 .../jmeter/save/ScriptWrapperConverter.java | 0 .../apache/jmeter/save/TestResultWrapper.java | 0 .../converters/BooleanPropertyConverter.java | 0 .../save/converters/ConversionHelp.java | 0 .../save/converters/HashTreeConverter.java | 0 .../converters/IntegerPropertyConverter.java | 0 .../converters/LongPropertyConverter.java | 0 .../converters/MultiPropertyConverter.java | 0 .../save/converters/SampleEventConverter.java | 0 .../converters/SampleResultConverter.java | 0 .../SampleSaveConfigurationConverter.java | 0 .../converters/StringPropertyConverter.java | 0 .../save/converters/TestElementConverter.java | 0 .../TestElementPropertyConverter.java | 0 .../TestResultWrapperConverter.java | 0 .../apache/jmeter/services/FileServer.java | 0 .../org/apache/jmeter/swing/HtmlPane.java | 0 .../jmeter/testbeans/BeanInfoSupport.java | 0 .../org/apache/jmeter/testbeans/TestBean.java | 0 .../jmeter/testbeans/TestBeanBeanInfo.java | 0 .../jmeter/testbeans/TestBeanHelper.java | 0 .../testbeans/gui/BooleanPropertyEditor.java | 0 .../testbeans/gui/ComboStringEditor.java | 0 .../jmeter/testbeans/gui/EnumEditor.java | 0 .../testbeans/gui/FieldStringEditor.java | 0 .../jmeter/testbeans/gui/FileEditor.java | 0 .../gui/GenericTestBeanCustomizer.java | 0 .../testbeans/gui/IntegerPropertyEditor.java | 0 .../testbeans/gui/LongPropertyEditor.java | 0 .../jmeter/testbeans/gui/PasswordEditor.java | 0 .../testbeans/gui/SharedCustomizer.java | 0 .../jmeter/testbeans/gui/TableEditor.java | 0 .../jmeter/testbeans/gui/TestBeanGUI.java | 0 .../testbeans/gui/TestBeanPropertyEditor.java | 0 .../jmeter/testbeans/gui/TextAreaEditor.java | 0 .../jmeter/testbeans/gui/TypeEditor.java | 0 .../jmeter/testbeans/gui/WrapperEditor.java | 0 .../testelement/AbstractScopedAssertion.java | 0 .../AbstractScopedTestElement.java | 0 .../testelement/AbstractTestElement.java | 0 .../AbstractTestElementBeanInfo.java | 0 .../jmeter/testelement/NonTestElement.java | 0 .../testelement/OnErrorTestElement.java | 0 .../jmeter/testelement/TestCloneable.java | 0 .../jmeter/testelement/TestElement.java | 0 .../testelement/TestElementTraverser.java | 0 .../testelement/TestIterationListener.java | 0 .../apache/jmeter/testelement/TestPlan.java | 0 .../jmeter/testelement/TestStateListener.java | 0 .../jmeter/testelement/ThreadListener.java | 0 .../testelement/VariablesCollection.java | 0 .../apache/jmeter/testelement/WorkBench.java | 0 .../property/AbstractProperty.java | 0 .../testelement/property/BooleanProperty.java | 0 .../property/CollectionProperty.java | 0 .../testelement/property/DoubleProperty.java | 0 .../testelement/property/FloatProperty.java | 0 .../property/FunctionProperty.java | 0 .../testelement/property/IntegerProperty.java | 0 .../testelement/property/JMeterProperty.java | 0 .../testelement/property/LongProperty.java | 0 .../testelement/property/MapProperty.java | 0 .../testelement/property/MultiProperty.java | 0 .../testelement/property/NullProperty.java | 0 .../testelement/property/NumberProperty.java | 0 .../testelement/property/ObjectProperty.java | 0 .../property/PropertyIterator.java | 0 .../property/PropertyIteratorImpl.java | 0 .../testelement/property/StringProperty.java | 0 .../property/TestElementProperty.java | 0 .../jmeter/threads/AbstractThreadGroup.java | 0 .../FindTestElementsUpToRootTraverser.java | 0 .../apache/jmeter/threads/JMeterContext.java | 0 .../jmeter/threads/JMeterContextService.java | 5 +- .../apache/jmeter/threads/JMeterThread.java | 0 .../jmeter/threads/JMeterThreadMonitor.java | 0 .../jmeter/threads/JMeterVariables.java | 0 .../jmeter/threads/ListenerNotifier.java | 0 .../jmeter/threads/PostThreadGroup.java | 0 .../RemoteThreadsLifeCycleListener.java | 0 .../jmeter/threads/RemoteThreadsListener.java | 0 .../threads/RemoteThreadsListenerImpl.java | 0 .../RemoteThreadsListenerTestElement.java | 0 .../threads/RemoteThreadsListenerWrapper.java | 0 .../apache/jmeter/threads/SamplePackage.java | 0 .../jmeter/threads/SetupThreadGroup.java | 0 .../apache/jmeter/threads/TestCompiler.java | 0 .../jmeter/threads/TestCompilerHelper.java | 0 .../apache/jmeter/threads/ThreadGroup.java | 0 .../threads/UnmodifiableJMeterVariables.java | 0 .../threads/gui/AbstractThreadGroupGui.java | 0 .../threads/gui/PostThreadGroupGui.java | 0 .../threads/gui/SetupThreadGroupGui.java | 0 .../jmeter/threads/gui/ThreadGroupGui.java | 0 .../apache/jmeter/timers/ModifiableTimer.java | 0 .../java}/org/apache/jmeter/timers/Timer.java | 0 .../apache/jmeter/timers/TimerService.java | 0 .../jmeter/timers/gui/AbstractTimerGui.java | 0 .../jmeter/util/BSFBeanInfoSupport.java | 0 .../jmeter/util/BSFJavaScriptEngine.java | 0 .../apache/jmeter/util/BSFTestElement.java | 0 .../jmeter/util/BeanShellBeanInfoSupport.java | 0 .../jmeter/util/BeanShellInterpreter.java | 0 .../apache/jmeter/util/BeanShellServer.java | 0 .../jmeter/util/BeanShellTestElement.java | 0 .../org/apache/jmeter/util/CPSPauser.java | 0 .../org/apache/jmeter/util/Calculator.java | 0 .../org/apache/jmeter/util/ColorHelper.java | 0 .../jmeter/util/CustomX509TrustManager.java | 0 .../org/apache/jmeter/util/Document.java | 0 .../util/HttpSSLProtocolSocketFactory.java | 0 .../util/JMeterTreeNodeTransferable.java | 0 .../org/apache/jmeter/util/JMeterUtils.java | 0 .../org/apache/jmeter/util/JMeterVersion.java | 0 .../jmeter/util/JSR223BeanInfoSupport.java | 0 .../apache/jmeter/util/JSR223TestElement.java | 0 .../apache/jmeter/util/JsseSSLManager.java | 0 .../apache/jmeter/util/LocaleChangeEvent.java | 0 .../jmeter/util/LocaleChangeListener.java | 0 .../org/apache/jmeter/util/NameUpdater.java | 0 .../org/apache/jmeter/util/NamedObject.java | 0 .../util/PropertiesBasedPrefixResolver.java | 0 ...ropertiesBasedPrefixResolverForXpath2.java | 0 .../org/apache/jmeter/util/SSLManager.java | 0 .../org/apache/jmeter/util/ScopePanel.java | 0 .../jmeter/util/ScriptingBeanInfoSupport.java | 0 .../jmeter/util/ScriptingTestElement.java | 0 .../apache/jmeter/util/SlowInputStream.java | 0 .../apache/jmeter/util/SlowOutputStream.java | 0 .../org/apache/jmeter/util/SlowSSLSocket.java | 0 .../org/apache/jmeter/util/SlowSocket.java | 0 .../apache/jmeter/util/StringUtilities.java | 0 .../org/apache/jmeter/util/TemplateUtil.java | 0 .../org/apache/jmeter/util/TidyException.java | 0 .../jmeter/util/TrustAllSSLSocketFactory.java | 0 .../jmeter/util/XPathQueryCacheLoader.java | 0 .../org/apache/jmeter/util/XPathUtil.java | 0 .../jmeter/util/keystore/JmeterKeyStore.java | 0 .../visualizers/CachingStatCalculator.java | 0 .../jmeter/visualizers/ImageVisualizer.java | 0 .../apache/jmeter/visualizers/Printable.java | 0 .../jmeter/visualizers/RunningSample.java | 0 .../org/apache/jmeter/visualizers/Sample.java | 0 .../visualizers/SamplingStatCalculator.java | 0 .../jmeter/visualizers/TableSample.java | 0 .../apache/jmeter/visualizers/Visualizer.java | 0 .../jmeter/visualizers/backend/Backend.java | 0 .../visualizers/gui/AbstractListenerGui.java | 0 .../visualizers/gui/AbstractVisualizer.java | 4 +- .../apache/jmeter/gui/action/schematic.xsl | 0 .../jmeter/gui/action/template/templates.dtd | 0 .../jmeter/gui/util/textarea.properties | 0 .../jmeter/gui/util/theme/darcula_theme.xml | 0 .../resources}/org/apache/jmeter/help.txt | 0 .../org/apache/jmeter/images/about.down.gif | Bin .../org/apache/jmeter/images/about.off.gif | Bin .../org/apache/jmeter/images/about.on.gif | Bin .../org/apache/jmeter/images/about.over.gif | Bin .../org/apache/jmeter/images/beaker.gif | Bin .../org/apache/jmeter/images/clear.down.gif | Bin .../org/apache/jmeter/images/clear.off.gif | Bin .../org/apache/jmeter/images/clear.on.gif | Bin .../org/apache/jmeter/images/clear.over.gif | Bin .../org/apache/jmeter/images/clipboard.gif | Bin .../apache/jmeter/images/collapse-close.png | Bin .../apache/jmeter/images/collapse-open.png | Bin .../org/apache/jmeter/images/ear.gif | Bin .../org/apache/jmeter/images/feather.gif | Bin .../org/apache/jmeter/images/icon-apache.png | Bin .../org/apache/jmeter/images/icon.properties | 0 .../apache/jmeter/images/icon_1.properties | 0 .../apache/jmeter/images/icon_error_sml.gif | Bin .../apache/jmeter/images/icon_old.properties | 0 .../apache/jmeter/images/icon_success_sml.gif | Bin .../apache/jmeter/images/icon_warning_sml.gif | Bin .../org/apache/jmeter/images/jmeter.png | Bin .../org/apache/jmeter/images/knob.gif | Bin .../org/apache/jmeter/images/leafnode.gif | Bin .../org/apache/jmeter/images/leafnodeflip.gif | Bin .../org/apache/jmeter/images/meter.png | Bin .../org/apache/jmeter/images/new/barchart.png | Bin .../jmeter/images/new/barchart.png-grey.png | Bin .../apache/jmeter/images/new/blue-quill.png | Bin .../apache/jmeter/images/new/book-grey.png | Bin .../org/apache/jmeter/images/new/book.png | Bin .../apache/jmeter/images/new/chart-grey.png | Bin .../org/apache/jmeter/images/new/chart.png | Bin .../apache/jmeter/images/new/clock-grey.png | Bin .../org/apache/jmeter/images/new/clock.png | Bin .../apache/jmeter/images/new/funnel-grey.png | Bin .../org/apache/jmeter/images/new/funnel.png | Bin .../apache/jmeter/images/new/glasses-grey.png | Bin .../org/apache/jmeter/images/new/glasses.png | Bin .../apache/jmeter/images/new/mglass-grey.png | Bin .../org/apache/jmeter/images/new/mglass.png | Bin .../apache/jmeter/images/new/pencil-grey.png | Bin .../org/apache/jmeter/images/new/pencil.png | Bin .../org/apache/jmeter/images/new/pin-grey.png | Bin .../org/apache/jmeter/images/new/pin.png | Bin .../apache/jmeter/images/new/puzzle-grey.png | Bin .../org/apache/jmeter/images/new/puzzle.png | Bin .../apache/jmeter/images/new/remote-grey.png | Bin .../org/apache/jmeter/images/new/remote.png | Bin .../apache/jmeter/images/new/scroll-grey.png | Bin .../org/apache/jmeter/images/new/scroll.png | Bin .../apache/jmeter/images/new/table-grey.png | Bin .../org/apache/jmeter/images/new/table.png | Bin .../apache/jmeter/images/new/thread-grey.png | Bin .../org/apache/jmeter/images/new/thread.png | Bin .../jmeter/images/new/typewriter-grey.png | Bin .../apache/jmeter/images/new/typewriter.png | Bin .../org/apache/jmeter/images/pipet.png | Bin .../org/apache/jmeter/images/question.gif | Bin .../jmeter/images/smallthread.disabled.gif | Bin .../jmeter/images/smallthread.enabled.gif | Bin .../apache/jmeter/images/smallthread.idle.gif | Bin .../org/apache/jmeter/images/start.down.gif | Bin .../org/apache/jmeter/images/start.off.gif | Bin .../org/apache/jmeter/images/start.on.gif | Bin .../org/apache/jmeter/images/start.over.gif | Bin .../images/status/22x22/dialog-error-5.png | Bin .../22x22/pictogram-din-w000-general.png | Bin .../images/status/22x22/task-complete.png | Bin .../images/status/22x22/task-recurring.png | Bin .../images/status/22x22/user-offline-2.png | Bin .../images/status/22x22/user-online-2.png | Bin .../images/status/32x32/dialog-error-5.png | Bin .../32x32/pictogram-din-w000-general.png | Bin .../images/status/32x32/task-complete.png | Bin .../images/status/32x32/task-recurring.png | Bin .../images/status/32x32/user-offline-2.png | Bin .../images/status/32x32/user-online-2.png | Bin .../images/status/48x48/dialog-error-5.png | Bin .../48x48/pictogram-din-w000-general.png | Bin .../images/status/48x48/task-complete.png | Bin .../images/status/48x48/task-recurring.png | Bin .../images/status/48x48/user-offline-2.png | Bin .../images/status/48x48/user-online-2.png | Bin .../org/apache/jmeter/images/stop.down.gif | Bin .../org/apache/jmeter/images/stop.off.gif | Bin .../org/apache/jmeter/images/stop.on.gif | Bin .../org/apache/jmeter/images/stop.over.gif | Bin .../org/apache/jmeter/images/testtubes.png | Bin .../apache/jmeter/images/thread.disabled.gif | Bin .../apache/jmeter/images/thread.enabled.gif | Bin .../org/apache/jmeter/images/thread.gif | Bin .../org/apache/jmeter/images/thread.idle.gif | Bin .../org/apache/jmeter/images/timer.gif | Bin .../toolbar/22x22/applications-office.png | Bin .../toolbar/22x22/arrow-right-3-notimer.png | Bin .../22x22/arrow-right-3-startremoteall.png | Bin .../images/toolbar/22x22/arrow-right-3.png | Bin .../toolbar/22x22/color-picker-toggle.png | Bin .../images/toolbar/22x22/document-new-4.png | Bin .../images/toolbar/22x22/document-open-2.png | Bin .../images/toolbar/22x22/document-save-5.png | Bin .../toolbar/22x22/document-save-as-5.png | Bin .../images/toolbar/22x22/documentation.png | Bin .../images/toolbar/22x22/edit-clear-3.png | Bin .../images/toolbar/22x22/edit-copy-4.png | Bin .../images/toolbar/22x22/edit-cut-4.png | Bin .../images/toolbar/22x22/edit-find-7.png | Bin .../images/toolbar/22x22/edit-paste-4.png | Bin .../images/toolbar/22x22/edit-redo-7.png | Bin .../images/toolbar/22x22/edit-undo-7.png | Bin .../images/toolbar/22x22/help-contents-5.png | Bin .../images/toolbar/22x22/list-add-3.png | Bin .../images/toolbar/22x22/list-remove-3.png | Bin .../images/toolbar/22x22/process-stop-4.png | Bin .../process-stop-7-shutdownremoteall.png | Bin .../images/toolbar/22x22/process-stop-7.png | Bin .../22x22/road-sign-us-stop-stopremoteall.png | Bin .../toolbar/22x22/road-sign-us-stop.png | Bin .../images/toolbar/22x22/run-build-clean.png | Bin .../images/toolbar/22x22/run-build-prune.png | Bin .../toolbar/32x32/applications-office.png | Bin .../toolbar/32x32/arrow-right-3-notimer.png | Bin .../32x32/arrow-right-3-startremoteall.png | Bin .../images/toolbar/32x32/arrow-right-3.png | Bin .../toolbar/32x32/color-picker-toggle.png | Bin .../images/toolbar/32x32/document-new-4.png | Bin .../images/toolbar/32x32/document-open-2.png | Bin .../images/toolbar/32x32/document-save-5.png | Bin .../toolbar/32x32/document-save-as-5.png | Bin .../images/toolbar/32x32/documentation.png | Bin .../images/toolbar/32x32/edit-clear-3.png | Bin .../images/toolbar/32x32/edit-copy-4.png | Bin .../images/toolbar/32x32/edit-cut-4.png | Bin .../images/toolbar/32x32/edit-find-7.png | Bin .../images/toolbar/32x32/edit-paste-4.png | Bin .../images/toolbar/32x32/edit-redo-7.png | Bin .../images/toolbar/32x32/edit-undo-7.png | Bin .../images/toolbar/32x32/help-contents-5.png | Bin .../images/toolbar/32x32/list-add-3.png | Bin .../images/toolbar/32x32/list-remove-3.png | Bin .../images/toolbar/32x32/process-stop-4.png | Bin .../process-stop-7-shutdownremoteall.png | Bin .../images/toolbar/32x32/process-stop-7.png | Bin .../32x32/road-sign-us-stop-stopremoteall.png | Bin .../toolbar/32x32/road-sign-us-stop.png | Bin .../images/toolbar/32x32/run-build-clean.png | Bin .../images/toolbar/32x32/run-build-prune.png | Bin .../toolbar/48x48/applications-office.png | Bin .../toolbar/48x48/arrow-right-3-notimer.png | Bin .../48x48/arrow-right-3-startremoteall.png | Bin .../images/toolbar/48x48/arrow-right-3.png | Bin .../toolbar/48x48/color-picker-toggle.png | Bin .../images/toolbar/48x48/document-new-4.png | Bin .../images/toolbar/48x48/document-open-2.png | Bin .../images/toolbar/48x48/document-save-5.png | Bin .../toolbar/48x48/document-save-as-5.png | Bin .../images/toolbar/48x48/documentation.png | Bin .../images/toolbar/48x48/edit-clear-3.png | Bin .../images/toolbar/48x48/edit-copy-4.png | Bin .../images/toolbar/48x48/edit-cut-4.png | Bin .../images/toolbar/48x48/edit-find-7.png | Bin .../images/toolbar/48x48/edit-paste-4.png | Bin .../images/toolbar/48x48/edit-redo-7.png | Bin .../images/toolbar/48x48/edit-undo-7.png | Bin .../images/toolbar/48x48/help-contents-5.png | Bin .../images/toolbar/48x48/list-add-3.png | Bin .../images/toolbar/48x48/list-remove-3.png | Bin .../images/toolbar/48x48/process-stop-4.png | Bin .../process-stop-7-shutdownremoteall.png | Bin .../images/toolbar/48x48/process-stop-7.png | Bin .../48x48/road-sign-us-stop-stopremoteall.png | Bin .../toolbar/48x48/road-sign-us-stop.png | Bin .../images/toolbar/48x48/run-build-clean.png | Bin .../images/toolbar/48x48/run-build-prune.png | Bin .../icons-custom/arrow-right-3-notimer.svg | 0 .../arrow-right-3-startremoteall.svg | 0 .../icons-custom/color-picker-toggle.svg | 0 .../process-stop-7-shutdownremoteall.svg | 0 .../road-sign-us-stop-stopremoteall.svg | 0 .../images/toolbar/icons-toolbar.properties | 0 .../tree/19x19/applications-science-3.png | Bin .../images/tree/19x19/appointment-new-3.png | Bin .../images/tree/19x19/color-picker-grey.png | Bin .../tree/19x19/document-export-4_custom.png | Bin .../tree/19x19/document-import-2_custom.png | Bin .../images/tree/19x19/document-preview.png | Bin .../images/tree/19x19/office-chart-area.png | Bin .../tree/19x19/preferences-system-4.png | Bin .../jmeter/images/tree/19x19/system-run-5.png | Bin .../images/tree/19x19/view-list-tree-4.png | Bin .../images/tree/19x19/view-pim-tasks.png | Bin .../tree/24x24/applications-science-3.png | Bin .../images/tree/24x24/appointment-new-3.png | Bin .../images/tree/24x24/color-picker-grey.png | Bin .../tree/24x24/document-export-4_custom.png | Bin .../tree/24x24/document-import-2_custom.png | Bin .../images/tree/24x24/document-preview.png | Bin .../images/tree/24x24/office-chart-area.png | Bin .../tree/24x24/preferences-system-4.png | Bin .../jmeter/images/tree/24x24/system-run-5.png | Bin .../images/tree/24x24/view-list-tree-4.png | Bin .../images/tree/24x24/view-pim-tasks.png | Bin .../tree/32x32/applications-science-3.png | Bin .../images/tree/32x32/appointment-new-3.png | Bin .../images/tree/32x32/color-picker-grey.png | Bin .../tree/32x32/document-export-4_custom.png | Bin .../tree/32x32/document-import-2_custom.png | Bin .../images/tree/32x32/document-preview.png | Bin .../images/tree/32x32/office-chart-area.png | Bin .../tree/32x32/preferences-system-4.png | Bin .../jmeter/images/tree/32x32/system-run-5.png | Bin .../images/tree/32x32/view-list-tree-4.png | Bin .../images/tree/32x32/view-pim-tasks.png | Bin .../tree/48x48/applications-science-3.png | Bin .../images/tree/48x48/appointment-new-3.png | Bin .../images/tree/48x48/color-picker-grey.png | Bin .../tree/48x48/document-export-4_custom.png | Bin .../tree/48x48/document-import-2_custom.png | Bin .../images/tree/48x48/document-preview.png | Bin .../images/tree/48x48/office-chart-area.png | Bin .../tree/48x48/preferences-system-4.png | Bin .../jmeter/images/tree/48x48/system-run-5.png | Bin .../images/tree/48x48/view-list-tree-4.png | Bin .../images/tree/48x48/view-pim-tasks.png | Bin .../icons-custom/document-export-4_custom.svg | 0 .../icons-custom/document-import-2_custom.svg | 0 .../images/vrt/19x19/security-high-2.png | Bin .../images/vrt/19x19/security-low-2.png | Bin .../images/vrt/24x24/security-high-2.png | Bin .../images/vrt/24x24/security-low-2.png | Bin .../images/vrt/32x32/security-high-2.png | Bin .../images/vrt/32x32/security-low-2.png | Bin .../images/vrt/48x48/security-high-2.png | Bin .../images/vrt/48x48/security-low-2.png | Bin .../org/apache/jmeter/images/warning.png | Bin .../apache/jmeter/report/config/package.html | 0 .../apache/jmeter/report/core/package.html | 0 .../jmeter/report/dashboard/package.html | 0 .../report/processor/graph/impl/package.html | 0 .../report/processor/graph/package.html | 0 .../jmeter/report/processor/package.html | 0 .../jmeter/resources/messages.properties | 0 .../jmeter/resources/messages_de.properties | 0 .../jmeter/resources/messages_es.properties | 0 .../jmeter/resources/messages_fr.properties | 0 .../jmeter/resources/messages_ja.properties | 0 .../jmeter/resources/messages_no.properties | 0 .../jmeter/resources/messages_pl.properties | 0 .../resources/messages_pt_BR.properties | 0 .../jmeter/resources/messages_tr.properties | 0 .../resources/messages_zh_CN.properties | 0 .../resources/messages_zh_TW.properties | 0 .../apache/jmeter/visualizers/package.html | 0 .../jmeter/gui/HtmlReportGUISpec.groovy | 0 .../jmeter/junit/spock/JMeterSpec.groovy | 61 +++++++++ .../jmeter/report/core/ConvertersSpec.groovy | 0 .../core/SampleMetadataParserSpec.groovy | 0 .../processor/ApdexSummaryConsumerSpec.groovy | 0 .../FieldSampleComparatorSpec.groovy | 0 .../processor/ListResultDataSpec.groovy | 0 .../Top5ErrorsBySamplerConsumerSpec.groovy | 0 .../Top5ErrorsSummaryDataSpec.groovy | 0 ...ercentilesOverTimeGraphConsumerSpec.groovy | 0 .../jmeter/services/FileServerSpec.groovy | 4 +- .../java}/org/apache/jmeter/JMeterTest.java | 0 .../jmeter/engine/DistributedRunnerTest.java | 0 .../apache/jmeter/engine/LocalHostTest.java | 0 .../apache/jmeter/engine/TestTreeCloner.java | 0 .../jmeter/engine/util/TestValueReplacer.java | 0 .../gui/logging/TestGuiLogEventAppender.java | 0 .../jmeter/gui/util/JSyntaxTextAreaTest.java | 0 .../jmeter/gui/util/TristateCheckBoxTest.java | 0 .../apache/jmeter/junit/JMeterTestCase.java | 13 +- .../jmeter/junit/JMeterTestCaseJUnit.java | 13 +- .../apache/jmeter/junit/JMeterTestUtils.java | 47 +++++-- .../categories/ExcludeCategoryFilter.java | 0 .../jmeter/junit/categories/NeedGuiTests.java | 0 .../jmeter/junit/stubs/TestSampler.java | 0 .../jmeter/listeners/TestResultAction.java | 0 .../report/core/CsvSampleReaderTest.java | 0 .../report/core/SampleMetadataTest.java | 0 .../report/core/TestCsvSampleWriter.java | 0 .../dashboard/ApdexPerTransactionTest.java | 0 .../processor/ErrorsSummaryConsumerTest.java | 0 .../graph/impl/CustomGraphConsumerTest.java | 0 .../apache/jmeter/resources/PackageTest.java | 0 .../apache/jmeter/samplers/NullSampler.java | 0 .../jmeter/samplers/TestSampleResult.java | 0 .../samplers/TestSampleSaveConfiguration.java | 0 .../jmeter/save/TestCSVSaveService.java | 0 .../apache/jmeter/test/ResourceLocator.java | 0 .../gui/TestBooleanPropertyEditor.java | 0 .../testbeans/gui/TestComboStringEditor.java | 0 .../testbeans/gui/TestFieldStringEditor.java | 0 .../jmeter/testelement/PackageTest.java | 0 .../testelement/TestNumberProperty.java | 0 .../property/AbstractPropertyTest.java | 0 .../testelement/property/MapPropertyTest.java | 0 .../testelement/property/PackageTest.java | 0 .../threads/JMeterContextServiceHelper.java | 0 .../threads/TestJMeterContextService.java | 0 .../jmeter/threads/TestJMeterThread.java | 30 +++-- .../jmeter/threads/TestTestCompiler.java | 0 .../TestUnmodifiableJMeterVariables.java | 0 .../jmeter/util/JSR223TestElementTest.java | 0 .../org/apache/jmeter/util/LogRecord.java | 0 .../util/LogRecordingDelegatingLogger.java | 0 .../org/apache/jmeter/util/PackageTest.java | 0 .../jmeter/util/StringUtilitiesTest.java | 0 .../apache/jmeter/util/TestJMeterUtils.java | 0 .../org/apache/jmeter/util/XPathUtilTest.java | 16 --- .../org/apache/jorphan/TestXMLBuffer.java | 0 .../apache/jorphan/reflect/TestFunctor.java | 0 .../org/apache/jorphan/test/AllTests.java | 0 .../apache/jorphan/test/JMeterSerialTest.java | 0 .../src/test}/resources/XPathUtilTestXml.xml | 0 .../core/src/test}/resources/log4j2.xml | 0 .../dashboard/reportgenerator_test.properties | 0 .../jmeter/services}/testfiles/empty.csv | 0 .../testfiles/unit/FileServerSpec.csv | 0 .../core/src/test}/resources/resourcefile.txt | 0 .../jmeter/engine/util/PackageSpec.groovy | 0 .../gui/action/HtmlReportGeneratorSpec.groovy | 0 .../jmeter/gui/util/MenuFactorySpec.groovy | 0 .../dashboard/ReportGeneratorSpec.groovy | 0 .../jmeter/control/TestSwitchController.java | 0 .../ComponentReferenceFunctionTest.java | 2 +- .../apache/jmeter/gui/action/TestLoad.java | 5 +- .../org/apache/jmeter/junit/JMeterTest.java | 4 + .../jmeter/resources/TestPropertiesFiles.java | 0 .../apache/jmeter/save/TestSaveService.java | 3 +- .../jmeter/testbeans/gui/PackageTest.java | 0 .../jmeter/testelement/TestElementTest.java | 0 .../org/apache/jorphan/TestFunctorUsers.java | 0 .../jorphan/reflect/TestClassFinder.java | 15 --- .../jmeter/gui/report/HTMLReportExpect.json | 0 .../examples/sampler/ExampleSampler.java | 0 .../sampler/gui/ExampleSamplerGui.java | 0 .../examples/testbeans/example1/Example1.java | 0 .../examples/testbeans/example2/Example2.java | 0 .../testbeans/example2/Example2BeanInfo.java | 0 .../examples/testbeans/example3/Example3.java | 0 .../testbeans/example3/Example3BeanInfo.java | 0 .../example2/Example2Resources.properties | 0 .../example2/Example2Resources_es.properties | 0 .../Example2Resources_pt_BR.properties | 0 .../example2/Example2Resources_tr.properties | 0 .../Example2Resources_zh_TW.properties | 0 .../example3/Example3Resources.properties | 0 .../functions/AbstractFunctionByKey.java | 0 .../jmeter/functions/AbstractHostIPName.java | 0 .../apache/jmeter/functions/BeanShell.java | 0 .../org/apache/jmeter/functions/CSVRead.java | 0 .../apache/jmeter/functions/ChangeCase.java | 0 .../apache/jmeter/functions/CharFunction.java | 0 .../functions/DateTimeConvertFunction.java | 0 .../functions/DigestEncodeFunction.java | 0 .../apache/jmeter/functions/EscapeHtml.java | 0 .../functions/EscapeOroRegexpChars.java | 0 .../apache/jmeter/functions/EscapeXml.java | 0 .../apache/jmeter/functions/EvalFunction.java | 0 .../jmeter/functions/EvalVarFunction.java | 0 .../jmeter/functions/FileRowColContainer.java | 0 .../apache/jmeter/functions/FileToString.java | 0 .../apache/jmeter/functions/FileWrapper.java | 0 .../org/apache/jmeter/functions/Groovy.java | 0 .../org/apache/jmeter/functions/IntSum.java | 0 .../jmeter/functions/IsPropDefined.java | 0 .../apache/jmeter/functions/IsVarDefined.java | 0 .../jmeter/functions/IterationCounter.java | 0 .../apache/jmeter/functions/JavaScript.java | 0 .../jmeter/functions/Jexl2Function.java | 0 .../jmeter/functions/Jexl3Function.java | 0 .../apache/jmeter/functions/LogFunction.java | 0 .../apache/jmeter/functions/LogFunction2.java | 0 .../org/apache/jmeter/functions/LongSum.java | 0 .../apache/jmeter/functions/MachineIP.java | 0 .../apache/jmeter/functions/MachineName.java | 0 .../org/apache/jmeter/functions/Property.java | 0 .../apache/jmeter/functions/Property2.java | 0 .../org/apache/jmeter/functions/Random.java | 0 .../apache/jmeter/functions/RandomDate.java | 0 .../functions/RandomFromMultipleVars.java | 0 .../apache/jmeter/functions/RandomString.java | 0 .../jmeter/functions/RegexFunction.java | 0 .../apache/jmeter/functions/SamplerName.java | 0 .../apache/jmeter/functions/SetProperty.java | 0 .../jmeter/functions/SplitFunction.java | 0 .../jmeter/functions/StringFromFile.java | 0 .../apache/jmeter/functions/StringToFile.java | 0 .../apache/jmeter/functions/TestPlanName.java | 0 .../jmeter/functions/ThreadGroupName.java | 0 .../apache/jmeter/functions/ThreadNumber.java | 0 .../apache/jmeter/functions/TimeFunction.java | 0 .../apache/jmeter/functions/TimeShift.java | 0 .../org/apache/jmeter/functions/UnEscape.java | 0 .../apache/jmeter/functions/UnEscapeHtml.java | 0 .../apache/jmeter/functions/UrlDecode.java | 0 .../apache/jmeter/functions/UrlEncode.java | 0 .../org/apache/jmeter/functions/Uuid.java | 0 .../org/apache/jmeter/functions/Variable.java | 0 .../org/apache/jmeter/functions/XPath.java | 0 .../jmeter/functions/XPathFileContainer.java | 0 .../apache/jmeter/functions/XPathWrapper.java | 0 .../org/apache/jmeter/functions/package.html | 0 .../jmeter/functions/ChangeCaseSpec.groovy | 0 .../functions/gui/FunctionHelperSpec.groovy | 0 .../jmeter/functions/CSVReadFunctionTest.java | 4 +- .../jmeter/functions/EvalFunctionTest.java | 0 .../jmeter/functions/FunctionTestHelper.java | 0 .../apache/jmeter/functions/PackageTest.java | 12 +- .../jmeter/functions/RandomFunctionTest.java | 0 .../jmeter/functions/SplitFunctionTest.java | 0 .../functions/StringFromFileFunctionTest.java | 9 +- .../jmeter/functions/SumFunctionTest.java | 0 .../jmeter/functions/TestChangeCase.java | 0 .../TestDateTimeConvertFunction.java | 0 .../jmeter/functions/TestDigestFunction.java | 0 .../functions/TestEscapeOroRegexpChars.java | 0 .../functions/TestFileRowColContainer.java | 0 .../jmeter/functions/TestFileToString.java | 0 .../jmeter/functions/TestGroovyFunction.java | 0 .../jmeter/functions/TestIsPropDefined.java | 0 .../jmeter/functions/TestIsVarDefined.java | 0 .../functions/TestJavascriptFunction.java | 0 .../TestJavascriptFunctionWithRhino.java | 0 .../jmeter/functions/TestJexl2Function.java | 0 .../jmeter/functions/TestJexl3Function.java | 0 .../jmeter/functions/TestMachineIPName.java | 0 .../functions/TestRandomFromMultipleVars.java | 0 .../jmeter/functions/TestRegexFunction.java | 0 .../functions/TestSamplerNameFunction.java | 0 .../jmeter/functions/TestSetProperty.java | 0 .../jmeter/functions/TestSimpleFunctions.java | 6 +- .../jmeter/functions/TestStringtoFile.java | 0 .../jmeter/functions/TestTimeFunction.java | 0 .../functions/TestTimeRandomDateFunction.java | 0 .../functions/TestTimeShiftFunction.java | 0 .../jmeter/functions/TestUrlEncodeDecode.java | 0 .../apache/jmeter/functions/VariableTest.java | 0 .../functions}/testfiles/BeanShellTest.bsh | 0 .../jmeter/functions}/testfiles/SFFTest1.txt | 0 .../jmeter/functions}/testfiles/SFFTest2.txt | 0 .../jmeter/functions}/testfiles/SFFTest3.txt | 0 .../jmeter/functions}/testfiles/XPathTest.xml | 0 .../functions}/testfiles/XPathTest2.xml | 0 .../jmeter/functions}/testfiles/testblank.csv | 0 .../testfiles/unit/CSVReadFunctionTest.csv | 0 .../testfiles/unit/FunctionsPackageTest.csv | 0 .../jmeter/functions/xpathfilecontainer.xml | 7 ++ .../jmeter/visualizers/GenerateTreeGui.java | 0 .../cli/avalon/AbstractParserControl.java | 0 .../commons/cli/avalon/CLArgsParser.java | 0 .../apache/commons/cli/avalon/CLOption.java | 0 .../cli/avalon/CLOptionDescriptor.java | 0 .../org/apache/commons/cli/avalon/CLUtil.java | 0 .../commons/cli/avalon/ParserControl.java | 0 .../org/apache/commons/cli/avalon/Token.java | 0 .../org/apache/jorphan/collections/Data.java | 0 .../apache/jorphan/collections/HashTree.java | 0 .../collections/HashTreeTraverser.java | 0 .../jorphan/collections/ListedHashTree.java | 0 .../jorphan/collections/SearchByClass.java | 0 .../documentation/VisibleForTesting.java | 0 .../org/apache/jorphan/exec/KeyToolUtils.java | 0 .../org/apache/jorphan/exec/StreamCopier.java | 0 .../apache/jorphan/exec/SystemCommand.java | 0 .../jorphan/gui/AbstractTreeTableModel.java | 0 .../org/apache/jorphan/gui/ComponentUtil.java | 0 .../jorphan/gui/DefaultTreeTableModel.java | 0 .../org/apache/jorphan/gui/GuiUtils.java | 0 .../apache/jorphan/gui/JLabeledChoice.java | 0 .../org/apache/jorphan/gui/JLabeledField.java | 0 .../jorphan/gui/JLabeledPasswordField.java | 0 .../apache/jorphan/gui/JLabeledTextArea.java | 0 .../apache/jorphan/gui/JLabeledTextField.java | 0 .../org/apache/jorphan/gui/JTreeTable.java | 0 .../org/apache/jorphan/gui/MenuScroller.java | 0 .../jorphan/gui/MinMaxLongRenderer.java | 0 .../apache/jorphan/gui/NumberRenderer.java | 0 .../apache/jorphan/gui/ObjectTableModel.java | 0 .../apache/jorphan/gui/ObjectTableSorter.java | 0 .../org/apache/jorphan/gui/RateRenderer.java | 0 .../org/apache/jorphan/gui/RendererUtils.java | 0 .../jorphan/gui/RightAlignRenderer.java | 0 .../apache/jorphan/gui/TreeTableModel.java | 0 .../jorphan/gui/layout/VerticalLayout.java | 0 .../java}/org/apache/jorphan/io/TextFile.java | 0 .../jorphan/logging/LoggingManager.java | 0 .../jorphan/logging/Slf4jLogkitLogger.java | 0 .../apache/jorphan/math/NumberComparator.java | 0 .../apache/jorphan/math/StatCalculator.java | 0 .../jorphan/math/StatCalculatorInteger.java | 0 .../jorphan/math/StatCalculatorLong.java | 0 .../apache/jorphan/reflect/ClassFilter.java | 0 .../apache/jorphan/reflect/ClassFinder.java | 0 .../apache/jorphan/reflect/ClassTools.java | 0 .../org/apache/jorphan/reflect/Functor.java | 0 .../apache/jorphan/test/UnitTestManager.java | 0 .../org/apache/jorphan/util/Converter.java | 0 .../org/apache/jorphan/util/HeapDumper.java | 0 .../org/apache/jorphan/util/JMeterError.java | 0 .../apache/jorphan/util/JMeterException.java | 0 .../jorphan/util/JMeterStopTestException.java | 0 .../util/JMeterStopTestNowException.java | 0 .../util/JMeterStopThreadException.java | 0 .../org/apache/jorphan/util/JOrphanUtils.java | 0 .../org/apache/jorphan/util/ThreadDumper.java | 0 .../org/apache/jorphan/util/XMLBuffer.java | 0 .../main/java}/org/apache/log/ContextMap.java | 0 .../main/java}/org/apache/log/LogEvent.java | 0 .../main/java}/org/apache/log/LogTarget.java | 0 .../main/java}/org/apache/log/Logger.java | 0 .../main/java}/org/apache/log/Priority.java | 0 .../apache/commons/cli/avalon/package.html | 0 .../org/apache/jorphan/io/TextFileSpec.groovy | 0 .../apache/jorphan/util/ConverterSpec.groovy | 0 .../commons/cli/avalon/ClutilTestCase.java | 0 .../jorphan/collections/PackageTest.java | 0 .../apache/jorphan/exec/TestKeyToolUtils.java | 0 .../jorphan/gui/MinMaxLongRendererTest.java | 0 .../jorphan/gui/ObjectTableModelTest.java | 0 .../jorphan/gui/ObjectTableSorterTest.java | 0 .../jorphan/gui/TableModelEventBacker.java | 0 .../jorphan/math/TestStatCalculator.java | 0 .../jorphan/reflect/TestClassTools.java | 0 .../apache/jorphan/util/TestConverter.java | 0 .../apache/jorphan/util/TestJorphanUtils.java | 0 .../org/apache/jmeter/DynamicClassLoader.java | 0 .../java}/org/apache/jmeter/NewDriver.java | 0 .../apache/jmeter/util/ShutdownClient.java | 7 +- .../apache/jmeter}/jmeter_as_ascii_art.txt | 10 +- .../protocol/ftp/config/gui/FtpConfigGui.java | 0 .../ftp/control/gui/FtpTestSamplerGui.java | 0 .../protocol/ftp/sampler/FTPSampler.java | 0 .../http/api/auth/DigestParameters.java | 0 .../http/config/MultipartUrlConfig.java | 0 .../http/config/gui/HttpDefaultsGui.java | 0 .../http/config/gui/UrlConfigGui.java | 0 .../protocol/http/control/AuthManager.java | 0 .../protocol/http/control/Authorization.java | 0 .../protocol/http/control/CacheManager.java | 0 .../jmeter/protocol/http/control/Cookie.java | 0 .../protocol/http/control/CookieHandler.java | 0 .../protocol/http/control/CookieManager.java | 0 .../http/control/DNSCacheManager.java | 0 .../control/DelegatingKerberosScheme.java | 0 .../http/control/DelegatingSPNegoScheme.java | 0 .../control/DynamicKerberosSchemeFactory.java | 0 .../control/DynamicSPNegoSchemeFactory.java | 0 .../http/control/HC4CookieHandler.java | 0 .../jmeter/protocol/http/control/Header.java | 0 .../protocol/http/control/HeaderManager.java | 0 .../http/control/HttpMirrorControl.java | 0 .../http/control/HttpMirrorServer.java | 0 .../http/control/HttpMirrorThread.java | 0 .../http/control/KerberosManager.java | 0 .../http/control/RecordingController.java | 0 .../protocol/http/control/StaticHost.java | 0 .../http/control/gui/AjpSamplerGui.java | 0 .../control/gui/HttpMirrorControlGui.java | 0 .../http/control/gui/HttpTestSampleGui.java | 0 .../http/control/gui/RecordController.java | 0 .../protocol/http/curl/BasicCurlParser.java | 0 .../jmeter/protocol/http/gui/AuthPanel.java | 0 .../protocol/http/gui/CacheManagerGui.java | 0 .../jmeter/protocol/http/gui/CookiePanel.java | 0 .../protocol/http/gui/DNSCachePanel.java | 0 .../protocol/http/gui/HTTPArgumentsPanel.java | 0 .../protocol/http/gui/HTTPFileArgsPanel.java | 0 .../jmeter/protocol/http/gui/HeaderPanel.java | 0 .../gui/action/ParseCurlCommandAction.java | 0 .../http/modifier/AnchorModifier.java | 0 .../http/modifier/RegExUserParameters.java | 0 .../http/modifier/URLRewritingModifier.java | 0 .../http/modifier/gui/AnchorModifierGui.java | 0 .../modifier/gui/RegExUserParametersGui.java | 0 .../modifier/gui/URLRewritingModifierGui.java | 0 .../protocol/http/parser/BaseParser.java | 0 .../parser/CSSParseExceptionCallback.java | 0 .../protocol/http/parser/CssParser.java | 0 .../http/parser/CssParserCacheLoader.java | 0 .../http/parser/HTMLParseException.java | 0 .../protocol/http/parser/HTMLParser.java | 0 .../http/parser/HtmlParsingUtils.java | 0 .../protocol/http/parser/JTidyHTMLParser.java | 0 .../http/parser/JsoupBasedHtmlParser.java | 0 .../http/parser/LagartoBasedHtmlParser.java | 0 .../parser/LinkExtractorParseException.java | 0 .../http/parser/LinkExtractorParser.java | 0 .../http/parser/RegexpHTMLParser.java | 0 .../protocol/http/parser/URLCollection.java | 0 .../protocol/http/parser/URLString.java | 0 .../http/proxy/AbstractSamplerCreator.java | 0 .../jmeter/protocol/http/proxy/Daemon.java | 0 .../http/proxy/DefaultSamplerCreator.java | 0 .../http/proxy/FormCharSetFinder.java | 0 .../protocol/http/proxy/HttpReplyHdr.java | 0 .../protocol/http/proxy/HttpRequestHdr.java | 0 .../jmeter/protocol/http/proxy/Proxy.java | 0 .../protocol/http/proxy/ProxyControl.java | 0 .../protocol/http/proxy/SamplerCreator.java | 0 .../http/proxy/SamplerCreatorFactory.java | 0 .../http/proxy/ServerAliasKeyManager.java | 0 .../http/proxy/gui/ProxyControlGui.java | 0 .../http/proxy/gui/RecorderDialog.java | 0 .../http/sampler/AccessLogSampler.java | 0 .../sampler/AccessLogSamplerBeanInfo.java | 0 .../protocol/http/sampler/AjpSampler.java | 0 .../http/sampler/HTTPAbstractImpl.java | 0 .../protocol/http/sampler/HTTPFileImpl.java | 0 .../protocol/http/sampler/HTTPHC4Impl.java | 0 .../http/sampler/HTTPHCAbstractImpl.java | 0 .../protocol/http/sampler/HTTPJavaImpl.java | 0 .../http/sampler/HTTPSampleResult.java | 0 .../protocol/http/sampler/HTTPSampler.java | 0 .../http/sampler/HTTPSamplerBase.java | 0 .../http/sampler/HTTPSamplerBaseBeanInfo.java | 0 .../sampler/HTTPSamplerBaseConverter.java | 0 .../http/sampler/HTTPSamplerFactory.java | 0 .../http/sampler/HTTPSamplerProxy.java | 0 .../sampler/HttpClientDefaultParameters.java | 0 .../protocol/http/sampler/HttpWebdav.java | 0 .../protocol/http/sampler/PostWriter.java | 0 .../protocol/http/sampler/PutWriter.java | 0 .../http/sampler/ResourcesDownloader.java | 0 .../sampler/hc/LaxDeflateInputStream.java | 0 .../http/sampler/hc/LaxGZIPInputStream.java | 0 .../LazyLayeredConnectionSocketFactory.java | 0 .../protocol/http/util/Base64Encoder.java | 0 .../protocol/http/util/ConversionUtils.java | 0 .../DirectAccessByteArrayOutputStream.java | 0 .../protocol/http/util/EncoderCache.java | 0 .../protocol/http/util/HTTPArgument.java | 0 .../protocol/http/util/HTTPConstants.java | 0 .../http/util/HTTPConstantsInterface.java | 0 .../protocol/http/util/HTTPFileArg.java | 0 .../protocol/http/util/HTTPFileArgs.java | 0 .../http/util/HTTPResultConverter.java | 0 .../http/util/LoopbackHTTPSocket.java | 0 .../SlowHCPlainConnectionSocketFactory.java | 0 .../protocol/http/util/accesslog/Filter.java | 0 .../http/util/accesslog/Generator.java | 0 .../http/util/accesslog/LogFilter.java | 0 .../http/util/accesslog/LogParser.java | 0 .../protocol/http/util/accesslog/NVPair.java | 0 .../accesslog/OrderPreservingLogParser.java | 0 .../http/util/accesslog/SessionFilter.java | 0 .../util/accesslog/SharedTCLogParser.java | 0 .../util/accesslog/StandardGenerator.java | 0 .../http/util/accesslog/TCLogParser.java | 0 .../http/visualizers/RequestViewHTTP.java | 0 .../AccessLogSamplerResources.properties | 0 .../AccessLogSamplerResources_es.properties | 0 .../AccessLogSamplerResources_fr.properties | 0 ...AccessLogSamplerResources_pt_BR.properties | 0 .../AccessLogSamplerResources_tr.properties | 0 ...AccessLogSamplerResources_zh_TW.properties | 0 .../http/control/DNSCacheManagerSpec.groovy | 0 .../protocol/http/util/HTTPUtilsSpec.groovy | 0 .../jmeter/curl/BasicCurlParserTest.java | 0 .../action/ParseCurlCommandActionTest.java | 0 .../http/config/MultipartUrlConfigTest.java | 0 .../protocol/http/config/UrlConfigTest.java | 0 .../http/control/TestAuthManager.java | 0 .../TestAuthManagerThreadIteration.java | 0 .../http/control/TestAuthorization.java | 0 .../http/control/TestCacheManagerBase.java | 0 .../http/control/TestCacheManagerHC4.java | 0 .../TestCacheManagerThreadIteration.java | 0 .../TestCacheManagerUrlConnection.java | 0 .../TestCacheManagerUrlConnectionBase.java | 0 .../TestCookieManagerThreadIteration.java | 0 .../http/control/TestHC4CookieManager.java | 0 .../http/control/TestHTTPMirrorThread.java | 0 .../control/gui/TestHttpTestSampleGui.java | 0 .../http/modifier/TestAnchorModifier.java | 12 +- .../modifier/TestURLRewritingModifier.java | 0 .../http/parser/NotReusableParser.java | 0 .../protocol/http/parser/ReusableParser.java | 0 .../protocol/http/parser/TestBaseParser.java | 0 .../http/parser/TestBug60842HtmlParser.java | 0 .../protocol/http/parser/TestCssParser.java | 0 .../protocol/http/parser/TestHTMLParser.java | 33 +++-- .../http/parser/TestHtmlParsingUtils.java | 0 .../http/proxy/NonGuiProxySample.java | 0 .../http/proxy/TestHttpRequestHdr.java | 0 .../protocol/http/proxy/TestProxyControl.java | 0 .../http/sampler/HTTPNullSampler.java | 0 .../protocol/http/sampler/HTTPSampler3.java | 0 .../http/sampler/NullURLConnection.java | 0 .../protocol/http/sampler/PackageTest.java | 0 .../protocol/http/sampler/PostWriterTest.java | 0 .../protocol/http/sampler/PutWriterTest.java | 0 .../http/sampler/SamplingNamingTest.java | 0 .../http/sampler/TestHTTPHC4Impl.java | 0 .../http/sampler/TestHTTPSamplers.java | 0 ...stHTTPSamplersAgainstHttpMirrorServer.java | 0 .../protocol/http/sampler/TestHttpWebdav.java | 0 .../sampler/TestSerializedHTTPSampler.java | 7 +- .../protocol/http/util/TestHTTPArgument.java | 0 .../protocol/http/util/TestHTTPFileArg.java | 0 .../protocol/http/util/TestHTTPFileArgs.java | 0 .../http/util/accesslog/TestLogFilter.java | 0 .../util/accesslog/TestSessionFilter.java | 0 .../http/util/accesslog/TestTCLogParser.java | 0 .../http/visualizers/RequestViewHTTPTest.java | 0 .../jmeter/testelement/TestHeaderManager.java | 0 ...checkThatFilesAreReadRelativeToBaseDir.txt | 0 .../testfiles/HTMLParserTestCase.all | 0 .../testfiles/HTMLParserTestCase.html | 0 .../testfiles/HTMLParserTestCase.set | 0 .../testfiles/HTMLParserTestCase2.html | 0 .../testfiles/HTMLParserTestCase3.html | 0 .../testfiles/HTMLParserTestCaseBase.all | 0 .../testfiles/HTMLParserTestCaseBase.set | 0 .../testfiles/HTMLParserTestCaseFrames.all | 0 .../testfiles/HTMLParserTestCaseFrames.html | 0 .../testfiles/HTMLParserTestCaseFrames.set | 0 .../HTMLParserTestCaseWithBaseHRef.html | 0 .../HTMLParserTestCaseWithBaseHRef2.html | 0 .../HTMLParserTestCaseWithComments.html | 0 .../HTMLParserTestCaseWithConditional1.html | 0 .../HTMLParserTestCaseWithConditional1_FF.all | 0 ...HTMLParserTestCaseWithConditional1_IE6.all | 0 ...HTMLParserTestCaseWithConditional1_IE7.all | 0 ...HTMLParserTestCaseWithConditional1_IE8.all | 0 .../HTMLParserTestCaseWithConditional2.html | 0 .../HTMLParserTestCaseWithConditional2_FF.all | 0 ...HTMLParserTestCaseWithConditional2_IE7.all | 0 ...HTMLParserTestCaseWithConditional2_IE8.all | 0 ...HTMLParserTestCaseWithConditional2_IE9.all | 0 .../HTMLParserTestCaseWithConditional3.html | 0 .../HTMLParserTestCaseWithConditional3_FF.all | 0 ...TMLParserTestCaseWithConditional3_IE10.all | 0 ...TMLParserTestCaseWithConditional3_IE55.all | 0 ...HTMLParserTestCaseWithConditional3_IE6.all | 0 ...HTMLParserTestCaseWithMissingBaseHRef.html | 0 .../testfiles/HTMLParserTestFrames.all | 0 .../testfiles/HTMLParserTestFrames.html | 0 .../test/resources}/testfiles/HTMLScript.all | 0 .../test/resources}/testfiles/HTMLScript.html | 0 .../test/resources}/testfiles/HTMLScript.set | 0 .../protocol/java/config/JavaConfig.java | 0 .../java/config/gui/JavaConfigGui.java | 0 .../java/control/gui/BeanShellSamplerGui.java | 0 .../java/control/gui/JavaTestSamplerGui.java | 0 .../sampler/AbstractJavaSamplerClient.java | 0 .../protocol/java/sampler/BSFSampler.java | 0 .../java/sampler/BSFSamplerBeanInfo.java | 0 .../java/sampler/BeanShellSampler.java | 0 .../protocol/java/sampler/JSR223Sampler.java | 0 .../java/sampler/JSR223SamplerBeanInfo.java | 0 .../protocol/java/sampler/JavaSampler.java | 0 .../java/sampler/JavaSamplerClient.java | 0 .../java/sampler/JavaSamplerContext.java | 0 .../jmeter/protocol/java/test/JavaTest.java | 0 .../jmeter/protocol/java/test/SleepTest.java | 0 .../sampler/BSFSamplerResources.properties | 0 .../sampler/BSFSamplerResources_fr.properties | 0 .../BSFSamplerResources_zh_CN.properties | 0 .../sampler/JSR223SamplerResources.properties | 0 .../JSR223SamplerResources_fr.properties | 0 .../JSR223SamplerResources_zh_CN.properties | 0 .../jdbc/AbstractJDBCTestElement.java | 0 .../jdbc/JDBCTestElementBeanInfoSupport.java | 0 .../jdbc/config/DataSourceElement.java | 0 .../config/DataSourceElementBeanInfo.java | 0 .../jdbc/processor/AbstractJDBCProcessor.java | 0 .../jdbc/processor/JDBCPostProcessor.java | 0 .../processor/JDBCPostProcessorBeanInfo.java | 0 .../jdbc/processor/JDBCPreProcessor.java | 0 .../processor/JDBCPreProcessorBeanInfo.java | 0 .../protocol/jdbc/sampler/JDBCSampler.java | 0 .../jdbc/sampler/JDBCSamplerBeanInfo.java | 0 .../DataSourceElementResources.properties | 0 .../DataSourceElementResources_es.properties | 0 .../DataSourceElementResources_fr.properties | 0 ...ataSourceElementResources_pt_BR.properties | 0 .../DataSourceElementResources_tr.properties | 0 ...ataSourceElementResources_zh_TW.properties | 0 .../JDBCPostProcessorResources.properties | 0 .../JDBCPostProcessorResources_fr.properties | 0 ...DBCPostProcessorResources_zh_CN.properties | 0 .../JDBCPreProcessorResources.properties | 0 .../JDBCPreProcessorResources_fr.properties | 0 ...JDBCPreProcessorResources_zh_CN.properties | 0 .../sampler/JDBCSamplerResources.properties | 0 .../JDBCSamplerResources_es.properties | 0 .../JDBCSamplerResources_fr.properties | 0 .../JDBCSamplerResources_pt_BR.properties | 0 .../JDBCSamplerResources_tr.properties | 0 .../JDBCSamplerResources_zh_TW.properties | 0 .../jdbc/sampler/JDBCSamplerSpec.groovy | 0 .../org/apache/jmeter/protocol/jms/Utils.java | 0 .../protocol/jms/client/ClientPool.java | 0 .../jms/client/InitialContextFactory.java | 0 .../jmeter/protocol/jms/client/Publisher.java | 0 .../jms/client/ReceiveSubscriber.java | 0 .../jms/control/gui/JMSPropertiesPanel.java | 0 .../jms/control/gui/JMSPublisherGui.java | 0 .../jms/control/gui/JMSSamplerGui.java | 0 .../jms/control/gui/JMSSubscriberGui.java | 0 .../protocol/jms/sampler/BaseJMSSampler.java | 0 .../jms/sampler/FixedQueueExecutor.java | 0 .../protocol/jms/sampler/JMSProperties.java | 0 .../protocol/jms/sampler/JMSProperty.java | 0 .../protocol/jms/sampler/JMSSampler.java | 0 .../protocol/jms/sampler/MessageAdmin.java | 0 .../jms/sampler/PublisherSampler.java | 0 .../protocol/jms/sampler/QueueExecutor.java | 0 .../jmeter/protocol/jms/sampler/Receiver.java | 0 .../jms/sampler/SubscriberSampler.java | 0 .../jms/sampler/TemporaryQueueExecutor.java | 0 .../sampler/TimeoutEnabledQueueRequestor.java | 0 .../sampler/render/BinaryMessageRenderer.java | 0 .../protocol/jms/sampler/render/FileKey.java | 0 .../sampler/render/MapMessageRenderer.java | 0 .../jms/sampler/render/MessageRenderer.java | 0 .../sampler/render/ObjectMessageRenderer.java | 0 .../jms/sampler/render/RendererFactory.java | 0 .../jms/sampler/render/Renderers.java | 0 .../sampler/render/TextMessageRenderer.java | 0 .../jms/sampler/render/package-info.java | 0 .../jms/sampler/PublisherSamplerTest.java | 0 .../render/BinaryMessageRendererTest.java | 0 .../sampler/render/MessageRendererTest.java | 0 .../render/ObjectMessageRendererTest.java | 0 .../protocol/jms/sampler/render/Person.java | 0 .../render/TextMessageRendererTest.java | 0 .../protocol/jms/sampler/render/cp1252.txt | 0 .../protocol/jms/sampler/render/noVar.txt | 0 .../jms/sampler/render/object_cp1252.xml | 0 .../jms/sampler/render/object_doe.xml | 0 .../sampler/render/object_prolog_cp1252.xml | 0 .../jms/sampler/render/object_utf8.xml | 0 .../protocol/jms/sampler/render/oneVar.txt | 0 .../protocol/jms/sampler/render/utf8.txt | 0 .../main/java}/test/AfterAnnotatedTest.java | 0 .../main/java}/test/BeforeAnnotatedTest.java | 0 .../main/java}/test/DummyAnnotatedTest.java | 0 .../java}/test/Junit4AnnotationsTest.java | 0 .../src/main/java}/test/RerunTest.java | 0 .../src/main/java}/test/SetupTestError.java | 0 .../src/main/java}/test/SetupTestFail.java | 0 .../src/main/java}/test/TearDownTestFail.java | 0 .../src/main/java}/woolfel/DummyTestCase.java | 0 .../src/main/java}/woolfel/SubDummyTest.java | 0 .../src/main/java}/woolfel/SubDummyTest2.java | 0 .../java/control/gui/ClassFilter.java | 0 .../java/control/gui/JUnitTestSamplerGui.java | 0 .../protocol/java/sampler/JUnitSampler.java | 0 .../ldap/config/gui/LDAPArgument.java | 0 .../ldap/config/gui/LDAPArguments.java | 0 .../ldap/config/gui/LDAPArgumentsPanel.java | 0 .../ldap/config/gui/LdapConfigGui.java | 0 .../ldap/config/gui/LdapExtConfigGui.java | 0 .../control/gui/LdapExtTestSamplerGui.java | 0 .../ldap/control/gui/LdapTestSamplerGui.java | 0 .../protocol/ldap/sampler/LDAPExtSampler.java | 0 .../protocol/ldap/sampler/LDAPSampler.java | 0 .../protocol/ldap/sampler/LdapClient.java | 0 .../protocol/ldap/sampler/LdapExtClient.java | 0 .../protocol/ldap/config/gui/PackageTest.java | 0 .../protocol/mail/sampler/MailFileFolder.java | 0 .../mail/sampler/MailFileMessage.java | 0 .../protocol/mail/sampler/MailFileStore.java | 0 .../mail/sampler/MailReaderSampler.java | 0 .../sampler/gui/MailReaderSamplerGui.java | 0 .../protocol/smtp/sampler/SmtpSampler.java | 0 .../sampler/gui/SecuritySettingsPanel.java | 0 .../protocol/smtp/sampler/gui/SmtpPanel.java | 0 .../smtp/sampler/gui/SmtpSamplerGui.java | 0 .../LocalTrustStoreSSLSocketFactory.java | 0 .../sampler/protocol/SendMailCommand.java | 0 .../SynchronousTransportListener.java | 0 .../protocol/TrustAllSSLSocketFactory.java | 0 .../resources}/META-INF/javamail.providers | 0 .../mail/sampler/TestMailReaderSampler.java | 0 .../mongodb/config/MongoDBHolder.java | 0 .../mongodb/config/MongoSourceElement.java | 0 .../config/MongoSourceElementBeanInfo.java | 0 .../mongodb/mongo/EvalResultHandler.java | 0 .../protocol/mongodb/mongo/MongoDB.java | 0 .../protocol/mongodb/mongo/MongoUtils.java | 0 .../mongodb/sampler/MongoScriptRunner.java | 0 .../mongodb/sampler/MongoScriptSampler.java | 0 .../sampler/MongoScriptSamplerBeanInfo.java | 0 .../MongoSourceElementResources.properties | 0 .../MongoSourceElementResources_fr.properties | 0 .../MongoScriptSamplerResources.properties | 0 .../MongoScriptSamplerResources_fr.properties | 0 .../jmeter/protocol/system/SystemSampler.java | 0 .../protocol/system/gui/SystemSamplerGui.java | 0 .../protocol/tcp/config/gui/TCPConfigGui.java | 0 .../tcp/control/gui/TCPSamplerGui.java | 0 .../tcp/sampler/AbstractTCPClient.java | 0 .../tcp/sampler/BinaryTCPClientImpl.java | 0 .../LengthPrefixedBinaryTCPClientImpl.java | 0 .../protocol/tcp/sampler/ReadException.java | 0 .../protocol/tcp/sampler/TCPClient.java | 0 .../tcp/sampler/TCPClientDecorator.java | 0 .../protocol/tcp/sampler/TCPClientImpl.java | 0 .../protocol/tcp/sampler/TCPSampler.java | 0 .../tcp/sampler/BinaryTCPClientImplTest.java | 0 ...LengthPrefixedBinaryTCPClientImplTest.java | 0 .../tcp/sampler/TCPClientDecoratorTest.java | 0 .../jmeter/junit/spock/JMeterSpec.groovy | 117 ------------------ 1830 files changed, 242 insertions(+), 229 deletions(-) rename src/{core => bshclient/src/main/java}/org/apache/jmeter/util/BeanShellClient.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/BSFAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/BeanShellAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/CompareAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/DurationAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/HTMLAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/JSONPathAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/JSR223Assertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/LogErrorHandler.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/MD5HexAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/ResponseAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/SMIMEAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/SizeAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/SubstitutionElement.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/XMLAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/XMLSchemaAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/XPath2Assertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/XPathAssertion.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/AssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/DurationAssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/SizeAssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/XMLAssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/XMLConfPanel.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/XPath2AssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/XPath2Panel.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/XPathAssertionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/assertions/gui/XPathPanel.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/config/CSVDataSet.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/config/CSVDataSetBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/config/KeystoreConfig.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/config/KeystoreConfigBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/config/RandomVariableConfig.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/config/RandomVariableConfigBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/CriticalSectionController.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/ForeachController.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/IncludeController.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/InterleaveControl.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/ModuleController.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/OnceOnlyController.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/RandomController.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/RandomOrderController.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/SwitchController.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/ThroughputController.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/ForeachControlPanel.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/IncludeControllerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/InterleaveControlGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/ModuleControllerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/RandomControlGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/RandomOrderControllerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/SwitchControllerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/ThroughputControllerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/control/gui/TreeNodeWrapper.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/BSFPostProcessor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/BSFPostProcessorBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/BeanShellPostProcessor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/BoundaryExtractor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/DebugPostProcessor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/DebugPostProcessorBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/Extractor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/HtmlExtractor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/JSR223PostProcessor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/JSR223PostProcessorBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/JSoupExtractor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/JoddExtractor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/RegexExtractor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/XPath2Extractor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/XPathExtractor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/gui/RegexExtractorGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/gui/XPathExtractorGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/BSFPreProcessor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/BSFPreProcessorBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/BeanShellPreProcessor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/CounterConfig.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/JSR223PreProcessor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/JSR223PreProcessorBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/SampleTimeout.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/UserParameters.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/gui/CounterConfigGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/gui/SampleTimeoutGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/modifiers/gui/UserParametersGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/reporters/MailerModel.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/reporters/MailerResultCollector.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/sampler/DebugSampler.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/sampler/DebugSamplerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/sampler/TestAction.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/sampler/gui/TestActionGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/thinktime/DefaultThinkTimeCreator.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/BSFTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/BSFTimerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/BeanShellTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/ConstantThroughputTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/ConstantTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/GaussianRandomTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/JSR223Timer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/JSR223TimerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/PoissonRandomTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/RandomTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/SyncTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/SyncTimerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/UniformRandomTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/gui/ConstantTimerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/poissonarrivals/DurationProvider.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/poissonarrivals/EventProducer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/timers/poissonarrivals/ThroughputProvider.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/validation/ComponentTreeClonerForValidation.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/AccumListener.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/AssertionVisualizer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/AxisGraph.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/BSFListener.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/BSFListenerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/BarGraph.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/BeanShellListener.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/ComparisonVisualizer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/Graph.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/GraphListener.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/GraphVisualizer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/JSR223Listener.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/JSR223ListenerBeanInfo.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/LineGraph.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/MailerVisualizer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/PropertyControlGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsCssJQuery.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsDocument.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsHTML.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsHTMLWithEmbedded.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsJSON.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsRegexp.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsText.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsXML.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsXPath.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderAsXPath2.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RenderInBrowser.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RequestPanel.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RequestView.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RequestViewRaw.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RespTimeGraphChart.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RespTimeGraphLineBean.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/ResultRenderer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/SamplerResultTab.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/SearchTextExtension.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/SearchTreePanel.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/SearchableTreeNode.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/SimpleDataWriter.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/StatGraphProperties.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/StatGraphVisualizer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/StatVisualizer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/SummaryReport.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/TableVisualizer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/TreeNodeRenderer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/BackendListener.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/BackendListenerClient.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/BackendListenerContext.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/BackendListenerGui.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/ErrorMetric.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/SamplerMetric.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/UserMetric.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/WindowMode.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/graphite/GraphiteMetricsSender.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/graphite/SocketConnectionInfos.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStream.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbMetricsSender.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java (100%) rename src/components/{ => src/main/java}/org/apache/jmeter/visualizers/utils/Colors.java (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/BSFAssertionResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/BSFAssertionResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/BSFAssertionResources_pl.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/BSFAssertionResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/BSFAssertionResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/CompareAssertionResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/CompareAssertionResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/CompareAssertionResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/JSR223AssertionResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/JSR223AssertionResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/assertions/package.html (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/CSVDataSetResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/CSVDataSetResources_de.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/CSVDataSetResources_es.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/CSVDataSetResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/CSVDataSetResources_pl.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/CSVDataSetResources_tr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/CSVDataSetResources_zh_TW.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/KeystoreConfigResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/KeystoreConfigResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/KeystoreConfigResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/RandomVariableConfigResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/RandomVariableConfigResources_es.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/RandomVariableConfigResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/RandomVariableConfigResources_pl.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/RandomVariableConfigResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/config/RandomVariableConfigResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BSFPostProcessorResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BSFPostProcessorResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BSFPostProcessorResources_pl.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BSFPostProcessorResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BSFPostProcessorResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BeanShellPostProcessorResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pl.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/BeanShellPostProcessorResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/DebugPostProcessorResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/DebugPostProcessorResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/DebugPostProcessorResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/DebugPostProcessorResources_tr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/DebugPostProcessorResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/JSR223PostProcessorResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/extractor/JSR223PostProcessorResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BSFPreProcessorResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BSFPreProcessorResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BSFPreProcessorResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/JSR223PreProcessorResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/JSR223PreProcessorResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/modifiers/JSR223PreProcessorResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/sampler/DebugSamplerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/sampler/DebugSamplerResources_de.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/sampler/DebugSamplerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/sampler/DebugSamplerResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/sampler/DebugSamplerResources_tr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/sampler/DebugSamplerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/BSFTimerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/BSFTimerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/BSFTimerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/BeanShellTimerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/BeanShellTimerResources_de.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/BeanShellTimerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/BeanShellTimerResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/BeanShellTimerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/ConstantThroughputTimerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/ConstantThroughputTimerResources_es.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/ConstantThroughputTimerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/ConstantThroughputTimerResources_ja.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/ConstantThroughputTimerResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/ConstantThroughputTimerResources_tr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_TW.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/JSR223TimerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/JSR223TimerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/JSR223TimerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/SyncTimerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/SyncTimerResources_de.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/SyncTimerResources_es.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/SyncTimerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/SyncTimerResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/SyncTimerResources_tr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/SyncTimerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BSFListenerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BSFListenerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BSFListenerResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BSFListenerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BeanShellListenerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BeanShellListenerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BeanShellListenerResources_pt_BR.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/BeanShellListenerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/JSR223ListenerResources.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/JSR223ListenerResources_fr.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/JSR223ListenerResources_zh_CN.properties (100%) rename src/components/{ => src/main/resources}/org/apache/jmeter/visualizers/utils/colors.properties (100%) rename {test/src => src/components/src/test/groovy}/org/apache/jmeter/assertions/MD5HexAssertionSpec.groovy (100%) rename {test/src => src/components/src/test/groovy}/org/apache/jmeter/assertions/gui/AssertionGuiSpec.groovy (100%) rename {test/src => src/components/src/test/groovy}/org/apache/jmeter/control/RandomOrderControllerSpec.groovy (100%) rename {test/src => src/components/src/test/groovy}/org/apache/jmeter/control/RunTimeSpec.groovy (100%) rename {test/src => src/components/src/test/groovy}/org/apache/jmeter/control/ThroughputControllerSpec.groovy (100%) rename {test/src => src/components/src/test/groovy}/org/apache/jmeter/extractor/BoundaryExtractorSpec.groovy (100%) rename {test/src => src/components/src/test/groovy}/org/apache/jmeter/extractor/JoddExtractorSpec.groovy (100%) rename {test/src => src/components/src/test/groovy}/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererSpec.groovy (100%) rename {test/src => src/components/src/test/groovy}/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/JMeterVersionTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/DurationAssertionTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/ResponseAssertionTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/SMIMEAssertionTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/SizeAssertionTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/TestJSONPathAssertion.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/TestJSONPathAssertionGui.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/XPath2AssertionTest.java (91%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/XPathAssertionTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/assertions/XmlAssertionTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/config/TestCVSDataSet.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/config/TestRandomVariableConfig.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/config/gui/TestArgumentsPanel.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/control/TestGenericController.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/control/TestIfController.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/control/TestInterleaveControl.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/control/TestLoopController.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/control/TestOnceOnlyController.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/control/TestRandomController.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/control/TestTransactionController.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/control/TestWhileController.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/extractor/TestHtmlExtractorJodd.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/extractor/TestJSONPostProcessor.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/extractor/TestRegexExtractor.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/extractor/TestXPath2Extractor.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/extractor/TestXPathExtractor.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/gui/action/TestSave.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/gui/action/template/TestTemplateManager.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/reporters/TestResultSaver.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/timers/ConstantThroughputTimerTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/timers/SyncTimerTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/timers/TimerServiceTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/visualizers/TestRenderAsJson.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/visualizers/TestSampleCompareTo.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/visualizers/TestSamplingStatCalculator.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java (100%) rename {test/src => src/components/src/test/java}/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java (100%) rename {test => src/components/src/test}/resources/org/apache/jmeter/assertions/email.pem (100%) rename {test => src/components/src/test}/resources/org/apache/jmeter/assertions/signed_email.eml (100%) rename {test => src/components/src/test}/resources/org/apache/jmeter/gui/action/template/invalidTemplates.xml (100%) rename {test => src/components/src/test}/resources/org/apache/jmeter/gui/action/template/validTemplates.xml (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/JMeter.java (99%) rename src/core/{ => src/main/java}/org/apache/jmeter/ProxyAuthenticator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/SplashScreen.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/assertions/Assertion.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/assertions/AssertionResult.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/assertions/CompareAssertionResult.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/Argument.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/Arguments.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/ConfigElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/ConfigTestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/LoginConfig.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/gui/AbstractConfigGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/gui/ArgumentsPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/gui/LoginConfigGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/gui/ObsoleteGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/gui/RowDetailDialog.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/config/gui/SimpleConfigGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/Controller.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/GenericController.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/IfController.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/IteratingController.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/LoopController.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/NextIsNullException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/ReplaceableController.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/RunTime.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/TestFragmentController.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/TransactionController.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/TransactionSampler.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/WhileController.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/AbstractControllerGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/IfControllerPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/LogicControllerGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/LoopControlPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/RunTimeGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/TestFragmentControllerGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/TestPlanGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/TransactionControllerGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/WhileControllerGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/control/gui/WorkBenchGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/ClientJMeterEngine.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/ConvertListeners.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/DistributedRunner.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/JMeterEngine.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/JMeterEngineException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/PreCompiler.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/RemoteJMeterEngine.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/StandardJMeterEngine.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/TreeCloner.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/TreeClonerNoTimer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/TurnElementsOn.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/event/LoopIterationEvent.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/event/LoopIterationListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/package-info.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/AbstractTransformer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/CompoundVariable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/ConfigMergabilityIndicator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/FunctionParser.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/NoConfigMerge.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/NoThreadClone.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/SimpleVariable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/UndoVariableReplacement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/ValueReplacer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/engine/util/ValueTransformer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/exceptions/IllegalUserActionException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/functions/AbstractFunction.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/functions/Function.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/functions/InvalidVariableException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/functions/gui/FunctionHelper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/ClearGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/CommentPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/GUIFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/GUIMenuSortOrder.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/GlobalUndoableEdit.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/GuiPackage.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/HtmlReportAction.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/HtmlReportUI.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/JMeterFileFilter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/JMeterGUIComponent.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/LoggerPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/MainFrame.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/NamePanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/OnErrorPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/Replaceable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/SavePropertyDialog.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/Searchable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/ServerPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/SimpleCompoundEdit.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/Stoppable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/TestPlanListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/TreeState.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/UndoHistory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/UndoHistoryItem.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/UnsharedComponent.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/AboutCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/AbstractAction.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/AbstractActionWithNoRunningTest.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/ActionNames.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/ActionRouter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/AddParent.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/AddToTree.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/ApplyNamingConvention.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/ChangeLanguage.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/ChangeParent.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/CheckDirty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Clear.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Close.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/CollapseExpand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Command.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/CompileJSR223TestElements.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Copy.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/CreateFunctionDialog.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Cut.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Duplicate.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/EditCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/EnableComponent.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/ExitCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Help.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/HtmlReportGenerator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/KeyStrokes.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Load.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/LoadDraggedFile.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/LoadRecentProject.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/LogLevelCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/LookAndFeelCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Move.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/OpenLinkAction.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Paste.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/RawTextSearcher.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/RegexpSearcher.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/RemoteStart.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Remove.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/ResetSearchCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Restart.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/RevertProject.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/SSLManagerCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Save.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/SaveBeforeRun.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/SaveGraphics.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/SchematicView.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/SearchTreeCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/SearchTreeDialog.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Searcher.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/SelectTemplatesDialog.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/Start.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/StopStoppables.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/TemplatesCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/TreeNodeNamingPolicy.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/UndoCommand.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/What.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/ZoomInOut.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/template/Template.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/template/TemplateManager.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/thinktime/ThinkTimeCreator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/logging/GuiLogEventAppender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/logging/GuiLogEventBus.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/logging/GuiLogEventListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/logging/LogEventObject.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/plugin/MenuCreator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/tree/JMeterCellRenderer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/tree/JMeterTreeListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/tree/JMeterTreeModel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/tree/JMeterTreeNode.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/tree/NamedTreeNode.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/CheckBoxPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/EscapeDialog.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/FileDialoger.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/FileListPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/FilePanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/FilePanelEntry.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/FocusRequester.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/HorizontalPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/IconToolbarBean.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/JDateField.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/JLabeledRadioI18N.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/JMeterColor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/JMeterMenuBar.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/JMeterToolBar.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/JSyntaxTextArea.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/JTextScrollPane.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/MenuFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/MenuInfo.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/MenuSeparatorInfo.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/NumberFieldErrorListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/PowerTableModel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/TextAreaCellRenderer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/TextBoxDialoger.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/TristateCheckBox.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/TristateState.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/gui/util/VerticalPanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/plugin/JMeterPlugin.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/plugin/PluginManager.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/processor/PostProcessor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/processor/PreProcessor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/config/ConfigurationException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/config/ConfigurationUtils.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/config/ExporterConfiguration.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/config/GraphConfiguration.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/config/InstanceConfiguration.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/config/SubConfiguration.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/AbstractSampleWriter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/ControllerSamplePredicate.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/ConvertException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/Converters.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/CsvFile.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/CsvSampleReader.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/CsvSampleWriter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/DataContext.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/JsonUtil.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/Sample.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/SampleBuilder.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/SampleComparator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/SampleException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/SampleMetaDataParser.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/SampleMetadata.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/SamplePredicate.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/SampleSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/SampleWriter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/StringConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/core/TimeHelper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/AbstractDataExporter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/DataExporter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/ExportException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/GenerationException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/JsonExporter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/JsonizerVisitor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/ReportGenerator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/SamplingStatistic.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/dashboard/TemplateVisitor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/AbstractSampleConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/AbstractSampleProcessor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/AbstractSampleSource.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/AggregateConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/Aggregator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/AggregatorFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ApdexSummaryData.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ApdexThresholdsInfo.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ChannelContext.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/CsvFileSampleSource.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ExternalSampleSorter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/FieldSampleComparator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/FilterConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/Job.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ListResultData.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/MapResultData.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/MaxAggregator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/MaxAggregatorFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/MeanAggregator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/MeanAggregatorFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/MedianAggregatorFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/MinAggregator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/MinAggregatorFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/PercentileAggregator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ResultData.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ResultDataVisitor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/SampleConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/SampleContext.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/SampleIndexer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/SampleProcessor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/SampleProducer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/SampleSource.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/SampleWriterConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/StatisticsSummaryData.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/SumAggregator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/SumAggregatorFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/TaggerConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ThresholdSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/TimeRateAggregator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/ValueResultData.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/CountValueSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/GraphKeysSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/GraphSeriesSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/GraphValueSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/GroupData.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/GroupInfo.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/SeriesData.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/SuccessfulElapsedTimeValueSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/ConnectTimeOverTimeGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/report/utils/MetricUtils.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/AbstractListenerElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/ResultAction.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/ResultCollector.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/ResultCollectorHelper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/ResultSaver.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/Summariser.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/SummariserRunningSample.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/gui/ResultActionGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/gui/ResultSaverGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/reporters/gui/SummariserGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/rmi/AliasKeyManager.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/rmi/RMIServerSocketFactoryImpl.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/rmi/RmiUtils.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/rmi/SSLRMIClientSocketFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/rmi/SSLRMIServerSocketFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/AbstractSampleSender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/AbstractSampler.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/AsynchSampleSender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/BatchSampleSender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/Clearable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/DataStrippingSampleSender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/DiskStoreSampleSender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/Entry.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/HoldSampleSender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/Interruptible.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/RemoteListenerWrapper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/RemoteSampleListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/Remoteable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/SampleEvent.java (98%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/SampleListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/SampleMonitor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/SampleResult.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/SampleSaveConfiguration.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/SampleSender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/SampleSenderFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/Sampler.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/StandardSampleSender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/StatisticalSampleResult.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/StatisticalSampleSender.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/CSVSaveService.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/ListenerResultWrapper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/SaveGraphicsService.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/SaveService.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/ScriptWrapper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/ScriptWrapperConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/TestResultWrapper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/BooleanPropertyConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/ConversionHelp.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/HashTreeConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/IntegerPropertyConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/LongPropertyConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/MultiPropertyConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/SampleEventConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/SampleResultConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/StringPropertyConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/TestElementConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/TestElementPropertyConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/save/converters/TestResultWrapperConverter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/services/FileServer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/swing/HtmlPane.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/BeanInfoSupport.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/TestBean.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/TestBeanBeanInfo.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/TestBeanHelper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/ComboStringEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/EnumEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/FieldStringEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/FileEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/IntegerPropertyEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/LongPropertyEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/PasswordEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/SharedCustomizer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/TableEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/TextAreaEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/TypeEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testbeans/gui/WrapperEditor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/AbstractScopedAssertion.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/AbstractScopedTestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/AbstractTestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/NonTestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/OnErrorTestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/TestCloneable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/TestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/TestElementTraverser.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/TestIterationListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/TestPlan.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/TestStateListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/ThreadListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/VariablesCollection.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/WorkBench.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/AbstractProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/BooleanProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/CollectionProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/DoubleProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/FloatProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/FunctionProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/IntegerProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/JMeterProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/LongProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/MapProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/MultiProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/NullProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/NumberProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/ObjectProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/PropertyIterator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/StringProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/testelement/property/TestElementProperty.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/AbstractThreadGroup.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/JMeterContext.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/JMeterContextService.java (96%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/JMeterThread.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/JMeterThreadMonitor.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/JMeterVariables.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/ListenerNotifier.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/PostThreadGroup.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/RemoteThreadsLifeCycleListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/RemoteThreadsListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/RemoteThreadsListenerTestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/RemoteThreadsListenerWrapper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/SamplePackage.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/SetupThreadGroup.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/TestCompiler.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/TestCompilerHelper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/ThreadGroup.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/gui/PostThreadGroupGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/gui/SetupThreadGroupGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/threads/gui/ThreadGroupGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/timers/ModifiableTimer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/timers/Timer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/timers/TimerService.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/timers/gui/AbstractTimerGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/BSFBeanInfoSupport.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/BSFJavaScriptEngine.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/BSFTestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/BeanShellBeanInfoSupport.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/BeanShellInterpreter.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/BeanShellServer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/BeanShellTestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/CPSPauser.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/Calculator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/ColorHelper.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/CustomX509TrustManager.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/Document.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/JMeterTreeNodeTransferable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/JMeterUtils.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/JMeterVersion.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/JSR223BeanInfoSupport.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/JSR223TestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/JsseSSLManager.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/LocaleChangeEvent.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/LocaleChangeListener.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/NameUpdater.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/NamedObject.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/SSLManager.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/ScopePanel.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/ScriptingBeanInfoSupport.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/ScriptingTestElement.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/SlowInputStream.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/SlowOutputStream.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/SlowSSLSocket.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/SlowSocket.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/StringUtilities.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/TemplateUtil.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/TidyException.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/TrustAllSSLSocketFactory.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/XPathQueryCacheLoader.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/XPathUtil.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/util/keystore/JmeterKeyStore.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/CachingStatCalculator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/ImageVisualizer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/Printable.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/RunningSample.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/Sample.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/SamplingStatCalculator.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/TableSample.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/Visualizer.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/backend/Backend.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java (100%) rename src/core/{ => src/main/java}/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java (98%) rename src/core/{ => src/main/resources}/org/apache/jmeter/gui/action/schematic.xsl (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/gui/action/template/templates.dtd (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/gui/util/textarea.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/gui/util/theme/darcula_theme.xml (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/help.txt (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/about.down.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/about.off.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/about.on.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/about.over.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/beaker.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/clear.down.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/clear.off.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/clear.on.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/clear.over.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/clipboard.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/collapse-close.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/collapse-open.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/ear.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/feather.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/icon-apache.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/icon.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/icon_1.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/icon_error_sml.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/icon_old.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/icon_success_sml.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/icon_warning_sml.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/jmeter.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/knob.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/leafnode.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/leafnodeflip.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/meter.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/barchart.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/barchart.png-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/blue-quill.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/book-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/book.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/chart-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/chart.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/clock-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/clock.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/funnel-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/funnel.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/glasses-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/glasses.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/mglass-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/mglass.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/pencil-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/pencil.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/pin-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/pin.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/puzzle-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/puzzle.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/remote-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/remote.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/scroll-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/scroll.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/table-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/table.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/thread-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/thread.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/typewriter-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/new/typewriter.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/pipet.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/question.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/smallthread.disabled.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/smallthread.enabled.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/smallthread.idle.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/start.down.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/start.off.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/start.on.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/start.over.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/22x22/dialog-error-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/22x22/pictogram-din-w000-general.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/22x22/task-complete.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/22x22/task-recurring.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/22x22/user-offline-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/22x22/user-online-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/32x32/dialog-error-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/32x32/pictogram-din-w000-general.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/32x32/task-complete.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/32x32/task-recurring.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/32x32/user-offline-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/32x32/user-online-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/48x48/dialog-error-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/48x48/pictogram-din-w000-general.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/48x48/task-complete.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/48x48/task-recurring.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/48x48/user-offline-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/status/48x48/user-online-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/stop.down.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/stop.off.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/stop.on.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/stop.over.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/testtubes.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/thread.disabled.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/thread.enabled.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/thread.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/thread.idle.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/timer.gif (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/applications-office.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-notimer.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-startremoteall.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/arrow-right-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/color-picker-toggle.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/document-new-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/document-open-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/document-save-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/document-save-as-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/documentation.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/edit-clear-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/edit-copy-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/edit-cut-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/edit-find-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/edit-paste-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/edit-redo-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/edit-undo-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/help-contents-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/list-add-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/list-remove-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/process-stop-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/process-stop-7-shutdownremoteall.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/process-stop-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop-stopremoteall.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/run-build-clean.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/22x22/run-build-prune.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/applications-office.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-notimer.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-startremoteall.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/arrow-right-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/color-picker-toggle.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/document-new-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/document-open-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/document-save-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/document-save-as-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/documentation.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/edit-clear-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/edit-copy-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/edit-cut-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/edit-find-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/edit-paste-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/edit-redo-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/edit-undo-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/help-contents-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/list-add-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/list-remove-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/process-stop-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/process-stop-7-shutdownremoteall.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/process-stop-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop-stopremoteall.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/run-build-clean.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/32x32/run-build-prune.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/applications-office.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-notimer.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-startremoteall.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/arrow-right-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/color-picker-toggle.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/document-new-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/document-open-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/document-save-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/document-save-as-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/documentation.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/edit-clear-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/edit-copy-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/edit-cut-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/edit-find-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/edit-paste-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/edit-redo-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/edit-undo-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/help-contents-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/list-add-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/list-remove-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/process-stop-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/process-stop-7-shutdownremoteall.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/process-stop-7.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop-stopremoteall.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/run-build-clean.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/48x48/run-build-prune.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-notimer.svg (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-startremoteall.svg (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/icons-custom/color-picker-toggle.svg (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/icons-custom/process-stop-7-shutdownremoteall.svg (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/icons-custom/road-sign-us-stop-stopremoteall.svg (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/toolbar/icons-toolbar.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/applications-science-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/appointment-new-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/color-picker-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/document-export-4_custom.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/document-import-2_custom.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/document-preview.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/office-chart-area.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/preferences-system-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/system-run-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/view-list-tree-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/19x19/view-pim-tasks.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/applications-science-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/appointment-new-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/color-picker-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/document-export-4_custom.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/document-import-2_custom.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/document-preview.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/office-chart-area.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/preferences-system-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/system-run-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/view-list-tree-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/24x24/view-pim-tasks.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/applications-science-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/appointment-new-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/color-picker-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/document-export-4_custom.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/document-import-2_custom.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/document-preview.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/office-chart-area.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/preferences-system-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/system-run-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/view-list-tree-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/32x32/view-pim-tasks.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/applications-science-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/appointment-new-3.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/color-picker-grey.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/document-export-4_custom.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/document-import-2_custom.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/document-preview.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/office-chart-area.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/preferences-system-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/system-run-5.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/view-list-tree-4.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/48x48/view-pim-tasks.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/icons-custom/document-export-4_custom.svg (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/tree/icons-custom/document-import-2_custom.svg (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/vrt/19x19/security-high-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/vrt/19x19/security-low-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/vrt/24x24/security-high-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/vrt/24x24/security-low-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/vrt/32x32/security-high-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/vrt/32x32/security-low-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/vrt/48x48/security-high-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/vrt/48x48/security-low-2.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/images/warning.png (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/report/config/package.html (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/report/core/package.html (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/report/dashboard/package.html (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/report/processor/graph/impl/package.html (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/report/processor/graph/package.html (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/report/processor/package.html (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_de.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_es.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_fr.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_ja.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_no.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_pl.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_pt_BR.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_tr.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_zh_CN.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/resources/messages_zh_TW.properties (100%) rename src/core/{ => src/main/resources}/org/apache/jmeter/visualizers/package.html (100%) rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/gui/HtmlReportGUISpec.groovy (100%) create mode 100644 src/core/src/test/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/report/core/ConvertersSpec.groovy (100%) rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy (100%) rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/report/processor/ApdexSummaryConsumerSpec.groovy (100%) rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/report/processor/FieldSampleComparatorSpec.groovy (100%) rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/report/processor/ListResultDataSpec.groovy (100%) rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerSpec.groovy (100%) rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy (100%) rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerSpec.groovy (100%) rename {test/src => src/core/src/test/groovy}/org/apache/jmeter/services/FileServerSpec.groovy (98%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/JMeterTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/engine/DistributedRunnerTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/engine/LocalHostTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/engine/TestTreeCloner.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/engine/util/TestValueReplacer.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/gui/util/JSyntaxTextAreaTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/gui/util/TristateCheckBoxTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/junit/JMeterTestCase.java (91%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/junit/JMeterTestCaseJUnit.java (88%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/junit/JMeterTestUtils.java (50%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/junit/categories/NeedGuiTests.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/junit/stubs/TestSampler.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/listeners/TestResultAction.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/report/core/CsvSampleReaderTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/report/core/SampleMetadataTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/report/core/TestCsvSampleWriter.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/resources/PackageTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/samplers/NullSampler.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/samplers/TestSampleResult.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/save/TestCSVSaveService.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/test/ResourceLocator.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/testelement/PackageTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/testelement/TestNumberProperty.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/testelement/property/AbstractPropertyTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/testelement/property/MapPropertyTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/testelement/property/PackageTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/threads/JMeterContextServiceHelper.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/threads/TestJMeterContextService.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/threads/TestJMeterThread.java (89%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/threads/TestTestCompiler.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/util/JSR223TestElementTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/util/LogRecord.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/util/LogRecordingDelegatingLogger.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/util/PackageTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/util/StringUtilitiesTest.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/util/TestJMeterUtils.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jmeter/util/XPathUtilTest.java (93%) rename {test/src => src/core/src/test/java}/org/apache/jorphan/TestXMLBuffer.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jorphan/reflect/TestFunctor.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jorphan/test/AllTests.java (100%) rename {test/src => src/core/src/test/java}/org/apache/jorphan/test/JMeterSerialTest.java (100%) rename {test => src/core/src/test}/resources/XPathUtilTestXml.xml (100%) rename {test => src/core/src/test}/resources/log4j2.xml (100%) rename {test => src/core/src/test}/resources/org/apache/jmeter/report/dashboard/reportgenerator_test.properties (100%) rename {bin => src/core/src/test/resources/org/apache/jmeter/services}/testfiles/empty.csv (100%) rename {bin => src/core/src/test/resources/org/apache/jmeter/services}/testfiles/unit/FileServerSpec.csv (100%) rename {test => src/core/src/test}/resources/resourcefile.txt (100%) rename {test/src => src/dist-check/src/test/groovy}/org/apache/jmeter/engine/util/PackageSpec.groovy (100%) rename {test/src => src/dist-check/src/test/groovy}/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy (100%) rename {test/src => src/dist-check/src/test/groovy}/org/apache/jmeter/gui/util/MenuFactorySpec.groovy (100%) rename {test/src => src/dist-check/src/test/groovy}/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy (100%) rename {test/src => src/dist-check/src/test/java}/org/apache/jmeter/control/TestSwitchController.java (100%) rename {test/src => src/dist-check/src/test/java}/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java (98%) rename {test/src => src/dist-check/src/test/java}/org/apache/jmeter/gui/action/TestLoad.java (95%) rename {test/src => src/dist-check/src/test/java}/org/apache/jmeter/junit/JMeterTest.java (98%) rename {test/src => src/dist-check/src/test/java}/org/apache/jmeter/resources/TestPropertiesFiles.java (100%) rename {test/src => src/dist-check/src/test/java}/org/apache/jmeter/save/TestSaveService.java (98%) rename {test/src => src/dist-check/src/test/java}/org/apache/jmeter/testbeans/gui/PackageTest.java (100%) rename {test/src => src/dist-check/src/test/java}/org/apache/jmeter/testelement/TestElementTest.java (100%) rename {test/src => src/dist-check/src/test/java}/org/apache/jorphan/TestFunctorUsers.java (100%) rename {test/src => src/dist-check/src/test/java}/org/apache/jorphan/reflect/TestClassFinder.java (89%) rename {test => src/dist-check/src/test}/resources/org/apache/jmeter/gui/report/HTMLReportExpect.json (100%) rename src/examples/{ => src/main/java}/org/apache/jmeter/examples/sampler/ExampleSampler.java (100%) rename src/examples/{ => src/main/java}/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java (100%) rename src/examples/{ => src/main/java}/org/apache/jmeter/examples/testbeans/example1/Example1.java (100%) rename src/examples/{ => src/main/java}/org/apache/jmeter/examples/testbeans/example2/Example2.java (100%) rename src/examples/{ => src/main/java}/org/apache/jmeter/examples/testbeans/example2/Example2BeanInfo.java (100%) rename src/examples/{ => src/main/java}/org/apache/jmeter/examples/testbeans/example3/Example3.java (100%) rename src/examples/{ => src/main/java}/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java (100%) rename src/examples/{ => src/main/resources}/org/apache/jmeter/examples/testbeans/example2/Example2Resources.properties (100%) rename src/examples/{ => src/main/resources}/org/apache/jmeter/examples/testbeans/example2/Example2Resources_es.properties (100%) rename src/examples/{ => src/main/resources}/org/apache/jmeter/examples/testbeans/example2/Example2Resources_pt_BR.properties (100%) rename src/examples/{ => src/main/resources}/org/apache/jmeter/examples/testbeans/example2/Example2Resources_tr.properties (100%) rename src/examples/{ => src/main/resources}/org/apache/jmeter/examples/testbeans/example2/Example2Resources_zh_TW.properties (100%) rename src/examples/{ => src/main/resources}/org/apache/jmeter/examples/testbeans/example3/Example3Resources.properties (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/AbstractFunctionByKey.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/AbstractHostIPName.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/BeanShell.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/CSVRead.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/ChangeCase.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/CharFunction.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/DateTimeConvertFunction.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/DigestEncodeFunction.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/EscapeHtml.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/EscapeOroRegexpChars.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/EscapeXml.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/EvalFunction.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/EvalVarFunction.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/FileRowColContainer.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/FileToString.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/FileWrapper.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/Groovy.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/IntSum.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/IsPropDefined.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/IsVarDefined.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/IterationCounter.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/JavaScript.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/Jexl2Function.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/Jexl3Function.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/LogFunction.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/LogFunction2.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/LongSum.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/MachineIP.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/MachineName.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/Property.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/Property2.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/Random.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/RandomDate.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/RandomFromMultipleVars.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/RandomString.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/RegexFunction.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/SamplerName.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/SetProperty.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/SplitFunction.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/StringFromFile.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/StringToFile.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/TestPlanName.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/ThreadGroupName.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/ThreadNumber.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/TimeFunction.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/TimeShift.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/UnEscape.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/UnEscapeHtml.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/UrlDecode.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/UrlEncode.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/Uuid.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/Variable.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/XPath.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/XPathFileContainer.java (100%) rename src/functions/{ => src/main/java}/org/apache/jmeter/functions/XPathWrapper.java (100%) rename src/functions/{ => src/main/resources}/org/apache/jmeter/functions/package.html (100%) rename {test/src => src/functions/src/test/groovy}/org/apache/jmeter/functions/ChangeCaseSpec.groovy (100%) rename {test/src => src/functions/src/test/groovy}/org/apache/jmeter/functions/gui/FunctionHelperSpec.groovy (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/CSVReadFunctionTest.java (97%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/EvalFunctionTest.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/FunctionTestHelper.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/PackageTest.java (95%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/RandomFunctionTest.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/SplitFunctionTest.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/StringFromFileFunctionTest.java (90%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/SumFunctionTest.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestChangeCase.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestDateTimeConvertFunction.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestDigestFunction.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestEscapeOroRegexpChars.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestFileRowColContainer.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestFileToString.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestGroovyFunction.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestIsPropDefined.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestIsVarDefined.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestJavascriptFunction.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestJavascriptFunctionWithRhino.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestJexl2Function.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestJexl3Function.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestMachineIPName.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestRandomFromMultipleVars.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestRegexFunction.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestSamplerNameFunction.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestSetProperty.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestSimpleFunctions.java (97%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestStringtoFile.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestTimeFunction.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestTimeRandomDateFunction.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestTimeShiftFunction.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/TestUrlEncodeDecode.java (100%) rename {test/src => src/functions/src/test/java}/org/apache/jmeter/functions/VariableTest.java (100%) rename {bin => src/functions/src/test/resources/org/apache/jmeter/functions}/testfiles/BeanShellTest.bsh (100%) rename {bin => src/functions/src/test/resources/org/apache/jmeter/functions}/testfiles/SFFTest1.txt (100%) rename {bin => src/functions/src/test/resources/org/apache/jmeter/functions}/testfiles/SFFTest2.txt (100%) rename {bin => src/functions/src/test/resources/org/apache/jmeter/functions}/testfiles/SFFTest3.txt (100%) rename {bin => src/functions/src/test/resources/org/apache/jmeter/functions}/testfiles/XPathTest.xml (100%) rename {bin => src/functions/src/test/resources/org/apache/jmeter/functions}/testfiles/XPathTest2.xml (100%) rename {bin => src/functions/src/test/resources/org/apache/jmeter/functions}/testfiles/testblank.csv (100%) rename {bin => src/functions/src/test/resources/org/apache/jmeter/functions}/testfiles/unit/CSVReadFunctionTest.csv (100%) rename {bin => src/functions/src/test/resources/org/apache/jmeter/functions}/testfiles/unit/FunctionsPackageTest.csv (100%) create mode 100644 src/functions/src/test/resources/org/apache/jmeter/functions/xpathfilecontainer.xml rename {test/src => src/generator/src/main/java}/org/apache/jmeter/visualizers/GenerateTreeGui.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/commons/cli/avalon/AbstractParserControl.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/commons/cli/avalon/CLArgsParser.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/commons/cli/avalon/CLOption.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/commons/cli/avalon/CLOptionDescriptor.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/commons/cli/avalon/CLUtil.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/commons/cli/avalon/ParserControl.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/commons/cli/avalon/Token.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/collections/Data.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/collections/HashTree.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/collections/HashTreeTraverser.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/collections/ListedHashTree.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/collections/SearchByClass.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/documentation/VisibleForTesting.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/exec/KeyToolUtils.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/exec/StreamCopier.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/exec/SystemCommand.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/AbstractTreeTableModel.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/ComponentUtil.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/DefaultTreeTableModel.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/GuiUtils.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/JLabeledChoice.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/JLabeledField.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/JLabeledPasswordField.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/JLabeledTextArea.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/JLabeledTextField.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/JTreeTable.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/MenuScroller.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/MinMaxLongRenderer.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/NumberRenderer.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/ObjectTableModel.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/ObjectTableSorter.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/RateRenderer.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/RendererUtils.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/RightAlignRenderer.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/TreeTableModel.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/gui/layout/VerticalLayout.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/io/TextFile.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/logging/LoggingManager.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/logging/Slf4jLogkitLogger.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/math/NumberComparator.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/math/StatCalculator.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/math/StatCalculatorInteger.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/math/StatCalculatorLong.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/reflect/ClassFilter.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/reflect/ClassFinder.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/reflect/ClassTools.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/reflect/Functor.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/test/UnitTestManager.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/Converter.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/HeapDumper.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/JMeterError.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/JMeterException.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/JMeterStopTestException.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/JMeterStopTestNowException.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/JMeterStopThreadException.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/JOrphanUtils.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/ThreadDumper.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/jorphan/util/XMLBuffer.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/log/ContextMap.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/log/LogEvent.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/log/LogTarget.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/log/Logger.java (100%) rename src/jorphan/{ => src/main/java}/org/apache/log/Priority.java (100%) rename src/jorphan/{ => src/main/resources}/org/apache/commons/cli/avalon/package.html (100%) rename {test/src => src/jorphan/src/test/groovy}/org/apache/jorphan/io/TextFileSpec.groovy (100%) rename {test/src => src/jorphan/src/test/groovy}/org/apache/jorphan/util/ConverterSpec.groovy (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/commons/cli/avalon/ClutilTestCase.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/collections/PackageTest.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/exec/TestKeyToolUtils.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/gui/MinMaxLongRendererTest.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/gui/ObjectTableModelTest.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/gui/ObjectTableSorterTest.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/gui/TableModelEventBacker.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/math/TestStatCalculator.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/reflect/TestClassTools.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/util/TestConverter.java (100%) rename {test/src => src/jorphan/src/test/java}/org/apache/jorphan/util/TestJorphanUtils.java (100%) rename src/{core => launcher/src/main/java}/org/apache/jmeter/DynamicClassLoader.java (100%) rename src/{core => launcher/src/main/java}/org/apache/jmeter/NewDriver.java (100%) rename src/{core => launcher/src/main/java}/org/apache/jmeter/util/ShutdownClient.java (95%) rename {res/META-INF => src/launcher/src/main/resources/org/apache/jmeter}/jmeter_as_ascii_art.txt (80%) rename src/protocol/ftp/{ => src/main/java}/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java (100%) rename src/protocol/ftp/{ => src/main/java}/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java (100%) rename src/protocol/ftp/{ => src/main/java}/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/AuthManager.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/Authorization.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/CacheManager.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/Cookie.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/CookieHandler.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/CookieManager.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/DNSCacheManager.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/DelegatingKerberosScheme.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/DelegatingSPNegoScheme.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/Header.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/HeaderManager.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/KerberosManager.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/RecordingController.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/StaticHost.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/control/gui/RecordController.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/gui/AuthPanel.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/gui/CookiePanel.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/gui/HeaderPanel.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/BaseParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/CssParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/HTMLParseException.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/HTMLParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/LinkExtractorParseException.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/LinkExtractorParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/URLCollection.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/parser/URLString.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/Daemon.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/Proxy.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/ServerAliasKeyManager.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/PostWriter.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/PutWriter.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/ResourcesDownloader.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/Base64Encoder.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/ConversionUtils.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/DirectAccessByteArrayOutputStream.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/EncoderCache.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/HTTPArgument.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/HTTPConstants.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/HTTPFileArg.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/Filter.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/Generator.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/NVPair.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java (100%) rename src/protocol/http/{ => src/main/java}/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java (100%) rename src/protocol/http/{ => src/main/resources}/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources.properties (100%) rename src/protocol/http/{ => src/main/resources}/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_es.properties (100%) rename src/protocol/http/{ => src/main/resources}/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_fr.properties (100%) rename src/protocol/http/{ => src/main/resources}/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_pt_BR.properties (100%) rename src/protocol/http/{ => src/main/resources}/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_tr.properties (100%) rename src/protocol/http/{ => src/main/resources}/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_zh_TW.properties (100%) rename {test/src => src/protocol/http/src/test/groovy}/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy (100%) rename {test/src => src/protocol/http/src/test/groovy}/org/apache/jmeter/protocol/http/util/HTTPUtilsSpec.groovy (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/curl/BasicCurlParserTest.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/gui/action/ParseCurlCommandActionTest.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/config/UrlConfigTest.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestAuthManager.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestAuthorization.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestCacheManagerHC4.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnection.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnectionBase.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java (97%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/parser/NotReusableParser.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/parser/ReusableParser.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/parser/TestBaseParser.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/parser/TestBug60842HtmlParser.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/parser/TestCssParser.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java (94%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/proxy/NonGuiProxySample.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/PackageTest.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/PutWriterTest.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/TestHttpWebdav.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java (90%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/util/TestHTTPFileArg.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/util/accesslog/TestTCLogParser.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java (100%) rename {test/src => src/protocol/http/src/test/java}/org/apache/jmeter/testelement/TestHeaderManager.java (100%) create mode 100644 src/protocol/http/src/test/resources/org/apache/jmeter/protocol/http/sampler/checkThatFilesAreReadRelativeToBaseDir.txt rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCase.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCase.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCase.set (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCase2.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCase3.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseBase.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseBase.set (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseFrames.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseFrames.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseFrames.set (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithBaseHRef.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithBaseHRef2.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithComments.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional1.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional1_FF.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional1_IE6.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional1_IE7.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional1_IE8.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional2.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional2_FF.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional2_IE7.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional2_IE8.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional2_IE9.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional3.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional3_FF.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional3_IE10.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional3_IE55.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithConditional3_IE6.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestCaseWithMissingBaseHRef.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestFrames.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLParserTestFrames.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLScript.all (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLScript.html (100%) rename {bin => src/protocol/http/src/test/resources}/testfiles/HTMLScript.set (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/config/JavaConfig.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/sampler/BSFSampler.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/sampler/BSFSamplerBeanInfo.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/sampler/JavaSampler.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/test/JavaTest.java (100%) rename src/protocol/java/{ => src/main/java}/org/apache/jmeter/protocol/java/test/SleepTest.java (100%) rename src/protocol/java/{ => src/main/resources}/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources.properties (100%) rename src/protocol/java/{ => src/main/resources}/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_fr.properties (100%) rename src/protocol/java/{ => src/main/resources}/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_zh_CN.properties (100%) rename src/protocol/java/{ => src/main/resources}/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties (100%) rename src/protocol/java/{ => src/main/resources}/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties (100%) rename src/protocol/java/{ => src/main/resources}/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_zh_CN.properties (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessor.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorBeanInfo.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessor.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorBeanInfo.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java (100%) rename src/protocol/jdbc/{ => src/main/java}/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_es.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_fr.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_pt_BR.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_tr.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_zh_TW.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_fr.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_zh_CN.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_fr.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_zh_CN.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_es.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_fr.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_pt_BR.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_tr.properties (100%) rename src/protocol/jdbc/{ => src/main/resources}/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_zh_TW.properties (100%) rename {test/src => src/protocol/jdbc/src/test/groovy}/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerSpec.groovy (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/Utils.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/client/ClientPool.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/client/Publisher.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/JMSProperty.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/Receiver.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/render/FileKey.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/render/MapMessageRenderer.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/render/MessageRenderer.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRenderer.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/render/RendererFactory.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/render/Renderers.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRenderer.java (100%) rename src/protocol/jms/{ => src/main/java}/org/apache/jmeter/protocol/jms/sampler/render/package-info.java (100%) rename {test/src => src/protocol/jms/src/test/java}/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java (100%) rename {test/src => src/protocol/jms/src/test/java}/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java (100%) rename {test/src => src/protocol/jms/src/test/java}/org/apache/jmeter/protocol/jms/sampler/render/MessageRendererTest.java (100%) rename {test/src => src/protocol/jms/src/test/java}/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java (100%) rename {test/src => src/protocol/jms/src/test/java}/org/apache/jmeter/protocol/jms/sampler/render/Person.java (100%) rename {test/src => src/protocol/jms/src/test/java}/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRendererTest.java (100%) rename {test => src/protocol/jms/src/test}/resources/org/apache/jmeter/protocol/jms/sampler/render/cp1252.txt (100%) rename {test => src/protocol/jms/src/test}/resources/org/apache/jmeter/protocol/jms/sampler/render/noVar.txt (100%) rename {test => src/protocol/jms/src/test}/resources/org/apache/jmeter/protocol/jms/sampler/render/object_cp1252.xml (100%) rename {test => src/protocol/jms/src/test}/resources/org/apache/jmeter/protocol/jms/sampler/render/object_doe.xml (100%) rename {test => src/protocol/jms/src/test}/resources/org/apache/jmeter/protocol/jms/sampler/render/object_prolog_cp1252.xml (100%) rename {test => src/protocol/jms/src/test}/resources/org/apache/jmeter/protocol/jms/sampler/render/object_utf8.xml (100%) rename {test => src/protocol/jms/src/test}/resources/org/apache/jmeter/protocol/jms/sampler/render/oneVar.txt (100%) rename {test => src/protocol/jms/src/test}/resources/org/apache/jmeter/protocol/jms/sampler/render/utf8.txt (100%) rename src/{junit => protocol/junit-sample/src/main/java}/test/AfterAnnotatedTest.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/test/BeforeAnnotatedTest.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/test/DummyAnnotatedTest.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/test/Junit4AnnotationsTest.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/test/RerunTest.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/test/SetupTestError.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/test/SetupTestFail.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/test/TearDownTestFail.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/woolfel/DummyTestCase.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/woolfel/SubDummyTest.java (100%) rename src/{junit => protocol/junit-sample/src/main/java}/woolfel/SubDummyTest2.java (100%) rename src/{junit => protocol/junit/src/main/java}/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java (100%) rename src/{junit => protocol/junit/src/main/java}/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java (100%) rename src/{junit => protocol/junit/src/main/java}/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgument.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/config/gui/LDAPArguments.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java (100%) rename src/protocol/ldap/{ => src/main/java}/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java (100%) rename {test/src => src/protocol/ldap/src/test/java}/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/mail/sampler/MailFileMessage.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java (100%) rename src/protocol/mail/{ => src/main/java}/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java (100%) rename src/protocol/mail/{ => src/main/resources}/META-INF/javamail.providers (100%) rename {test/src => src/protocol/mail/src/test/java}/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java (100%) rename src/protocol/mongodb/{ => src/main/java}/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java (100%) rename src/protocol/mongodb/{ => src/main/java}/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java (100%) rename src/protocol/mongodb/{ => src/main/java}/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java (100%) rename src/protocol/mongodb/{ => src/main/java}/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java (100%) rename src/protocol/mongodb/{ => src/main/java}/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java (100%) rename src/protocol/mongodb/{ => src/main/java}/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java (100%) rename src/protocol/mongodb/{ => src/main/java}/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java (100%) rename src/protocol/mongodb/{ => src/main/java}/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java (100%) rename src/protocol/mongodb/{ => src/main/java}/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java (100%) rename src/protocol/mongodb/{ => src/main/resources}/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties (100%) rename src/protocol/mongodb/{ => src/main/resources}/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties (100%) rename src/protocol/mongodb/{ => src/main/resources}/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties (100%) rename src/protocol/mongodb/{ => src/main/resources}/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties (100%) rename src/protocol/native/{ => src/main/java}/org/apache/jmeter/protocol/system/SystemSampler.java (100%) rename src/protocol/native/{ => src/main/java}/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/sampler/ReadException.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java (100%) rename src/protocol/tcp/{ => src/main/java}/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java (100%) rename {test/src => src/protocol/tcp/src/test/java}/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImplTest.java (100%) rename {test/src => src/protocol/tcp/src/test/java}/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImplTest.java (100%) rename {test/src => src/protocol/tcp/src/test/java}/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecoratorTest.java (100%) delete mode 100644 test/src/org/apache/jmeter/junit/spock/JMeterSpec.groovy diff --git a/src/core/org/apache/jmeter/util/BeanShellClient.java b/src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java similarity index 100% rename from src/core/org/apache/jmeter/util/BeanShellClient.java rename to src/bshclient/src/main/java/org/apache/jmeter/util/BeanShellClient.java diff --git a/src/components/org/apache/jmeter/assertions/BSFAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/BSFAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertionBeanInfo.java diff --git a/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/BeanShellAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/CompareAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/CompareAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java diff --git a/src/components/org/apache/jmeter/assertions/DurationAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/DurationAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/DurationAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/DurationAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/HTMLAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/HTMLAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/JSONPathAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/JSR223Assertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/JSR223Assertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java diff --git a/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java diff --git a/src/components/org/apache/jmeter/assertions/LogErrorHandler.java b/src/components/src/main/java/org/apache/jmeter/assertions/LogErrorHandler.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/LogErrorHandler.java rename to src/components/src/main/java/org/apache/jmeter/assertions/LogErrorHandler.java diff --git a/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/MD5HexAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/MD5HexAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/MD5HexAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/ResponseAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/ResponseAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/SMIMEAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java b/src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java rename to src/components/src/main/java/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java diff --git a/src/components/org/apache/jmeter/assertions/SizeAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/SizeAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/SubstitutionElement.java b/src/components/src/main/java/org/apache/jmeter/assertions/SubstitutionElement.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/SubstitutionElement.java rename to src/components/src/main/java/org/apache/jmeter/assertions/SubstitutionElement.java diff --git a/src/components/org/apache/jmeter/assertions/XMLAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/XMLAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/XMLSchemaAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/XPath2Assertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/XPath2Assertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/XPath2Assertion.java diff --git a/src/components/org/apache/jmeter/assertions/XPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/XPathAssertion.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/XPathAssertion.java rename to src/components/src/main/java/org/apache/jmeter/assertions/XPathAssertion.java diff --git a/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/AssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/DurationAssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/DurationAssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java diff --git a/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/SizeAssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/SizeAssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XMLAssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/XMLAssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XMLConfPanel.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/XMLConfPanel.java diff --git a/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java diff --git a/src/components/org/apache/jmeter/assertions/gui/XPath2AssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2AssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/XPath2AssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2AssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/XPath2Panel.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/XPath2Panel.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/XPath2Panel.java diff --git a/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathAssertionGui.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathAssertionGui.java diff --git a/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathPanel.java similarity index 100% rename from src/components/org/apache/jmeter/assertions/gui/XPathPanel.java rename to src/components/src/main/java/org/apache/jmeter/assertions/gui/XPathPanel.java diff --git a/src/components/org/apache/jmeter/config/CSVDataSet.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSet.java rename to src/components/src/main/java/org/apache/jmeter/config/CSVDataSet.java diff --git a/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/config/CSVDataSetBeanInfo.java diff --git a/src/components/org/apache/jmeter/config/KeystoreConfig.java b/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfig.java similarity index 100% rename from src/components/org/apache/jmeter/config/KeystoreConfig.java rename to src/components/src/main/java/org/apache/jmeter/config/KeystoreConfig.java diff --git a/src/components/org/apache/jmeter/config/KeystoreConfigBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/config/KeystoreConfigBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java diff --git a/src/components/org/apache/jmeter/config/RandomVariableConfig.java b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java similarity index 100% rename from src/components/org/apache/jmeter/config/RandomVariableConfig.java rename to src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java diff --git a/src/components/org/apache/jmeter/config/RandomVariableConfigBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfigBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/config/RandomVariableConfigBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfigBeanInfo.java diff --git a/src/components/org/apache/jmeter/control/CriticalSectionController.java b/src/components/src/main/java/org/apache/jmeter/control/CriticalSectionController.java similarity index 100% rename from src/components/org/apache/jmeter/control/CriticalSectionController.java rename to src/components/src/main/java/org/apache/jmeter/control/CriticalSectionController.java diff --git a/src/components/org/apache/jmeter/control/ForeachController.java b/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java similarity index 100% rename from src/components/org/apache/jmeter/control/ForeachController.java rename to src/components/src/main/java/org/apache/jmeter/control/ForeachController.java diff --git a/src/components/org/apache/jmeter/control/IncludeController.java b/src/components/src/main/java/org/apache/jmeter/control/IncludeController.java similarity index 100% rename from src/components/org/apache/jmeter/control/IncludeController.java rename to src/components/src/main/java/org/apache/jmeter/control/IncludeController.java diff --git a/src/components/org/apache/jmeter/control/InterleaveControl.java b/src/components/src/main/java/org/apache/jmeter/control/InterleaveControl.java similarity index 100% rename from src/components/org/apache/jmeter/control/InterleaveControl.java rename to src/components/src/main/java/org/apache/jmeter/control/InterleaveControl.java diff --git a/src/components/org/apache/jmeter/control/ModuleController.java b/src/components/src/main/java/org/apache/jmeter/control/ModuleController.java similarity index 100% rename from src/components/org/apache/jmeter/control/ModuleController.java rename to src/components/src/main/java/org/apache/jmeter/control/ModuleController.java diff --git a/src/components/org/apache/jmeter/control/OnceOnlyController.java b/src/components/src/main/java/org/apache/jmeter/control/OnceOnlyController.java similarity index 100% rename from src/components/org/apache/jmeter/control/OnceOnlyController.java rename to src/components/src/main/java/org/apache/jmeter/control/OnceOnlyController.java diff --git a/src/components/org/apache/jmeter/control/RandomController.java b/src/components/src/main/java/org/apache/jmeter/control/RandomController.java similarity index 100% rename from src/components/org/apache/jmeter/control/RandomController.java rename to src/components/src/main/java/org/apache/jmeter/control/RandomController.java diff --git a/src/components/org/apache/jmeter/control/RandomOrderController.java b/src/components/src/main/java/org/apache/jmeter/control/RandomOrderController.java similarity index 100% rename from src/components/org/apache/jmeter/control/RandomOrderController.java rename to src/components/src/main/java/org/apache/jmeter/control/RandomOrderController.java diff --git a/src/components/org/apache/jmeter/control/SwitchController.java b/src/components/src/main/java/org/apache/jmeter/control/SwitchController.java similarity index 100% rename from src/components/org/apache/jmeter/control/SwitchController.java rename to src/components/src/main/java/org/apache/jmeter/control/SwitchController.java diff --git a/src/components/org/apache/jmeter/control/ThroughputController.java b/src/components/src/main/java/org/apache/jmeter/control/ThroughputController.java similarity index 100% rename from src/components/org/apache/jmeter/control/ThroughputController.java rename to src/components/src/main/java/org/apache/jmeter/control/ThroughputController.java diff --git a/src/components/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/CriticalSectionControllerGui.java diff --git a/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java b/src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/ForeachControlPanel.java diff --git a/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/IncludeControllerGui.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/IncludeControllerGui.java diff --git a/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/InterleaveControlGui.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/InterleaveControlGui.java diff --git a/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/ModuleControllerGui.java diff --git a/src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java diff --git a/src/components/org/apache/jmeter/control/gui/RandomControlGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/RandomControlGui.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/RandomControlGui.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/RandomControlGui.java diff --git a/src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/RandomOrderControllerGui.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/RandomOrderControllerGui.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/RandomOrderControllerGui.java diff --git a/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/SwitchControllerGui.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/SwitchControllerGui.java diff --git a/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java b/src/components/src/main/java/org/apache/jmeter/control/gui/ThroughputControllerGui.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/ThroughputControllerGui.java diff --git a/src/components/org/apache/jmeter/control/gui/TreeNodeWrapper.java b/src/components/src/main/java/org/apache/jmeter/control/gui/TreeNodeWrapper.java similarity index 100% rename from src/components/org/apache/jmeter/control/gui/TreeNodeWrapper.java rename to src/components/src/main/java/org/apache/jmeter/control/gui/TreeNodeWrapper.java diff --git a/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/BSFPostProcessor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java diff --git a/src/components/org/apache/jmeter/extractor/BSFPostProcessorBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessorBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/BSFPostProcessorBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessorBeanInfo.java diff --git a/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BeanShellPostProcessor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/BeanShellPostProcessor.java diff --git a/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java diff --git a/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/BoundaryExtractor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java diff --git a/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/DebugPostProcessor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessor.java diff --git a/src/components/org/apache/jmeter/extractor/DebugPostProcessorBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessorBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/DebugPostProcessorBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/extractor/DebugPostProcessorBeanInfo.java diff --git a/src/components/org/apache/jmeter/extractor/Extractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/Extractor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/Extractor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/Extractor.java diff --git a/src/components/org/apache/jmeter/extractor/HtmlExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/HtmlExtractor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/HtmlExtractor.java diff --git a/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java diff --git a/src/components/org/apache/jmeter/extractor/JSR223PostProcessorBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessorBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/JSR223PostProcessorBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessorBeanInfo.java diff --git a/src/components/org/apache/jmeter/extractor/JSoupExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/JSoupExtractor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/JSoupExtractor.java diff --git a/src/components/org/apache/jmeter/extractor/JoddExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/JoddExtractor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/JoddExtractor.java diff --git a/src/components/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/RegexExtractor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java diff --git a/src/components/org/apache/jmeter/extractor/XPath2Extractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/XPath2Extractor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java diff --git a/src/components/org/apache/jmeter/extractor/XPathExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/XPathExtractor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/XPathExtractor.java diff --git a/src/components/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java rename to src/components/src/main/java/org/apache/jmeter/extractor/gui/BoundaryExtractorGui.java diff --git a/src/components/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java rename to src/components/src/main/java/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java diff --git a/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java rename to src/components/src/main/java/org/apache/jmeter/extractor/gui/RegexExtractorGui.java diff --git a/src/components/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java rename to src/components/src/main/java/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java diff --git a/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java rename to src/components/src/main/java/org/apache/jmeter/extractor/gui/XPathExtractorGui.java diff --git a/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java rename to src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java diff --git a/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java rename to src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java diff --git a/src/components/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java rename to src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/gui/JSONPostProcessorGui.java diff --git a/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java similarity index 100% rename from src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java rename to src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java diff --git a/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java b/src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java similarity index 100% rename from src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java rename to src/components/src/main/java/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java diff --git a/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java diff --git a/src/components/org/apache/jmeter/modifiers/BSFPreProcessorBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessorBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BSFPreProcessorBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessorBeanInfo.java diff --git a/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java diff --git a/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java diff --git a/src/components/org/apache/jmeter/modifiers/CounterConfig.java b/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/CounterConfig.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java diff --git a/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java diff --git a/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessorBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/JSR223PreProcessorBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessorBeanInfo.java diff --git a/src/components/org/apache/jmeter/modifiers/SampleTimeout.java b/src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/SampleTimeout.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/SampleTimeout.java diff --git a/src/components/org/apache/jmeter/modifiers/UserParameters.java b/src/components/src/main/java/org/apache/jmeter/modifiers/UserParameters.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/UserParameters.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/UserParameters.java diff --git a/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/gui/CounterConfigGui.java diff --git a/src/components/org/apache/jmeter/modifiers/gui/SampleTimeoutGui.java b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/SampleTimeoutGui.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/gui/SampleTimeoutGui.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/gui/SampleTimeoutGui.java diff --git a/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java b/src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java similarity index 100% rename from src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java rename to src/components/src/main/java/org/apache/jmeter/modifiers/gui/UserParametersGui.java diff --git a/src/components/org/apache/jmeter/reporters/MailerModel.java b/src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java similarity index 100% rename from src/components/org/apache/jmeter/reporters/MailerModel.java rename to src/components/src/main/java/org/apache/jmeter/reporters/MailerModel.java diff --git a/src/components/org/apache/jmeter/reporters/MailerResultCollector.java b/src/components/src/main/java/org/apache/jmeter/reporters/MailerResultCollector.java similarity index 100% rename from src/components/org/apache/jmeter/reporters/MailerResultCollector.java rename to src/components/src/main/java/org/apache/jmeter/reporters/MailerResultCollector.java diff --git a/src/components/org/apache/jmeter/sampler/DebugSampler.java b/src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java similarity index 100% rename from src/components/org/apache/jmeter/sampler/DebugSampler.java rename to src/components/src/main/java/org/apache/jmeter/sampler/DebugSampler.java diff --git a/src/components/org/apache/jmeter/sampler/DebugSamplerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/sampler/DebugSamplerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/sampler/DebugSamplerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/sampler/DebugSamplerBeanInfo.java diff --git a/src/components/org/apache/jmeter/sampler/TestAction.java b/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java similarity index 100% rename from src/components/org/apache/jmeter/sampler/TestAction.java rename to src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java diff --git a/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java b/src/components/src/main/java/org/apache/jmeter/sampler/gui/TestActionGui.java similarity index 100% rename from src/components/org/apache/jmeter/sampler/gui/TestActionGui.java rename to src/components/src/main/java/org/apache/jmeter/sampler/gui/TestActionGui.java diff --git a/src/components/org/apache/jmeter/thinktime/DefaultThinkTimeCreator.java b/src/components/src/main/java/org/apache/jmeter/thinktime/DefaultThinkTimeCreator.java similarity index 100% rename from src/components/org/apache/jmeter/thinktime/DefaultThinkTimeCreator.java rename to src/components/src/main/java/org/apache/jmeter/thinktime/DefaultThinkTimeCreator.java diff --git a/src/components/org/apache/jmeter/timers/BSFTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/BSFTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java diff --git a/src/components/org/apache/jmeter/timers/BSFTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/BSFTimerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/timers/BSFTimerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/timers/BSFTimerBeanInfo.java diff --git a/src/components/org/apache/jmeter/timers/BeanShellTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/BeanShellTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java diff --git a/src/components/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimer.java diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java diff --git a/src/components/org/apache/jmeter/timers/ConstantTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/ConstantTimer.java diff --git a/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/GaussianRandomTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/GaussianRandomTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/GaussianRandomTimer.java diff --git a/src/components/org/apache/jmeter/timers/JSR223Timer.java b/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/JSR223Timer.java rename to src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java diff --git a/src/components/org/apache/jmeter/timers/JSR223TimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/JSR223TimerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/timers/JSR223TimerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/timers/JSR223TimerBeanInfo.java diff --git a/src/components/org/apache/jmeter/timers/PoissonRandomTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/PoissonRandomTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/PoissonRandomTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/PoissonRandomTimer.java diff --git a/src/components/org/apache/jmeter/timers/RandomTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/RandomTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/RandomTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/RandomTimer.java diff --git a/src/components/org/apache/jmeter/timers/SyncTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/SyncTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/SyncTimer.java diff --git a/src/components/org/apache/jmeter/timers/SyncTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/timers/SyncTimerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java diff --git a/src/components/org/apache/jmeter/timers/UniformRandomTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/UniformRandomTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/UniformRandomTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/UniformRandomTimer.java diff --git a/src/components/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java b/src/components/src/main/java/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java similarity index 100% rename from src/components/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java rename to src/components/src/main/java/org/apache/jmeter/timers/gui/AbstractRandomTimerGui.java diff --git a/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java b/src/components/src/main/java/org/apache/jmeter/timers/gui/ConstantTimerGui.java similarity index 100% rename from src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java rename to src/components/src/main/java/org/apache/jmeter/timers/gui/ConstantTimerGui.java diff --git a/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java b/src/components/src/main/java/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java similarity index 100% rename from src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java rename to src/components/src/main/java/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java diff --git a/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java b/src/components/src/main/java/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java similarity index 100% rename from src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java rename to src/components/src/main/java/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java diff --git a/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java b/src/components/src/main/java/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java similarity index 100% rename from src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java rename to src/components/src/main/java/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java diff --git a/src/components/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java similarity index 100% rename from src/components/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java rename to src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ConstantPoissonProcessGenerator.java diff --git a/src/components/org/apache/jmeter/timers/poissonarrivals/DurationProvider.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/DurationProvider.java similarity index 100% rename from src/components/org/apache/jmeter/timers/poissonarrivals/DurationProvider.java rename to src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/DurationProvider.java diff --git a/src/components/org/apache/jmeter/timers/poissonarrivals/EventProducer.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/EventProducer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/poissonarrivals/EventProducer.java rename to src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/EventProducer.java diff --git a/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java similarity index 100% rename from src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java rename to src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java diff --git a/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java diff --git a/src/components/org/apache/jmeter/timers/poissonarrivals/ThroughputProvider.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ThroughputProvider.java similarity index 100% rename from src/components/org/apache/jmeter/timers/poissonarrivals/ThroughputProvider.java rename to src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/ThroughputProvider.java diff --git a/src/components/org/apache/jmeter/validation/ComponentTreeClonerForValidation.java b/src/components/src/main/java/org/apache/jmeter/validation/ComponentTreeClonerForValidation.java similarity index 100% rename from src/components/org/apache/jmeter/validation/ComponentTreeClonerForValidation.java rename to src/components/src/main/java/org/apache/jmeter/validation/ComponentTreeClonerForValidation.java diff --git a/src/components/org/apache/jmeter/visualizers/AccumListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/AccumListener.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/AccumListener.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/AccumListener.java diff --git a/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/AssertionVisualizer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/AssertionVisualizer.java diff --git a/src/components/org/apache/jmeter/visualizers/AxisGraph.java b/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/AxisGraph.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java diff --git a/src/components/org/apache/jmeter/visualizers/BSFListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BSFListener.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/BSFListener.java diff --git a/src/components/org/apache/jmeter/visualizers/BSFListenerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/visualizers/BSFListenerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BSFListenerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/BSFListenerBeanInfo.java diff --git a/src/components/org/apache/jmeter/visualizers/BarGraph.java b/src/components/src/main/java/org/apache/jmeter/visualizers/BarGraph.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BarGraph.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/BarGraph.java diff --git a/src/components/org/apache/jmeter/visualizers/BeanShellListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BeanShellListener.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListener.java diff --git a/src/components/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java diff --git a/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ComparisonVisualizer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/ComparisonVisualizer.java diff --git a/src/components/org/apache/jmeter/visualizers/Graph.java b/src/components/src/main/java/org/apache/jmeter/visualizers/Graph.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/Graph.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/Graph.java diff --git a/src/components/org/apache/jmeter/visualizers/GraphListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/GraphListener.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/GraphListener.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/GraphListener.java diff --git a/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/GraphVisualizer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/GraphVisualizer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/GraphVisualizer.java diff --git a/src/components/org/apache/jmeter/visualizers/JSR223Listener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/JSR223Listener.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java diff --git a/src/components/org/apache/jmeter/visualizers/JSR223ListenerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223ListenerBeanInfo.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/JSR223ListenerBeanInfo.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/JSR223ListenerBeanInfo.java diff --git a/src/components/org/apache/jmeter/visualizers/LineGraph.java b/src/components/src/main/java/org/apache/jmeter/visualizers/LineGraph.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/LineGraph.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/LineGraph.java diff --git a/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/MailerVisualizer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java diff --git a/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java b/src/components/src/main/java/org/apache/jmeter/visualizers/PropertyControlGui.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/PropertyControlGui.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/PropertyControlGui.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsCssJQuery.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsDocument.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsDocument.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsDocument.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsDocument.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsHTML.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTML.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsHTMLWithEmbedded.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLWithEmbedded.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsHTMLWithEmbedded.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsHTMLWithEmbedded.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsJSON.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsJSON.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsRegexp.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsText.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsText.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsText.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsText.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsXML.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsXML.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXML.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsXPath.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderAsXPath2.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderAsXPath2.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java diff --git a/src/components/org/apache/jmeter/visualizers/RenderInBrowser.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RenderInBrowser.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RenderInBrowser.java diff --git a/src/components/org/apache/jmeter/visualizers/RequestPanel.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RequestPanel.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java diff --git a/src/components/org/apache/jmeter/visualizers/RequestView.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestView.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RequestView.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RequestView.java diff --git a/src/components/org/apache/jmeter/visualizers/RequestViewRaw.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RequestViewRaw.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RequestViewRaw.java diff --git a/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphChart.java diff --git a/src/components/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java diff --git a/src/components/org/apache/jmeter/visualizers/RespTimeGraphLineBean.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphLineBean.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RespTimeGraphLineBean.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphLineBean.java diff --git a/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java diff --git a/src/components/org/apache/jmeter/visualizers/ResultRenderer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ResultRenderer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/ResultRenderer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/ResultRenderer.java diff --git a/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/SamplerResultTab.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java diff --git a/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/SearchTextExtension.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/SearchTextExtension.java diff --git a/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/SearchTreePanel.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/SearchTreePanel.java diff --git a/src/components/org/apache/jmeter/visualizers/SearchableTreeNode.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SearchableTreeNode.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/SearchableTreeNode.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/SearchableTreeNode.java diff --git a/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SimpleDataWriter.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/SimpleDataWriter.java diff --git a/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphProperties.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/StatGraphProperties.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphProperties.java diff --git a/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java diff --git a/src/components/org/apache/jmeter/visualizers/StatVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/StatVisualizer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/StatVisualizer.java diff --git a/src/components/org/apache/jmeter/visualizers/SummaryReport.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/SummaryReport.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/SummaryReport.java diff --git a/src/components/org/apache/jmeter/visualizers/TableVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/TableVisualizer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java diff --git a/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/TreeNodeRenderer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/TreeNodeRenderer.java diff --git a/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java diff --git a/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java b/src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListener.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/BackendListener.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListener.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerClient.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerClient.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/BackendListenerContext.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerContext.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/BackendListenerContext.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerContext.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerGui.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/ErrorMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/ErrorMetric.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/SamplerMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/SamplerMetric.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/UserMetric.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/UserMetric.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/UserMetric.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/UserMetric.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/WindowMode.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/WindowMode.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/WindowMode.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/WindowMode.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/AbstractGraphiteMetricsSender.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteMetricsSender.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteMetricsSender.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteMetricsSender.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketConnectionInfos.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/SocketConnectionInfos.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/graphite/SocketConnectionInfos.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/SocketConnectionInfos.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStream.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStream.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStream.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStream.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/AbstractInfluxdbMetricsSender.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbMetricsSender.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbMetricsSender.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbMetricsSender.java diff --git a/src/components/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java diff --git a/src/components/org/apache/jmeter/visualizers/utils/Colors.java b/src/components/src/main/java/org/apache/jmeter/visualizers/utils/Colors.java similarity index 100% rename from src/components/org/apache/jmeter/visualizers/utils/Colors.java rename to src/components/src/main/java/org/apache/jmeter/visualizers/utils/Colors.java diff --git a/src/components/org/apache/jmeter/assertions/BSFAssertionResources.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/BSFAssertionResources.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources.properties diff --git a/src/components/org/apache/jmeter/assertions/BSFAssertionResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/BSFAssertionResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources_fr.properties diff --git a/src/components/org/apache/jmeter/assertions/BSFAssertionResources_pl.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources_pl.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/BSFAssertionResources_pl.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources_pl.properties diff --git a/src/components/org/apache/jmeter/assertions/BSFAssertionResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/BSFAssertionResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/assertions/BSFAssertionResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/BSFAssertionResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/BSFAssertionResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/assertions/CompareAssertionResources.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/CompareAssertionResources.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/CompareAssertionResources.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/CompareAssertionResources.properties diff --git a/src/components/org/apache/jmeter/assertions/CompareAssertionResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/CompareAssertionResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/CompareAssertionResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/CompareAssertionResources_fr.properties diff --git a/src/components/org/apache/jmeter/assertions/CompareAssertionResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/CompareAssertionResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/CompareAssertionResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/CompareAssertionResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/assertions/JSR223AssertionResources.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/JSR223AssertionResources.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/JSR223AssertionResources.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/JSR223AssertionResources.properties diff --git a/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties diff --git a/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/assertions/JSR223AssertionResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/assertions/JSR223AssertionResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/assertions/JSR223AssertionResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/assertions/package.html b/src/components/src/main/resources/org/apache/jmeter/assertions/package.html similarity index 100% rename from src/components/org/apache/jmeter/assertions/package.html rename to src/components/src/main/resources/org/apache/jmeter/assertions/package.html diff --git a/src/components/org/apache/jmeter/config/CSVDataSetResources.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources.properties similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetResources.properties rename to src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources.properties diff --git a/src/components/org/apache/jmeter/config/CSVDataSetResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_de.properties similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetResources_de.properties rename to src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_de.properties diff --git a/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_es.properties similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties rename to src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_es.properties diff --git a/src/components/org/apache/jmeter/config/CSVDataSetResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_fr.properties diff --git a/src/components/org/apache/jmeter/config/CSVDataSetResources_pl.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pl.properties similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetResources_pl.properties rename to src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pl.properties diff --git a/src/components/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/config/CSVDataSetResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_tr.properties similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetResources_tr.properties rename to src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_tr.properties diff --git a/src/components/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/config/CSVDataSetResources_zh_TW.properties b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_TW.properties similarity index 100% rename from src/components/org/apache/jmeter/config/CSVDataSetResources_zh_TW.properties rename to src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_TW.properties diff --git a/src/components/org/apache/jmeter/config/KeystoreConfigResources.properties b/src/components/src/main/resources/org/apache/jmeter/config/KeystoreConfigResources.properties similarity index 100% rename from src/components/org/apache/jmeter/config/KeystoreConfigResources.properties rename to src/components/src/main/resources/org/apache/jmeter/config/KeystoreConfigResources.properties diff --git a/src/components/org/apache/jmeter/config/KeystoreConfigResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/config/KeystoreConfigResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/config/KeystoreConfigResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/config/KeystoreConfigResources_fr.properties diff --git a/src/components/org/apache/jmeter/config/KeystoreConfigResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/config/KeystoreConfigResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/config/KeystoreConfigResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/config/KeystoreConfigResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/config/RandomVariableConfigResources.properties b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources.properties similarity index 100% rename from src/components/org/apache/jmeter/config/RandomVariableConfigResources.properties rename to src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources.properties diff --git a/src/components/org/apache/jmeter/config/RandomVariableConfigResources_es.properties b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_es.properties similarity index 100% rename from src/components/org/apache/jmeter/config/RandomVariableConfigResources_es.properties rename to src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_es.properties diff --git a/src/components/org/apache/jmeter/config/RandomVariableConfigResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/config/RandomVariableConfigResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_fr.properties diff --git a/src/components/org/apache/jmeter/config/RandomVariableConfigResources_pl.properties b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pl.properties similarity index 100% rename from src/components/org/apache/jmeter/config/RandomVariableConfigResources_pl.properties rename to src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pl.properties diff --git a/src/components/org/apache/jmeter/config/RandomVariableConfigResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/config/RandomVariableConfigResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/config/RandomVariableConfigResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/config/RandomVariableConfigResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources.properties diff --git a/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources_fr.properties diff --git a/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_pl.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources_pl.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_pl.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources_pl.properties diff --git a/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BSFPostProcessorResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties diff --git a/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties diff --git a/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_fr.properties diff --git a/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pl.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pl.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pl.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pl.properties diff --git a/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties diff --git a/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/BeanShellPostProcessorResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/DebugPostProcessorResources.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources.properties diff --git a/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties diff --git a/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_fr.properties diff --git a/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_tr.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_tr.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_tr.properties diff --git a/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/JSR223PostProcessorResources.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/JSR223PostProcessorResources.properties diff --git a/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties diff --git a/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/extractor/JSR223PostProcessorResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/extractor/JSR223PostProcessorResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties diff --git a/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BSFPreProcessorResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BSFPreProcessorResources_fr.properties diff --git a/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BSFPreProcessorResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BSFPreProcessorResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BSFPreProcessorResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BSFPreProcessorResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties diff --git a/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties diff --git a/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_fr.properties diff --git a/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties diff --git a/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/JSR223PreProcessorResources.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/JSR223PreProcessorResources.properties diff --git a/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/JSR223PreProcessorResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/JSR223PreProcessorResources_fr.properties diff --git a/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/modifiers/JSR223PreProcessorResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/modifiers/JSR223PreProcessorResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/sampler/DebugSamplerResources.properties b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/sampler/DebugSamplerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources.properties diff --git a/src/components/org/apache/jmeter/sampler/DebugSamplerResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_de.properties similarity index 100% rename from src/components/org/apache/jmeter/sampler/DebugSamplerResources_de.properties rename to src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_de.properties diff --git a/src/components/org/apache/jmeter/sampler/DebugSamplerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/sampler/DebugSamplerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_fr.properties diff --git a/src/components/org/apache/jmeter/sampler/DebugSamplerResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/sampler/DebugSamplerResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/sampler/DebugSamplerResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_tr.properties similarity index 100% rename from src/components/org/apache/jmeter/sampler/DebugSamplerResources_tr.properties rename to src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_tr.properties diff --git a/src/components/org/apache/jmeter/sampler/DebugSamplerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/sampler/DebugSamplerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/timers/BSFTimerResources.properties b/src/components/src/main/resources/org/apache/jmeter/timers/BSFTimerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/BSFTimerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/BSFTimerResources.properties diff --git a/src/components/org/apache/jmeter/timers/BSFTimerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/BSFTimerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/BSFTimerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/BSFTimerResources_fr.properties diff --git a/src/components/org/apache/jmeter/timers/BSFTimerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/timers/BSFTimerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/BSFTimerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/BSFTimerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/timers/BeanShellTimerResources.properties b/src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/BeanShellTimerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources.properties diff --git a/src/components/org/apache/jmeter/timers/BeanShellTimerResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_de.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/BeanShellTimerResources_de.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_de.properties diff --git a/src/components/org/apache/jmeter/timers/BeanShellTimerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/BeanShellTimerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_fr.properties diff --git a/src/components/org/apache/jmeter/timers/BeanShellTimerResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/BeanShellTimerResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties diff --git a/src/components/org/apache/jmeter/timers/BeanShellTimerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/BeanShellTimerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/BeanShellTimerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources.properties diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_es.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_es.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_es.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_es.properties diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_fr.properties diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_ja.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_ja.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_ja.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_ja.properties diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_tr.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_tr.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_tr.properties diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_TW.properties b/src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_TW.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_TW.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/ConstantThroughputTimerResources_zh_TW.properties diff --git a/src/components/org/apache/jmeter/timers/JSR223TimerResources.properties b/src/components/src/main/resources/org/apache/jmeter/timers/JSR223TimerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/JSR223TimerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/JSR223TimerResources.properties diff --git a/src/components/org/apache/jmeter/timers/JSR223TimerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/JSR223TimerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/JSR223TimerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/JSR223TimerResources_fr.properties diff --git a/src/components/org/apache/jmeter/timers/JSR223TimerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/timers/JSR223TimerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/JSR223TimerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/JSR223TimerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/timers/SyncTimerResources.properties b/src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/SyncTimerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources.properties diff --git a/src/components/org/apache/jmeter/timers/SyncTimerResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_de.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/SyncTimerResources_de.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_de.properties diff --git a/src/components/org/apache/jmeter/timers/SyncTimerResources_es.properties b/src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_es.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/SyncTimerResources_es.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_es.properties diff --git a/src/components/org/apache/jmeter/timers/SyncTimerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/SyncTimerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_fr.properties diff --git a/src/components/org/apache/jmeter/timers/SyncTimerResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/SyncTimerResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/timers/SyncTimerResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_tr.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/SyncTimerResources_tr.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_tr.properties diff --git a/src/components/org/apache/jmeter/timers/SyncTimerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/SyncTimerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/SyncTimerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources.properties b/src/components/src/main/resources/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources.properties diff --git a/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_fr.properties diff --git a/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/visualizers/BSFListenerResources.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BSFListenerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BSFListenerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BSFListenerResources.properties diff --git a/src/components/org/apache/jmeter/visualizers/BSFListenerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BSFListenerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BSFListenerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BSFListenerResources_fr.properties diff --git a/src/components/org/apache/jmeter/visualizers/BSFListenerResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BSFListenerResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BSFListenerResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BSFListenerResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/visualizers/BSFListenerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BSFListenerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BSFListenerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BSFListenerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources.properties diff --git a/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties diff --git a/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_fr.properties diff --git a/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_pt_BR.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_pt_BR.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_pt_BR.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_pt_BR.properties diff --git a/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties diff --git a/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/BeanShellListenerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/JSR223ListenerResources.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/JSR223ListenerResources.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/JSR223ListenerResources.properties diff --git a/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_fr.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/JSR223ListenerResources_fr.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_fr.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/JSR223ListenerResources_fr.properties diff --git a/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_zh_CN.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/JSR223ListenerResources_zh_CN.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_zh_CN.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/JSR223ListenerResources_zh_CN.properties diff --git a/src/components/org/apache/jmeter/visualizers/utils/colors.properties b/src/components/src/main/resources/org/apache/jmeter/visualizers/utils/colors.properties similarity index 100% rename from src/components/org/apache/jmeter/visualizers/utils/colors.properties rename to src/components/src/main/resources/org/apache/jmeter/visualizers/utils/colors.properties diff --git a/test/src/org/apache/jmeter/assertions/MD5HexAssertionSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/assertions/MD5HexAssertionSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/assertions/MD5HexAssertionSpec.groovy rename to src/components/src/test/groovy/org/apache/jmeter/assertions/MD5HexAssertionSpec.groovy diff --git a/test/src/org/apache/jmeter/assertions/gui/AssertionGuiSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/assertions/gui/AssertionGuiSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/assertions/gui/AssertionGuiSpec.groovy rename to src/components/src/test/groovy/org/apache/jmeter/assertions/gui/AssertionGuiSpec.groovy diff --git a/test/src/org/apache/jmeter/control/RandomOrderControllerSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/control/RandomOrderControllerSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/control/RandomOrderControllerSpec.groovy rename to src/components/src/test/groovy/org/apache/jmeter/control/RandomOrderControllerSpec.groovy diff --git a/test/src/org/apache/jmeter/control/RunTimeSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/control/RunTimeSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/control/RunTimeSpec.groovy rename to src/components/src/test/groovy/org/apache/jmeter/control/RunTimeSpec.groovy diff --git a/test/src/org/apache/jmeter/control/ThroughputControllerSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/control/ThroughputControllerSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/control/ThroughputControllerSpec.groovy rename to src/components/src/test/groovy/org/apache/jmeter/control/ThroughputControllerSpec.groovy diff --git a/test/src/org/apache/jmeter/extractor/BoundaryExtractorSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/extractor/BoundaryExtractorSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/extractor/BoundaryExtractorSpec.groovy rename to src/components/src/test/groovy/org/apache/jmeter/extractor/BoundaryExtractorSpec.groovy diff --git a/test/src/org/apache/jmeter/extractor/JoddExtractorSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/extractor/JoddExtractorSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/extractor/JoddExtractorSpec.groovy rename to src/components/src/test/groovy/org/apache/jmeter/extractor/JoddExtractorSpec.groovy diff --git a/test/src/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererSpec.groovy rename to src/components/src/test/groovy/org/apache/jmeter/extractor/json/render/RenderAsJsonRendererSpec.groovy diff --git a/test/src/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy b/src/components/src/test/groovy/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy rename to src/components/src/test/groovy/org/apache/jmeter/timers/UniformRandomTimerSpec.groovy diff --git a/test/src/org/apache/jmeter/JMeterVersionTest.java b/src/components/src/test/java/org/apache/jmeter/JMeterVersionTest.java similarity index 100% rename from test/src/org/apache/jmeter/JMeterVersionTest.java rename to src/components/src/test/java/org/apache/jmeter/JMeterVersionTest.java diff --git a/test/src/org/apache/jmeter/assertions/DurationAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/DurationAssertionTest.java similarity index 100% rename from test/src/org/apache/jmeter/assertions/DurationAssertionTest.java rename to src/components/src/test/java/org/apache/jmeter/assertions/DurationAssertionTest.java diff --git a/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java similarity index 100% rename from test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java rename to src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java diff --git a/test/src/org/apache/jmeter/assertions/SMIMEAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/SMIMEAssertionTest.java similarity index 100% rename from test/src/org/apache/jmeter/assertions/SMIMEAssertionTest.java rename to src/components/src/test/java/org/apache/jmeter/assertions/SMIMEAssertionTest.java diff --git a/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java similarity index 100% rename from test/src/org/apache/jmeter/assertions/SizeAssertionTest.java rename to src/components/src/test/java/org/apache/jmeter/assertions/SizeAssertionTest.java diff --git a/test/src/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java similarity index 100% rename from test/src/org/apache/jmeter/assertions/TestJSONPathAssertion.java rename to src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java diff --git a/test/src/org/apache/jmeter/assertions/TestJSONPathAssertionGui.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertionGui.java similarity index 100% rename from test/src/org/apache/jmeter/assertions/TestJSONPathAssertionGui.java rename to src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertionGui.java diff --git a/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java similarity index 100% rename from test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java rename to src/components/src/test/java/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java diff --git a/test/src/org/apache/jmeter/assertions/XPath2AssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java similarity index 91% rename from test/src/org/apache/jmeter/assertions/XPath2AssertionTest.java rename to src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java index ae12dfc93d1..b96600a1c90 100644 --- a/test/src/org/apache/jmeter/assertions/XPath2AssertionTest.java +++ b/src/components/src/test/java/org/apache/jmeter/assertions/XPath2AssertionTest.java @@ -23,14 +23,19 @@ import static org.junit.Assert.assertTrue; import javax.xml.parsers.FactoryConfigurationError; +import javax.xml.parsers.ParserConfigurationException; +import org.apache.jmeter.assertions.gui.XPath2Panel; import org.apache.jmeter.samplers.SampleResult; import org.apache.jmeter.threads.JMeterContext; import org.apache.jmeter.threads.JMeterContextService; import org.apache.jmeter.threads.JMeterVariables; import org.apache.jmeter.util.JMeterUtils; +import org.apache.jmeter.util.XPathUtil; import org.junit.Before; import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Element; public class XPath2AssertionTest { @@ -218,4 +223,18 @@ public void testXPath2AssertionPathWithoutNamespace() throws FactoryConfiguratio assertFalse("When xpath2 conforms to xml, the result of assertion should be true ",res.isFailure()); assertFalse("When the format of xpath2 is right, assertion will run correctly ",res.isError()); } + + @Test + public void testValidateXPath2() throws ParserConfigurationException { + Document testDoc = XPathUtil.makeDocumentBuilder(false, false, false, false).newDocument(); + Element el = testDoc.createElement("root"); //$NON-NLS-1$ + testDoc.appendChild(el); + String namespaces = "a=http://www.w3.org/2003/01/geo/wgs84_pos# b=http://www.w3.org/2003/01/geo/wgs85_pos#"; + String xPathQuery = "//Employees/b:Employee[1]/a:ag"; + assertTrue("When the user give namspaces, the result of validation should be true", + XPath2Panel.validXPath(xPathQuery, false, namespaces)); + namespaces = "a=http://www.w3.org/2003/01/geo/wgs84_pos#"; + assertFalse("When the user doesn't give namspaces, the result of validation should be false", + XPath2Panel.validXPath(xPathQuery, false, namespaces)); + } } diff --git a/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java similarity index 100% rename from test/src/org/apache/jmeter/assertions/XPathAssertionTest.java rename to src/components/src/test/java/org/apache/jmeter/assertions/XPathAssertionTest.java diff --git a/test/src/org/apache/jmeter/assertions/XmlAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java similarity index 100% rename from test/src/org/apache/jmeter/assertions/XmlAssertionTest.java rename to src/components/src/test/java/org/apache/jmeter/assertions/XmlAssertionTest.java diff --git a/test/src/org/apache/jmeter/config/TestCVSDataSet.java b/src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java similarity index 100% rename from test/src/org/apache/jmeter/config/TestCVSDataSet.java rename to src/components/src/test/java/org/apache/jmeter/config/TestCVSDataSet.java diff --git a/test/src/org/apache/jmeter/config/TestRandomVariableConfig.java b/src/components/src/test/java/org/apache/jmeter/config/TestRandomVariableConfig.java similarity index 100% rename from test/src/org/apache/jmeter/config/TestRandomVariableConfig.java rename to src/components/src/test/java/org/apache/jmeter/config/TestRandomVariableConfig.java diff --git a/test/src/org/apache/jmeter/config/gui/TestArgumentsPanel.java b/src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java similarity index 100% rename from test/src/org/apache/jmeter/config/gui/TestArgumentsPanel.java rename to src/components/src/test/java/org/apache/jmeter/config/gui/TestArgumentsPanel.java diff --git a/test/src/org/apache/jmeter/control/TestGenericController.java b/src/components/src/test/java/org/apache/jmeter/control/TestGenericController.java similarity index 100% rename from test/src/org/apache/jmeter/control/TestGenericController.java rename to src/components/src/test/java/org/apache/jmeter/control/TestGenericController.java diff --git a/test/src/org/apache/jmeter/control/TestIfController.java b/src/components/src/test/java/org/apache/jmeter/control/TestIfController.java similarity index 100% rename from test/src/org/apache/jmeter/control/TestIfController.java rename to src/components/src/test/java/org/apache/jmeter/control/TestIfController.java diff --git a/test/src/org/apache/jmeter/control/TestInterleaveControl.java b/src/components/src/test/java/org/apache/jmeter/control/TestInterleaveControl.java similarity index 100% rename from test/src/org/apache/jmeter/control/TestInterleaveControl.java rename to src/components/src/test/java/org/apache/jmeter/control/TestInterleaveControl.java diff --git a/test/src/org/apache/jmeter/control/TestLoopController.java b/src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java similarity index 100% rename from test/src/org/apache/jmeter/control/TestLoopController.java rename to src/components/src/test/java/org/apache/jmeter/control/TestLoopController.java diff --git a/test/src/org/apache/jmeter/control/TestOnceOnlyController.java b/src/components/src/test/java/org/apache/jmeter/control/TestOnceOnlyController.java similarity index 100% rename from test/src/org/apache/jmeter/control/TestOnceOnlyController.java rename to src/components/src/test/java/org/apache/jmeter/control/TestOnceOnlyController.java diff --git a/test/src/org/apache/jmeter/control/TestRandomController.java b/src/components/src/test/java/org/apache/jmeter/control/TestRandomController.java similarity index 100% rename from test/src/org/apache/jmeter/control/TestRandomController.java rename to src/components/src/test/java/org/apache/jmeter/control/TestRandomController.java diff --git a/test/src/org/apache/jmeter/control/TestTransactionController.java b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java similarity index 100% rename from test/src/org/apache/jmeter/control/TestTransactionController.java rename to src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java diff --git a/test/src/org/apache/jmeter/control/TestWhileController.java b/src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java similarity index 100% rename from test/src/org/apache/jmeter/control/TestWhileController.java rename to src/components/src/test/java/org/apache/jmeter/control/TestWhileController.java diff --git a/test/src/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java similarity index 100% rename from test/src/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java rename to src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJSoup.java diff --git a/test/src/org/apache/jmeter/extractor/TestHtmlExtractorJodd.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJodd.java similarity index 100% rename from test/src/org/apache/jmeter/extractor/TestHtmlExtractorJodd.java rename to src/components/src/test/java/org/apache/jmeter/extractor/TestHtmlExtractorJodd.java diff --git a/test/src/org/apache/jmeter/extractor/TestJSONPostProcessor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java similarity index 100% rename from test/src/org/apache/jmeter/extractor/TestJSONPostProcessor.java rename to src/components/src/test/java/org/apache/jmeter/extractor/TestJSONPostProcessor.java diff --git a/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java similarity index 100% rename from test/src/org/apache/jmeter/extractor/TestRegexExtractor.java rename to src/components/src/test/java/org/apache/jmeter/extractor/TestRegexExtractor.java diff --git a/test/src/org/apache/jmeter/extractor/TestXPath2Extractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java similarity index 100% rename from test/src/org/apache/jmeter/extractor/TestXPath2Extractor.java rename to src/components/src/test/java/org/apache/jmeter/extractor/TestXPath2Extractor.java diff --git a/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java b/src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java similarity index 100% rename from test/src/org/apache/jmeter/extractor/TestXPathExtractor.java rename to src/components/src/test/java/org/apache/jmeter/extractor/TestXPathExtractor.java diff --git a/test/src/org/apache/jmeter/gui/action/TestSave.java b/src/components/src/test/java/org/apache/jmeter/gui/action/TestSave.java similarity index 100% rename from test/src/org/apache/jmeter/gui/action/TestSave.java rename to src/components/src/test/java/org/apache/jmeter/gui/action/TestSave.java diff --git a/test/src/org/apache/jmeter/gui/action/template/TestTemplateManager.java b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java similarity index 100% rename from test/src/org/apache/jmeter/gui/action/template/TestTemplateManager.java rename to src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java diff --git a/test/src/org/apache/jmeter/reporters/TestResultSaver.java b/src/components/src/test/java/org/apache/jmeter/reporters/TestResultSaver.java similarity index 100% rename from test/src/org/apache/jmeter/reporters/TestResultSaver.java rename to src/components/src/test/java/org/apache/jmeter/reporters/TestResultSaver.java diff --git a/test/src/org/apache/jmeter/timers/ConstantThroughputTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java similarity index 100% rename from test/src/org/apache/jmeter/timers/ConstantThroughputTimerTest.java rename to src/components/src/test/java/org/apache/jmeter/timers/ConstantThroughputTimerTest.java diff --git a/test/src/org/apache/jmeter/timers/SyncTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java similarity index 100% rename from test/src/org/apache/jmeter/timers/SyncTimerTest.java rename to src/components/src/test/java/org/apache/jmeter/timers/SyncTimerTest.java diff --git a/test/src/org/apache/jmeter/timers/TimerServiceTest.java b/src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java similarity index 100% rename from test/src/org/apache/jmeter/timers/TimerServiceTest.java rename to src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java diff --git a/test/src/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java b/src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java similarity index 100% rename from test/src/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java rename to src/components/src/test/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerTest.java diff --git a/test/src/org/apache/jmeter/visualizers/TestRenderAsJson.java b/src/components/src/test/java/org/apache/jmeter/visualizers/TestRenderAsJson.java similarity index 100% rename from test/src/org/apache/jmeter/visualizers/TestRenderAsJson.java rename to src/components/src/test/java/org/apache/jmeter/visualizers/TestRenderAsJson.java diff --git a/test/src/org/apache/jmeter/visualizers/TestSampleCompareTo.java b/src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java similarity index 100% rename from test/src/org/apache/jmeter/visualizers/TestSampleCompareTo.java rename to src/components/src/test/java/org/apache/jmeter/visualizers/TestSampleCompareTo.java diff --git a/test/src/org/apache/jmeter/visualizers/TestSamplingStatCalculator.java b/src/components/src/test/java/org/apache/jmeter/visualizers/TestSamplingStatCalculator.java similarity index 100% rename from test/src/org/apache/jmeter/visualizers/TestSamplingStatCalculator.java rename to src/components/src/test/java/org/apache/jmeter/visualizers/TestSamplingStatCalculator.java diff --git a/test/src/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java similarity index 100% rename from test/src/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java rename to src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricFixedModeTest.java diff --git a/test/src/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java similarity index 100% rename from test/src/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java rename to src/components/src/test/java/org/apache/jmeter/visualizers/backend/SamplerMetricTimedModeTest.java diff --git a/test/resources/org/apache/jmeter/assertions/email.pem b/src/components/src/test/resources/org/apache/jmeter/assertions/email.pem similarity index 100% rename from test/resources/org/apache/jmeter/assertions/email.pem rename to src/components/src/test/resources/org/apache/jmeter/assertions/email.pem diff --git a/test/resources/org/apache/jmeter/assertions/signed_email.eml b/src/components/src/test/resources/org/apache/jmeter/assertions/signed_email.eml similarity index 100% rename from test/resources/org/apache/jmeter/assertions/signed_email.eml rename to src/components/src/test/resources/org/apache/jmeter/assertions/signed_email.eml diff --git a/test/resources/org/apache/jmeter/gui/action/template/invalidTemplates.xml b/src/components/src/test/resources/org/apache/jmeter/gui/action/template/invalidTemplates.xml similarity index 100% rename from test/resources/org/apache/jmeter/gui/action/template/invalidTemplates.xml rename to src/components/src/test/resources/org/apache/jmeter/gui/action/template/invalidTemplates.xml diff --git a/test/resources/org/apache/jmeter/gui/action/template/validTemplates.xml b/src/components/src/test/resources/org/apache/jmeter/gui/action/template/validTemplates.xml similarity index 100% rename from test/resources/org/apache/jmeter/gui/action/template/validTemplates.xml rename to src/components/src/test/resources/org/apache/jmeter/gui/action/template/validTemplates.xml diff --git a/src/core/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java similarity index 99% rename from src/core/org/apache/jmeter/JMeter.java rename to src/core/src/main/java/org/apache/jmeter/JMeter.java index f12143c94ff..1a26d7b5015 100644 --- a/src/core/org/apache/jmeter/JMeter.java +++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java @@ -100,6 +100,7 @@ import org.apache.jmeter.util.BeanShellInterpreter; import org.apache.jmeter.util.BeanShellServer; import org.apache.jmeter.util.JMeterUtils; +import org.apache.jmeter.util.ShutdownClient; import org.apache.jorphan.collections.HashTree; import org.apache.jorphan.collections.SearchByClass; import org.apache.jorphan.gui.ComponentUtil; @@ -123,7 +124,7 @@ public class JMeter implements JMeterPlugin { private static final Logger log = LoggerFactory.getLogger(JMeter.class); - public static final int UDP_PORT_DEFAULT = 4445; // needed for ShutdownClient + public static final int UDP_PORT_DEFAULT = ShutdownClient.UDP_PORT_DEFAULT; public static final String HTTP_PROXY_PASS = "http.proxyPass"; // $NON-NLS-1$ diff --git a/src/core/org/apache/jmeter/ProxyAuthenticator.java b/src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java similarity index 100% rename from src/core/org/apache/jmeter/ProxyAuthenticator.java rename to src/core/src/main/java/org/apache/jmeter/ProxyAuthenticator.java diff --git a/src/core/org/apache/jmeter/SplashScreen.java b/src/core/src/main/java/org/apache/jmeter/SplashScreen.java similarity index 100% rename from src/core/org/apache/jmeter/SplashScreen.java rename to src/core/src/main/java/org/apache/jmeter/SplashScreen.java diff --git a/src/core/org/apache/jmeter/assertions/Assertion.java b/src/core/src/main/java/org/apache/jmeter/assertions/Assertion.java similarity index 100% rename from src/core/org/apache/jmeter/assertions/Assertion.java rename to src/core/src/main/java/org/apache/jmeter/assertions/Assertion.java diff --git a/src/core/org/apache/jmeter/assertions/AssertionResult.java b/src/core/src/main/java/org/apache/jmeter/assertions/AssertionResult.java similarity index 100% rename from src/core/org/apache/jmeter/assertions/AssertionResult.java rename to src/core/src/main/java/org/apache/jmeter/assertions/AssertionResult.java diff --git a/src/core/org/apache/jmeter/assertions/CompareAssertionResult.java b/src/core/src/main/java/org/apache/jmeter/assertions/CompareAssertionResult.java similarity index 100% rename from src/core/org/apache/jmeter/assertions/CompareAssertionResult.java rename to src/core/src/main/java/org/apache/jmeter/assertions/CompareAssertionResult.java diff --git a/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java b/src/core/src/main/java/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java similarity index 100% rename from src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java rename to src/core/src/main/java/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java diff --git a/src/core/org/apache/jmeter/config/Argument.java b/src/core/src/main/java/org/apache/jmeter/config/Argument.java similarity index 100% rename from src/core/org/apache/jmeter/config/Argument.java rename to src/core/src/main/java/org/apache/jmeter/config/Argument.java diff --git a/src/core/org/apache/jmeter/config/Arguments.java b/src/core/src/main/java/org/apache/jmeter/config/Arguments.java similarity index 100% rename from src/core/org/apache/jmeter/config/Arguments.java rename to src/core/src/main/java/org/apache/jmeter/config/Arguments.java diff --git a/src/core/org/apache/jmeter/config/ConfigElement.java b/src/core/src/main/java/org/apache/jmeter/config/ConfigElement.java similarity index 100% rename from src/core/org/apache/jmeter/config/ConfigElement.java rename to src/core/src/main/java/org/apache/jmeter/config/ConfigElement.java diff --git a/src/core/org/apache/jmeter/config/ConfigTestElement.java b/src/core/src/main/java/org/apache/jmeter/config/ConfigTestElement.java similarity index 100% rename from src/core/org/apache/jmeter/config/ConfigTestElement.java rename to src/core/src/main/java/org/apache/jmeter/config/ConfigTestElement.java diff --git a/src/core/org/apache/jmeter/config/LoginConfig.java b/src/core/src/main/java/org/apache/jmeter/config/LoginConfig.java similarity index 100% rename from src/core/org/apache/jmeter/config/LoginConfig.java rename to src/core/src/main/java/org/apache/jmeter/config/LoginConfig.java diff --git a/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java b/src/core/src/main/java/org/apache/jmeter/config/gui/AbstractConfigGui.java similarity index 100% rename from src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java rename to src/core/src/main/java/org/apache/jmeter/config/gui/AbstractConfigGui.java diff --git a/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java similarity index 100% rename from src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java rename to src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java diff --git a/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java b/src/core/src/main/java/org/apache/jmeter/config/gui/LoginConfigGui.java similarity index 100% rename from src/core/org/apache/jmeter/config/gui/LoginConfigGui.java rename to src/core/src/main/java/org/apache/jmeter/config/gui/LoginConfigGui.java diff --git a/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java b/src/core/src/main/java/org/apache/jmeter/config/gui/ObsoleteGui.java similarity index 100% rename from src/core/org/apache/jmeter/config/gui/ObsoleteGui.java rename to src/core/src/main/java/org/apache/jmeter/config/gui/ObsoleteGui.java diff --git a/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java b/src/core/src/main/java/org/apache/jmeter/config/gui/RowDetailDialog.java similarity index 100% rename from src/core/org/apache/jmeter/config/gui/RowDetailDialog.java rename to src/core/src/main/java/org/apache/jmeter/config/gui/RowDetailDialog.java diff --git a/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java b/src/core/src/main/java/org/apache/jmeter/config/gui/SimpleConfigGui.java similarity index 100% rename from src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java rename to src/core/src/main/java/org/apache/jmeter/config/gui/SimpleConfigGui.java diff --git a/src/core/org/apache/jmeter/control/Controller.java b/src/core/src/main/java/org/apache/jmeter/control/Controller.java similarity index 100% rename from src/core/org/apache/jmeter/control/Controller.java rename to src/core/src/main/java/org/apache/jmeter/control/Controller.java diff --git a/src/core/org/apache/jmeter/control/GenericController.java b/src/core/src/main/java/org/apache/jmeter/control/GenericController.java similarity index 100% rename from src/core/org/apache/jmeter/control/GenericController.java rename to src/core/src/main/java/org/apache/jmeter/control/GenericController.java diff --git a/src/core/org/apache/jmeter/control/IfController.java b/src/core/src/main/java/org/apache/jmeter/control/IfController.java similarity index 100% rename from src/core/org/apache/jmeter/control/IfController.java rename to src/core/src/main/java/org/apache/jmeter/control/IfController.java diff --git a/src/core/org/apache/jmeter/control/IteratingController.java b/src/core/src/main/java/org/apache/jmeter/control/IteratingController.java similarity index 100% rename from src/core/org/apache/jmeter/control/IteratingController.java rename to src/core/src/main/java/org/apache/jmeter/control/IteratingController.java diff --git a/src/core/org/apache/jmeter/control/LoopController.java b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java similarity index 100% rename from src/core/org/apache/jmeter/control/LoopController.java rename to src/core/src/main/java/org/apache/jmeter/control/LoopController.java diff --git a/src/core/org/apache/jmeter/control/NextIsNullException.java b/src/core/src/main/java/org/apache/jmeter/control/NextIsNullException.java similarity index 100% rename from src/core/org/apache/jmeter/control/NextIsNullException.java rename to src/core/src/main/java/org/apache/jmeter/control/NextIsNullException.java diff --git a/src/core/org/apache/jmeter/control/ReplaceableController.java b/src/core/src/main/java/org/apache/jmeter/control/ReplaceableController.java similarity index 100% rename from src/core/org/apache/jmeter/control/ReplaceableController.java rename to src/core/src/main/java/org/apache/jmeter/control/ReplaceableController.java diff --git a/src/core/org/apache/jmeter/control/RunTime.java b/src/core/src/main/java/org/apache/jmeter/control/RunTime.java similarity index 100% rename from src/core/org/apache/jmeter/control/RunTime.java rename to src/core/src/main/java/org/apache/jmeter/control/RunTime.java diff --git a/src/core/org/apache/jmeter/control/TestFragmentController.java b/src/core/src/main/java/org/apache/jmeter/control/TestFragmentController.java similarity index 100% rename from src/core/org/apache/jmeter/control/TestFragmentController.java rename to src/core/src/main/java/org/apache/jmeter/control/TestFragmentController.java diff --git a/src/core/org/apache/jmeter/control/TransactionController.java b/src/core/src/main/java/org/apache/jmeter/control/TransactionController.java similarity index 100% rename from src/core/org/apache/jmeter/control/TransactionController.java rename to src/core/src/main/java/org/apache/jmeter/control/TransactionController.java diff --git a/src/core/org/apache/jmeter/control/TransactionSampler.java b/src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java similarity index 100% rename from src/core/org/apache/jmeter/control/TransactionSampler.java rename to src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java diff --git a/src/core/org/apache/jmeter/control/WhileController.java b/src/core/src/main/java/org/apache/jmeter/control/WhileController.java similarity index 100% rename from src/core/org/apache/jmeter/control/WhileController.java rename to src/core/src/main/java/org/apache/jmeter/control/WhileController.java diff --git a/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/AbstractControllerGui.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/AbstractControllerGui.java diff --git a/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java b/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/IfControllerPanel.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java diff --git a/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/LogicControllerGui.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/LogicControllerGui.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/LogicControllerGui.java diff --git a/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java b/src/core/src/main/java/org/apache/jmeter/control/gui/LoopControlPanel.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/LoopControlPanel.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/LoopControlPanel.java diff --git a/src/core/org/apache/jmeter/control/gui/RunTimeGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/RunTimeGui.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/RunTimeGui.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/RunTimeGui.java diff --git a/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/TestFragmentControllerGui.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/TestFragmentControllerGui.java diff --git a/src/core/org/apache/jmeter/control/gui/TestPlanGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/TestPlanGui.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/TestPlanGui.java diff --git a/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/TransactionControllerGui.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/TransactionControllerGui.java diff --git a/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/WhileControllerGui.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java diff --git a/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java similarity index 100% rename from src/core/org/apache/jmeter/control/gui/WorkBenchGui.java rename to src/core/src/main/java/org/apache/jmeter/control/gui/WorkBenchGui.java diff --git a/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java similarity index 100% rename from src/core/org/apache/jmeter/engine/ClientJMeterEngine.java rename to src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java diff --git a/src/core/org/apache/jmeter/engine/ConvertListeners.java b/src/core/src/main/java/org/apache/jmeter/engine/ConvertListeners.java similarity index 100% rename from src/core/org/apache/jmeter/engine/ConvertListeners.java rename to src/core/src/main/java/org/apache/jmeter/engine/ConvertListeners.java diff --git a/src/core/org/apache/jmeter/engine/DistributedRunner.java b/src/core/src/main/java/org/apache/jmeter/engine/DistributedRunner.java similarity index 100% rename from src/core/org/apache/jmeter/engine/DistributedRunner.java rename to src/core/src/main/java/org/apache/jmeter/engine/DistributedRunner.java diff --git a/src/core/org/apache/jmeter/engine/JMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/JMeterEngine.java similarity index 100% rename from src/core/org/apache/jmeter/engine/JMeterEngine.java rename to src/core/src/main/java/org/apache/jmeter/engine/JMeterEngine.java diff --git a/src/core/org/apache/jmeter/engine/JMeterEngineException.java b/src/core/src/main/java/org/apache/jmeter/engine/JMeterEngineException.java similarity index 100% rename from src/core/org/apache/jmeter/engine/JMeterEngineException.java rename to src/core/src/main/java/org/apache/jmeter/engine/JMeterEngineException.java diff --git a/src/core/org/apache/jmeter/engine/PreCompiler.java b/src/core/src/main/java/org/apache/jmeter/engine/PreCompiler.java similarity index 100% rename from src/core/org/apache/jmeter/engine/PreCompiler.java rename to src/core/src/main/java/org/apache/jmeter/engine/PreCompiler.java diff --git a/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java similarity index 100% rename from src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java rename to src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java diff --git a/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java similarity index 100% rename from src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java rename to src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java diff --git a/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java similarity index 100% rename from src/core/org/apache/jmeter/engine/StandardJMeterEngine.java rename to src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java diff --git a/src/core/org/apache/jmeter/engine/TreeCloner.java b/src/core/src/main/java/org/apache/jmeter/engine/TreeCloner.java similarity index 100% rename from src/core/org/apache/jmeter/engine/TreeCloner.java rename to src/core/src/main/java/org/apache/jmeter/engine/TreeCloner.java diff --git a/src/core/org/apache/jmeter/engine/TreeClonerNoTimer.java b/src/core/src/main/java/org/apache/jmeter/engine/TreeClonerNoTimer.java similarity index 100% rename from src/core/org/apache/jmeter/engine/TreeClonerNoTimer.java rename to src/core/src/main/java/org/apache/jmeter/engine/TreeClonerNoTimer.java diff --git a/src/core/org/apache/jmeter/engine/TurnElementsOn.java b/src/core/src/main/java/org/apache/jmeter/engine/TurnElementsOn.java similarity index 100% rename from src/core/org/apache/jmeter/engine/TurnElementsOn.java rename to src/core/src/main/java/org/apache/jmeter/engine/TurnElementsOn.java diff --git a/src/core/org/apache/jmeter/engine/event/LoopIterationEvent.java b/src/core/src/main/java/org/apache/jmeter/engine/event/LoopIterationEvent.java similarity index 100% rename from src/core/org/apache/jmeter/engine/event/LoopIterationEvent.java rename to src/core/src/main/java/org/apache/jmeter/engine/event/LoopIterationEvent.java diff --git a/src/core/org/apache/jmeter/engine/event/LoopIterationListener.java b/src/core/src/main/java/org/apache/jmeter/engine/event/LoopIterationListener.java similarity index 100% rename from src/core/org/apache/jmeter/engine/event/LoopIterationListener.java rename to src/core/src/main/java/org/apache/jmeter/engine/event/LoopIterationListener.java diff --git a/src/core/org/apache/jmeter/engine/package-info.java b/src/core/src/main/java/org/apache/jmeter/engine/package-info.java similarity index 100% rename from src/core/org/apache/jmeter/engine/package-info.java rename to src/core/src/main/java/org/apache/jmeter/engine/package-info.java diff --git a/src/core/org/apache/jmeter/engine/util/AbstractTransformer.java b/src/core/src/main/java/org/apache/jmeter/engine/util/AbstractTransformer.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/AbstractTransformer.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/AbstractTransformer.java diff --git a/src/core/org/apache/jmeter/engine/util/CompoundVariable.java b/src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/CompoundVariable.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/CompoundVariable.java diff --git a/src/core/org/apache/jmeter/engine/util/ConfigMergabilityIndicator.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ConfigMergabilityIndicator.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/ConfigMergabilityIndicator.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/ConfigMergabilityIndicator.java diff --git a/src/core/org/apache/jmeter/engine/util/FunctionParser.java b/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/FunctionParser.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java diff --git a/src/core/org/apache/jmeter/engine/util/NoConfigMerge.java b/src/core/src/main/java/org/apache/jmeter/engine/util/NoConfigMerge.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/NoConfigMerge.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/NoConfigMerge.java diff --git a/src/core/org/apache/jmeter/engine/util/NoThreadClone.java b/src/core/src/main/java/org/apache/jmeter/engine/util/NoThreadClone.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/NoThreadClone.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/NoThreadClone.java diff --git a/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java diff --git a/src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/ReplaceStringWithFunctions.java diff --git a/src/core/org/apache/jmeter/engine/util/SimpleVariable.java b/src/core/src/main/java/org/apache/jmeter/engine/util/SimpleVariable.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/SimpleVariable.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/SimpleVariable.java diff --git a/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java b/src/core/src/main/java/org/apache/jmeter/engine/util/UndoVariableReplacement.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/UndoVariableReplacement.java diff --git a/src/core/org/apache/jmeter/engine/util/ValueReplacer.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/ValueReplacer.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/ValueReplacer.java diff --git a/src/core/org/apache/jmeter/engine/util/ValueTransformer.java b/src/core/src/main/java/org/apache/jmeter/engine/util/ValueTransformer.java similarity index 100% rename from src/core/org/apache/jmeter/engine/util/ValueTransformer.java rename to src/core/src/main/java/org/apache/jmeter/engine/util/ValueTransformer.java diff --git a/src/core/org/apache/jmeter/exceptions/IllegalUserActionException.java b/src/core/src/main/java/org/apache/jmeter/exceptions/IllegalUserActionException.java similarity index 100% rename from src/core/org/apache/jmeter/exceptions/IllegalUserActionException.java rename to src/core/src/main/java/org/apache/jmeter/exceptions/IllegalUserActionException.java diff --git a/src/core/org/apache/jmeter/functions/AbstractFunction.java b/src/core/src/main/java/org/apache/jmeter/functions/AbstractFunction.java similarity index 100% rename from src/core/org/apache/jmeter/functions/AbstractFunction.java rename to src/core/src/main/java/org/apache/jmeter/functions/AbstractFunction.java diff --git a/src/core/org/apache/jmeter/functions/Function.java b/src/core/src/main/java/org/apache/jmeter/functions/Function.java similarity index 100% rename from src/core/org/apache/jmeter/functions/Function.java rename to src/core/src/main/java/org/apache/jmeter/functions/Function.java diff --git a/src/core/org/apache/jmeter/functions/InvalidVariableException.java b/src/core/src/main/java/org/apache/jmeter/functions/InvalidVariableException.java similarity index 100% rename from src/core/org/apache/jmeter/functions/InvalidVariableException.java rename to src/core/src/main/java/org/apache/jmeter/functions/InvalidVariableException.java diff --git a/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java similarity index 100% rename from src/core/org/apache/jmeter/functions/gui/FunctionHelper.java rename to src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java diff --git a/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java similarity index 100% rename from src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java rename to src/core/src/main/java/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java diff --git a/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java similarity index 100% rename from src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java rename to src/core/src/main/java/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java diff --git a/src/core/org/apache/jmeter/gui/ClearGui.java b/src/core/src/main/java/org/apache/jmeter/gui/ClearGui.java similarity index 100% rename from src/core/org/apache/jmeter/gui/ClearGui.java rename to src/core/src/main/java/org/apache/jmeter/gui/ClearGui.java diff --git a/src/core/org/apache/jmeter/gui/CommentPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/CommentPanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/CommentPanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/CommentPanel.java diff --git a/src/core/org/apache/jmeter/gui/GUIFactory.java b/src/core/src/main/java/org/apache/jmeter/gui/GUIFactory.java similarity index 100% rename from src/core/org/apache/jmeter/gui/GUIFactory.java rename to src/core/src/main/java/org/apache/jmeter/gui/GUIFactory.java diff --git a/src/core/org/apache/jmeter/gui/GUIMenuSortOrder.java b/src/core/src/main/java/org/apache/jmeter/gui/GUIMenuSortOrder.java similarity index 100% rename from src/core/org/apache/jmeter/gui/GUIMenuSortOrder.java rename to src/core/src/main/java/org/apache/jmeter/gui/GUIMenuSortOrder.java diff --git a/src/core/org/apache/jmeter/gui/GlobalUndoableEdit.java b/src/core/src/main/java/org/apache/jmeter/gui/GlobalUndoableEdit.java similarity index 100% rename from src/core/org/apache/jmeter/gui/GlobalUndoableEdit.java rename to src/core/src/main/java/org/apache/jmeter/gui/GlobalUndoableEdit.java diff --git a/src/core/org/apache/jmeter/gui/GuiPackage.java b/src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java similarity index 100% rename from src/core/org/apache/jmeter/gui/GuiPackage.java rename to src/core/src/main/java/org/apache/jmeter/gui/GuiPackage.java diff --git a/src/core/org/apache/jmeter/gui/HtmlReportAction.java b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java similarity index 100% rename from src/core/org/apache/jmeter/gui/HtmlReportAction.java rename to src/core/src/main/java/org/apache/jmeter/gui/HtmlReportAction.java diff --git a/src/core/org/apache/jmeter/gui/HtmlReportUI.java b/src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java similarity index 100% rename from src/core/org/apache/jmeter/gui/HtmlReportUI.java rename to src/core/src/main/java/org/apache/jmeter/gui/HtmlReportUI.java diff --git a/src/core/org/apache/jmeter/gui/JMeterFileFilter.java b/src/core/src/main/java/org/apache/jmeter/gui/JMeterFileFilter.java similarity index 100% rename from src/core/org/apache/jmeter/gui/JMeterFileFilter.java rename to src/core/src/main/java/org/apache/jmeter/gui/JMeterFileFilter.java diff --git a/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java similarity index 100% rename from src/core/org/apache/jmeter/gui/JMeterGUIComponent.java rename to src/core/src/main/java/org/apache/jmeter/gui/JMeterGUIComponent.java diff --git a/src/core/org/apache/jmeter/gui/LoggerPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/LoggerPanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java diff --git a/src/core/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java similarity index 100% rename from src/core/org/apache/jmeter/gui/MainFrame.java rename to src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java diff --git a/src/core/org/apache/jmeter/gui/NamePanel.java b/src/core/src/main/java/org/apache/jmeter/gui/NamePanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/NamePanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/NamePanel.java diff --git a/src/core/org/apache/jmeter/gui/OnErrorPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/OnErrorPanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/OnErrorPanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/OnErrorPanel.java diff --git a/src/core/org/apache/jmeter/gui/Replaceable.java b/src/core/src/main/java/org/apache/jmeter/gui/Replaceable.java similarity index 100% rename from src/core/org/apache/jmeter/gui/Replaceable.java rename to src/core/src/main/java/org/apache/jmeter/gui/Replaceable.java diff --git a/src/core/org/apache/jmeter/gui/SavePropertyDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/SavePropertyDialog.java similarity index 100% rename from src/core/org/apache/jmeter/gui/SavePropertyDialog.java rename to src/core/src/main/java/org/apache/jmeter/gui/SavePropertyDialog.java diff --git a/src/core/org/apache/jmeter/gui/Searchable.java b/src/core/src/main/java/org/apache/jmeter/gui/Searchable.java similarity index 100% rename from src/core/org/apache/jmeter/gui/Searchable.java rename to src/core/src/main/java/org/apache/jmeter/gui/Searchable.java diff --git a/src/core/org/apache/jmeter/gui/ServerPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/ServerPanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/ServerPanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/ServerPanel.java diff --git a/src/core/org/apache/jmeter/gui/SimpleCompoundEdit.java b/src/core/src/main/java/org/apache/jmeter/gui/SimpleCompoundEdit.java similarity index 100% rename from src/core/org/apache/jmeter/gui/SimpleCompoundEdit.java rename to src/core/src/main/java/org/apache/jmeter/gui/SimpleCompoundEdit.java diff --git a/src/core/org/apache/jmeter/gui/Stoppable.java b/src/core/src/main/java/org/apache/jmeter/gui/Stoppable.java similarity index 100% rename from src/core/org/apache/jmeter/gui/Stoppable.java rename to src/core/src/main/java/org/apache/jmeter/gui/Stoppable.java diff --git a/src/core/org/apache/jmeter/gui/TestPlanListener.java b/src/core/src/main/java/org/apache/jmeter/gui/TestPlanListener.java similarity index 100% rename from src/core/org/apache/jmeter/gui/TestPlanListener.java rename to src/core/src/main/java/org/apache/jmeter/gui/TestPlanListener.java diff --git a/src/core/org/apache/jmeter/gui/TreeState.java b/src/core/src/main/java/org/apache/jmeter/gui/TreeState.java similarity index 100% rename from src/core/org/apache/jmeter/gui/TreeState.java rename to src/core/src/main/java/org/apache/jmeter/gui/TreeState.java diff --git a/src/core/org/apache/jmeter/gui/UndoHistory.java b/src/core/src/main/java/org/apache/jmeter/gui/UndoHistory.java similarity index 100% rename from src/core/org/apache/jmeter/gui/UndoHistory.java rename to src/core/src/main/java/org/apache/jmeter/gui/UndoHistory.java diff --git a/src/core/org/apache/jmeter/gui/UndoHistoryItem.java b/src/core/src/main/java/org/apache/jmeter/gui/UndoHistoryItem.java similarity index 100% rename from src/core/org/apache/jmeter/gui/UndoHistoryItem.java rename to src/core/src/main/java/org/apache/jmeter/gui/UndoHistoryItem.java diff --git a/src/core/org/apache/jmeter/gui/UnsharedComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/UnsharedComponent.java similarity index 100% rename from src/core/org/apache/jmeter/gui/UnsharedComponent.java rename to src/core/src/main/java/org/apache/jmeter/gui/UnsharedComponent.java diff --git a/src/core/org/apache/jmeter/gui/action/AboutCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/AboutCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/AbstractAction.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/AbstractAction.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/AbstractAction.java diff --git a/src/core/org/apache/jmeter/gui/action/AbstractActionWithNoRunningTest.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AbstractActionWithNoRunningTest.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/AbstractActionWithNoRunningTest.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/AbstractActionWithNoRunningTest.java diff --git a/src/core/org/apache/jmeter/gui/action/ActionNames.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionNames.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/ActionNames.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/ActionNames.java diff --git a/src/core/org/apache/jmeter/gui/action/ActionRouter.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/ActionRouter.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/ActionRouter.java diff --git a/src/core/org/apache/jmeter/gui/action/AddParent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/AddParent.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/AddParent.java diff --git a/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java diff --git a/src/core/org/apache/jmeter/gui/action/AddToTree.java b/src/core/src/main/java/org/apache/jmeter/gui/action/AddToTree.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/AddToTree.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/AddToTree.java diff --git a/src/core/org/apache/jmeter/gui/action/ApplyNamingConvention.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/ApplyNamingConvention.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/ApplyNamingConvention.java diff --git a/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeLanguage.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/ChangeLanguage.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/ChangeLanguage.java diff --git a/src/core/org/apache/jmeter/gui/action/ChangeParent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/ChangeParent.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/ChangeParent.java diff --git a/src/core/org/apache/jmeter/gui/action/CheckDirty.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CheckDirty.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/CheckDirty.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/CheckDirty.java diff --git a/src/core/org/apache/jmeter/gui/action/Clear.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Clear.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Clear.java diff --git a/src/core/org/apache/jmeter/gui/action/Close.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Close.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Close.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Close.java diff --git a/src/core/org/apache/jmeter/gui/action/CollapseExpand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/CollapseExpand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpand.java diff --git a/src/core/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/CollapseExpandTreeBranch.java diff --git a/src/core/org/apache/jmeter/gui/action/Command.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Command.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Command.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Command.java diff --git a/src/core/org/apache/jmeter/gui/action/CompileJSR223TestElements.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/CompileJSR223TestElements.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java diff --git a/src/core/org/apache/jmeter/gui/action/Copy.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Copy.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Copy.java diff --git a/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CreateFunctionDialog.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/CreateFunctionDialog.java diff --git a/src/core/org/apache/jmeter/gui/action/Cut.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Cut.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Cut.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Cut.java diff --git a/src/core/org/apache/jmeter/gui/action/Duplicate.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Duplicate.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Duplicate.java diff --git a/src/core/org/apache/jmeter/gui/action/EditCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/EditCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/EditCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/EditCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/EnableComponent.java b/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/EnableComponent.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java diff --git a/src/core/org/apache/jmeter/gui/action/ExitCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ExitCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/ExitCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/ExitCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/Help.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Help.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Help.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Help.java diff --git a/src/core/org/apache/jmeter/gui/action/HtmlReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/HtmlReportGenerator.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java diff --git a/src/core/org/apache/jmeter/gui/action/KeyStrokes.java b/src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/KeyStrokes.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/KeyStrokes.java diff --git a/src/core/org/apache/jmeter/gui/action/Load.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Load.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Load.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Load.java diff --git a/src/core/org/apache/jmeter/gui/action/LoadDraggedFile.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadDraggedFile.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/LoadDraggedFile.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/LoadDraggedFile.java diff --git a/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/LoadRecentProject.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/LoadRecentProject.java diff --git a/src/core/org/apache/jmeter/gui/action/LogLevelCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LogLevelCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/LogLevelCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/LogLevelCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java diff --git a/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/Move.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Move.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Move.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Move.java diff --git a/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java b/src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/OpenLinkAction.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/OpenLinkAction.java diff --git a/src/core/org/apache/jmeter/gui/action/Paste.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Paste.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Paste.java diff --git a/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/RawTextSearcher.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java diff --git a/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/RegexpSearcher.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/RegexpSearcher.java diff --git a/src/core/org/apache/jmeter/gui/action/RemoteStart.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/RemoteStart.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/RemoteStart.java diff --git a/src/core/org/apache/jmeter/gui/action/Remove.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Remove.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Remove.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Remove.java diff --git a/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ResetSearchCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/ResetSearchCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/Restart.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Restart.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Restart.java diff --git a/src/core/org/apache/jmeter/gui/action/RevertProject.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RevertProject.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/RevertProject.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/RevertProject.java diff --git a/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/SSLManagerCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/Save.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Save.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Save.java diff --git a/src/core/org/apache/jmeter/gui/action/SaveBeforeRun.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveBeforeRun.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/SaveBeforeRun.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/SaveBeforeRun.java diff --git a/src/core/org/apache/jmeter/gui/action/SaveGraphics.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/SaveGraphics.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/SaveGraphics.java diff --git a/src/core/org/apache/jmeter/gui/action/SchematicView.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/SchematicView.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/SchematicView.java diff --git a/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java diff --git a/src/core/org/apache/jmeter/gui/action/Searcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Searcher.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Searcher.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Searcher.java diff --git a/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/SelectTemplatesDialog.java diff --git a/src/core/org/apache/jmeter/gui/action/Start.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Start.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/Start.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/Start.java diff --git a/src/core/org/apache/jmeter/gui/action/StopStoppables.java b/src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/StopStoppables.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/StopStoppables.java diff --git a/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/TemplatesCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/TemplatesCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/TemplatesCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/TreeNodeNamingPolicy.java b/src/core/src/main/java/org/apache/jmeter/gui/action/TreeNodeNamingPolicy.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/TreeNodeNamingPolicy.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/TreeNodeNamingPolicy.java diff --git a/src/core/org/apache/jmeter/gui/action/UndoCommand.java b/src/core/src/main/java/org/apache/jmeter/gui/action/UndoCommand.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/UndoCommand.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/UndoCommand.java diff --git a/src/core/org/apache/jmeter/gui/action/What.java b/src/core/src/main/java/org/apache/jmeter/gui/action/What.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/What.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/What.java diff --git a/src/core/org/apache/jmeter/gui/action/ZoomInOut.java b/src/core/src/main/java/org/apache/jmeter/gui/action/ZoomInOut.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/ZoomInOut.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/ZoomInOut.java diff --git a/src/core/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java b/src/core/src/main/java/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java diff --git a/src/core/org/apache/jmeter/gui/action/template/Template.java b/src/core/src/main/java/org/apache/jmeter/gui/action/template/Template.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/template/Template.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/template/Template.java diff --git a/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java b/src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/template/TemplateManager.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/template/TemplateManager.java diff --git a/src/core/org/apache/jmeter/gui/action/thinktime/ThinkTimeCreator.java b/src/core/src/main/java/org/apache/jmeter/gui/action/thinktime/ThinkTimeCreator.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/thinktime/ThinkTimeCreator.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/thinktime/ThinkTimeCreator.java diff --git a/src/core/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java b/src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java similarity index 100% rename from src/core/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java rename to src/core/src/main/java/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java diff --git a/src/core/org/apache/jmeter/gui/logging/GuiLogEventAppender.java b/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventAppender.java similarity index 100% rename from src/core/org/apache/jmeter/gui/logging/GuiLogEventAppender.java rename to src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventAppender.java diff --git a/src/core/org/apache/jmeter/gui/logging/GuiLogEventBus.java b/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventBus.java similarity index 100% rename from src/core/org/apache/jmeter/gui/logging/GuiLogEventBus.java rename to src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventBus.java diff --git a/src/core/org/apache/jmeter/gui/logging/GuiLogEventListener.java b/src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventListener.java similarity index 100% rename from src/core/org/apache/jmeter/gui/logging/GuiLogEventListener.java rename to src/core/src/main/java/org/apache/jmeter/gui/logging/GuiLogEventListener.java diff --git a/src/core/org/apache/jmeter/gui/logging/LogEventObject.java b/src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java similarity index 100% rename from src/core/org/apache/jmeter/gui/logging/LogEventObject.java rename to src/core/src/main/java/org/apache/jmeter/gui/logging/LogEventObject.java diff --git a/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java b/src/core/src/main/java/org/apache/jmeter/gui/plugin/MenuCreator.java similarity index 100% rename from src/core/org/apache/jmeter/gui/plugin/MenuCreator.java rename to src/core/src/main/java/org/apache/jmeter/gui/plugin/MenuCreator.java diff --git a/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java similarity index 100% rename from src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java rename to src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java diff --git a/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeListener.java similarity index 100% rename from src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java rename to src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeListener.java diff --git a/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java rename to src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeModel.java diff --git a/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeNode.java similarity index 100% rename from src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java rename to src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeNode.java diff --git a/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java similarity index 100% rename from src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java rename to src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java diff --git a/src/core/org/apache/jmeter/gui/tree/NamedTreeNode.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/NamedTreeNode.java similarity index 100% rename from src/core/org/apache/jmeter/gui/tree/NamedTreeNode.java rename to src/core/src/main/java/org/apache/jmeter/gui/tree/NamedTreeNode.java diff --git a/src/core/org/apache/jmeter/gui/util/CheckBoxPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/CheckBoxPanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/CheckBoxPanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/CheckBoxPanel.java diff --git a/src/core/org/apache/jmeter/gui/util/EscapeDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/util/EscapeDialog.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/EscapeDialog.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/EscapeDialog.java diff --git a/src/core/org/apache/jmeter/gui/util/FileDialoger.java b/src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/FileDialoger.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/FileDialoger.java diff --git a/src/core/org/apache/jmeter/gui/util/FileListPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/FileListPanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/FileListPanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/FileListPanel.java diff --git a/src/core/org/apache/jmeter/gui/util/FilePanel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/FilePanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/FilePanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/FilePanel.java diff --git a/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java b/src/core/src/main/java/org/apache/jmeter/gui/util/FilePanelEntry.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/FilePanelEntry.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/FilePanelEntry.java diff --git a/src/core/org/apache/jmeter/gui/util/FocusRequester.java b/src/core/src/main/java/org/apache/jmeter/gui/util/FocusRequester.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/FocusRequester.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/FocusRequester.java diff --git a/src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java diff --git a/src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java diff --git a/src/core/org/apache/jmeter/gui/util/HorizontalPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/HorizontalPanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/HorizontalPanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/HorizontalPanel.java diff --git a/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java b/src/core/src/main/java/org/apache/jmeter/gui/util/IconToolbarBean.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/IconToolbarBean.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/IconToolbarBean.java diff --git a/src/core/org/apache/jmeter/gui/util/JDateField.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/JDateField.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/JDateField.java diff --git a/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JLabeledRadioI18N.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/JLabeledRadioI18N.java diff --git a/src/core/org/apache/jmeter/gui/util/JMeterColor.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterColor.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/JMeterColor.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/JMeterColor.java diff --git a/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java diff --git a/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/JMeterToolBar.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java diff --git a/src/core/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java diff --git a/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java diff --git a/src/core/org/apache/jmeter/gui/util/JTextScrollPane.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JTextScrollPane.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/JTextScrollPane.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/JTextScrollPane.java diff --git a/src/core/org/apache/jmeter/gui/util/MenuFactory.java b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/MenuFactory.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/MenuFactory.java diff --git a/src/core/org/apache/jmeter/gui/util/MenuInfo.java b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuInfo.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/MenuInfo.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/MenuInfo.java diff --git a/src/core/org/apache/jmeter/gui/util/MenuSeparatorInfo.java b/src/core/src/main/java/org/apache/jmeter/gui/util/MenuSeparatorInfo.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/MenuSeparatorInfo.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/MenuSeparatorInfo.java diff --git a/src/core/org/apache/jmeter/gui/util/NumberFieldErrorListener.java b/src/core/src/main/java/org/apache/jmeter/gui/util/NumberFieldErrorListener.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/NumberFieldErrorListener.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/NumberFieldErrorListener.java diff --git a/src/core/org/apache/jmeter/gui/util/PowerTableModel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/PowerTableModel.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java diff --git a/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaCellRenderer.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaCellRenderer.java diff --git a/src/core/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java diff --git a/src/core/org/apache/jmeter/gui/util/TextBoxDialoger.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TextBoxDialoger.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/TextBoxDialoger.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/TextBoxDialoger.java diff --git a/src/core/org/apache/jmeter/gui/util/TristateCheckBox.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/TristateCheckBox.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/TristateCheckBox.java diff --git a/src/core/org/apache/jmeter/gui/util/TristateState.java b/src/core/src/main/java/org/apache/jmeter/gui/util/TristateState.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/TristateState.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/TristateState.java diff --git a/src/core/org/apache/jmeter/gui/util/VerticalPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java similarity index 100% rename from src/core/org/apache/jmeter/gui/util/VerticalPanel.java rename to src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java diff --git a/src/core/org/apache/jmeter/plugin/JMeterPlugin.java b/src/core/src/main/java/org/apache/jmeter/plugin/JMeterPlugin.java similarity index 100% rename from src/core/org/apache/jmeter/plugin/JMeterPlugin.java rename to src/core/src/main/java/org/apache/jmeter/plugin/JMeterPlugin.java diff --git a/src/core/org/apache/jmeter/plugin/PluginManager.java b/src/core/src/main/java/org/apache/jmeter/plugin/PluginManager.java similarity index 100% rename from src/core/org/apache/jmeter/plugin/PluginManager.java rename to src/core/src/main/java/org/apache/jmeter/plugin/PluginManager.java diff --git a/src/core/org/apache/jmeter/processor/PostProcessor.java b/src/core/src/main/java/org/apache/jmeter/processor/PostProcessor.java similarity index 100% rename from src/core/org/apache/jmeter/processor/PostProcessor.java rename to src/core/src/main/java/org/apache/jmeter/processor/PostProcessor.java diff --git a/src/core/org/apache/jmeter/processor/PreProcessor.java b/src/core/src/main/java/org/apache/jmeter/processor/PreProcessor.java similarity index 100% rename from src/core/org/apache/jmeter/processor/PreProcessor.java rename to src/core/src/main/java/org/apache/jmeter/processor/PreProcessor.java diff --git a/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java b/src/core/src/main/java/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java similarity index 100% rename from src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java rename to src/core/src/main/java/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java diff --git a/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java b/src/core/src/main/java/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java similarity index 100% rename from src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java rename to src/core/src/main/java/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java diff --git a/src/core/org/apache/jmeter/report/config/ConfigurationException.java b/src/core/src/main/java/org/apache/jmeter/report/config/ConfigurationException.java similarity index 100% rename from src/core/org/apache/jmeter/report/config/ConfigurationException.java rename to src/core/src/main/java/org/apache/jmeter/report/config/ConfigurationException.java diff --git a/src/core/org/apache/jmeter/report/config/ConfigurationUtils.java b/src/core/src/main/java/org/apache/jmeter/report/config/ConfigurationUtils.java similarity index 100% rename from src/core/org/apache/jmeter/report/config/ConfigurationUtils.java rename to src/core/src/main/java/org/apache/jmeter/report/config/ConfigurationUtils.java diff --git a/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/ExporterConfiguration.java similarity index 100% rename from src/core/org/apache/jmeter/report/config/ExporterConfiguration.java rename to src/core/src/main/java/org/apache/jmeter/report/config/ExporterConfiguration.java diff --git a/src/core/org/apache/jmeter/report/config/GraphConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/GraphConfiguration.java similarity index 100% rename from src/core/org/apache/jmeter/report/config/GraphConfiguration.java rename to src/core/src/main/java/org/apache/jmeter/report/config/GraphConfiguration.java diff --git a/src/core/org/apache/jmeter/report/config/InstanceConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/InstanceConfiguration.java similarity index 100% rename from src/core/org/apache/jmeter/report/config/InstanceConfiguration.java rename to src/core/src/main/java/org/apache/jmeter/report/config/InstanceConfiguration.java diff --git a/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java similarity index 100% rename from src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java rename to src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java diff --git a/src/core/org/apache/jmeter/report/config/SubConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java similarity index 100% rename from src/core/org/apache/jmeter/report/config/SubConfiguration.java rename to src/core/src/main/java/org/apache/jmeter/report/config/SubConfiguration.java diff --git a/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java b/src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java rename to src/core/src/main/java/org/apache/jmeter/report/core/AbstractSampleWriter.java diff --git a/src/core/org/apache/jmeter/report/core/ControllerSamplePredicate.java b/src/core/src/main/java/org/apache/jmeter/report/core/ControllerSamplePredicate.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/ControllerSamplePredicate.java rename to src/core/src/main/java/org/apache/jmeter/report/core/ControllerSamplePredicate.java diff --git a/src/core/org/apache/jmeter/report/core/ConvertException.java b/src/core/src/main/java/org/apache/jmeter/report/core/ConvertException.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/ConvertException.java rename to src/core/src/main/java/org/apache/jmeter/report/core/ConvertException.java diff --git a/src/core/org/apache/jmeter/report/core/Converters.java b/src/core/src/main/java/org/apache/jmeter/report/core/Converters.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/Converters.java rename to src/core/src/main/java/org/apache/jmeter/report/core/Converters.java diff --git a/src/core/org/apache/jmeter/report/core/CsvFile.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvFile.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/CsvFile.java rename to src/core/src/main/java/org/apache/jmeter/report/core/CsvFile.java diff --git a/src/core/org/apache/jmeter/report/core/CsvSampleReader.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/CsvSampleReader.java rename to src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java diff --git a/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/CsvSampleWriter.java rename to src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleWriter.java diff --git a/src/core/org/apache/jmeter/report/core/DataContext.java b/src/core/src/main/java/org/apache/jmeter/report/core/DataContext.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/DataContext.java rename to src/core/src/main/java/org/apache/jmeter/report/core/DataContext.java diff --git a/src/core/org/apache/jmeter/report/core/JsonUtil.java b/src/core/src/main/java/org/apache/jmeter/report/core/JsonUtil.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/JsonUtil.java rename to src/core/src/main/java/org/apache/jmeter/report/core/JsonUtil.java diff --git a/src/core/org/apache/jmeter/report/core/Sample.java b/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/Sample.java rename to src/core/src/main/java/org/apache/jmeter/report/core/Sample.java diff --git a/src/core/org/apache/jmeter/report/core/SampleBuilder.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleBuilder.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/SampleBuilder.java rename to src/core/src/main/java/org/apache/jmeter/report/core/SampleBuilder.java diff --git a/src/core/org/apache/jmeter/report/core/SampleComparator.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleComparator.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/SampleComparator.java rename to src/core/src/main/java/org/apache/jmeter/report/core/SampleComparator.java diff --git a/src/core/org/apache/jmeter/report/core/SampleException.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleException.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/SampleException.java rename to src/core/src/main/java/org/apache/jmeter/report/core/SampleException.java diff --git a/src/core/org/apache/jmeter/report/core/SampleMetaDataParser.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/SampleMetaDataParser.java rename to src/core/src/main/java/org/apache/jmeter/report/core/SampleMetaDataParser.java diff --git a/src/core/org/apache/jmeter/report/core/SampleMetadata.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/SampleMetadata.java rename to src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java diff --git a/src/core/org/apache/jmeter/report/core/SamplePredicate.java b/src/core/src/main/java/org/apache/jmeter/report/core/SamplePredicate.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/SamplePredicate.java rename to src/core/src/main/java/org/apache/jmeter/report/core/SamplePredicate.java diff --git a/src/core/org/apache/jmeter/report/core/SampleSelector.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/SampleSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/core/SampleSelector.java diff --git a/src/core/org/apache/jmeter/report/core/SampleWriter.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleWriter.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/SampleWriter.java rename to src/core/src/main/java/org/apache/jmeter/report/core/SampleWriter.java diff --git a/src/core/org/apache/jmeter/report/core/StringConverter.java b/src/core/src/main/java/org/apache/jmeter/report/core/StringConverter.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/StringConverter.java rename to src/core/src/main/java/org/apache/jmeter/report/core/StringConverter.java diff --git a/src/core/org/apache/jmeter/report/core/TimeHelper.java b/src/core/src/main/java/org/apache/jmeter/report/core/TimeHelper.java similarity index 100% rename from src/core/org/apache/jmeter/report/core/TimeHelper.java rename to src/core/src/main/java/org/apache/jmeter/report/core/TimeHelper.java diff --git a/src/core/org/apache/jmeter/report/dashboard/AbstractDataExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/AbstractDataExporter.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/AbstractDataExporter.java diff --git a/src/core/org/apache/jmeter/report/dashboard/DataExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/DataExporter.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/DataExporter.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/DataExporter.java diff --git a/src/core/org/apache/jmeter/report/dashboard/ExportException.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ExportException.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/ExportException.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/ExportException.java diff --git a/src/core/org/apache/jmeter/report/dashboard/GenerationException.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/GenerationException.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/GenerationException.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/GenerationException.java diff --git a/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java diff --git a/src/core/org/apache/jmeter/report/dashboard/JsonExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/JsonExporter.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonExporter.java diff --git a/src/core/org/apache/jmeter/report/dashboard/JsonizerVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonizerVisitor.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/JsonizerVisitor.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/JsonizerVisitor.java diff --git a/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java diff --git a/src/core/org/apache/jmeter/report/dashboard/SamplingStatistic.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/SamplingStatistic.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/SamplingStatistic.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/SamplingStatistic.java diff --git a/src/core/org/apache/jmeter/report/dashboard/TemplateVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/TemplateVisitor.java rename to src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java diff --git a/src/core/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java diff --git a/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/AbstractSampleProcessor.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/AbstractSampleProcessor.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleProcessor.java diff --git a/src/core/org/apache/jmeter/report/processor/AbstractSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleSource.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/AbstractSampleSource.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleSource.java diff --git a/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/AggregateConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/AggregateConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/Aggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/Aggregator.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/Aggregator.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/Aggregator.java diff --git a/src/core/org/apache/jmeter/report/processor/AggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregatorFactory.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/AggregatorFactory.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/AggregatorFactory.java diff --git a/src/core/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/ApdexSummaryData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryData.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ApdexSummaryData.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryData.java diff --git a/src/core/org/apache/jmeter/report/processor/ApdexThresholdsInfo.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexThresholdsInfo.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ApdexThresholdsInfo.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ApdexThresholdsInfo.java diff --git a/src/core/org/apache/jmeter/report/processor/ChannelContext.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ChannelContext.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ChannelContext.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ChannelContext.java diff --git a/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/CsvFileSampleSource.java diff --git a/src/core/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ExternalSampleSorter.java diff --git a/src/core/org/apache/jmeter/report/processor/FieldSampleComparator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/FieldSampleComparator.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/FieldSampleComparator.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/FieldSampleComparator.java diff --git a/src/core/org/apache/jmeter/report/processor/FilterConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/FilterConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/FilterConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/FilterConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/Job.java b/src/core/src/main/java/org/apache/jmeter/report/processor/Job.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/Job.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/Job.java diff --git a/src/core/org/apache/jmeter/report/processor/ListResultData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ListResultData.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ListResultData.java diff --git a/src/core/org/apache/jmeter/report/processor/MapResultData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/MapResultData.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/MapResultData.java diff --git a/src/core/org/apache/jmeter/report/processor/MaxAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregator.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/MaxAggregator.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregator.java diff --git a/src/core/org/apache/jmeter/report/processor/MaxAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregatorFactory.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/MaxAggregatorFactory.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/MaxAggregatorFactory.java diff --git a/src/core/org/apache/jmeter/report/processor/MeanAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/MeanAggregator.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregator.java diff --git a/src/core/org/apache/jmeter/report/processor/MeanAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregatorFactory.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/MeanAggregatorFactory.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/MeanAggregatorFactory.java diff --git a/src/core/org/apache/jmeter/report/processor/MedianAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MedianAggregatorFactory.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/MedianAggregatorFactory.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/MedianAggregatorFactory.java diff --git a/src/core/org/apache/jmeter/report/processor/MinAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MinAggregator.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/MinAggregator.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/MinAggregator.java diff --git a/src/core/org/apache/jmeter/report/processor/MinAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/MinAggregatorFactory.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/MinAggregatorFactory.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/MinAggregatorFactory.java diff --git a/src/core/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/PercentileAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregator.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/PercentileAggregator.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregator.java diff --git a/src/core/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java diff --git a/src/core/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/ResultData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ResultData.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ResultData.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ResultData.java diff --git a/src/core/org/apache/jmeter/report/processor/ResultDataVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ResultDataVisitor.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ResultDataVisitor.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ResultDataVisitor.java diff --git a/src/core/org/apache/jmeter/report/processor/SampleConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/SampleConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/SampleConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/SampleContext.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleContext.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/SampleContext.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/SampleContext.java diff --git a/src/core/org/apache/jmeter/report/processor/SampleIndexer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleIndexer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/SampleIndexer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/SampleIndexer.java diff --git a/src/core/org/apache/jmeter/report/processor/SampleProcessor.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleProcessor.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/SampleProcessor.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/SampleProcessor.java diff --git a/src/core/org/apache/jmeter/report/processor/SampleProducer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleProducer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/SampleProducer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/SampleProducer.java diff --git a/src/core/org/apache/jmeter/report/processor/SampleSource.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleSource.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/SampleSource.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/SampleSource.java diff --git a/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/SampleWriterConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/StatisticsSummaryData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryData.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/StatisticsSummaryData.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryData.java diff --git a/src/core/org/apache/jmeter/report/processor/SumAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregator.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/SumAggregator.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregator.java diff --git a/src/core/org/apache/jmeter/report/processor/SumAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregatorFactory.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/SumAggregatorFactory.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/SumAggregatorFactory.java diff --git a/src/core/org/apache/jmeter/report/processor/TaggerConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/TaggerConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/TaggerConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/TaggerConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/ThresholdSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ThresholdSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ThresholdSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ThresholdSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/TimeRateAggregator.java b/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregator.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/TimeRateAggregator.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregator.java diff --git a/src/core/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java b/src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java diff --git a/src/core/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java diff --git a/src/core/org/apache/jmeter/report/processor/ValueResultData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ValueResultData.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/ValueResultData.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/ValueResultData.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphValueSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/CountValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CountValueSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/CountValueSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/CountValueSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/GraphKeysSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GraphKeysSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/GraphKeysSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/GraphKeysSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/GraphSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GraphSeriesSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/GraphSeriesSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/GraphSeriesSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/GraphValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GraphValueSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/GraphValueSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/GraphValueSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/GroupData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/GroupData.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/GroupInfo.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupInfo.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/GroupInfo.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupInfo.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/SeriesData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/SeriesData.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/SeriesData.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/SeriesData.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/SuccessfulElapsedTimeValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/SuccessfulElapsedTimeValueSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/SuccessfulElapsedTimeValueSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/SuccessfulElapsedTimeValueSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ConnectTimeOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ConnectTimeOverTimeGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/ConnectTimeOverTimeGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ConnectTimeOverTimeGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java rename to src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java diff --git a/src/core/org/apache/jmeter/report/utils/MetricUtils.java b/src/core/src/main/java/org/apache/jmeter/report/utils/MetricUtils.java similarity index 100% rename from src/core/org/apache/jmeter/report/utils/MetricUtils.java rename to src/core/src/main/java/org/apache/jmeter/report/utils/MetricUtils.java diff --git a/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java b/src/core/src/main/java/org/apache/jmeter/reporters/AbstractListenerElement.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/AbstractListenerElement.java rename to src/core/src/main/java/org/apache/jmeter/reporters/AbstractListenerElement.java diff --git a/src/core/org/apache/jmeter/reporters/ResultAction.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultAction.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/ResultAction.java rename to src/core/src/main/java/org/apache/jmeter/reporters/ResultAction.java diff --git a/src/core/org/apache/jmeter/reporters/ResultCollector.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/ResultCollector.java rename to src/core/src/main/java/org/apache/jmeter/reporters/ResultCollector.java diff --git a/src/core/org/apache/jmeter/reporters/ResultCollectorHelper.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultCollectorHelper.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/ResultCollectorHelper.java rename to src/core/src/main/java/org/apache/jmeter/reporters/ResultCollectorHelper.java diff --git a/src/core/org/apache/jmeter/reporters/ResultSaver.java b/src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/ResultSaver.java rename to src/core/src/main/java/org/apache/jmeter/reporters/ResultSaver.java diff --git a/src/core/org/apache/jmeter/reporters/Summariser.java b/src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/Summariser.java rename to src/core/src/main/java/org/apache/jmeter/reporters/Summariser.java diff --git a/src/core/org/apache/jmeter/reporters/SummariserRunningSample.java b/src/core/src/main/java/org/apache/jmeter/reporters/SummariserRunningSample.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/SummariserRunningSample.java rename to src/core/src/main/java/org/apache/jmeter/reporters/SummariserRunningSample.java diff --git a/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java b/src/core/src/main/java/org/apache/jmeter/reporters/gui/ResultActionGui.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java rename to src/core/src/main/java/org/apache/jmeter/reporters/gui/ResultActionGui.java diff --git a/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java b/src/core/src/main/java/org/apache/jmeter/reporters/gui/ResultSaverGui.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java rename to src/core/src/main/java/org/apache/jmeter/reporters/gui/ResultSaverGui.java diff --git a/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java b/src/core/src/main/java/org/apache/jmeter/reporters/gui/SummariserGui.java similarity index 100% rename from src/core/org/apache/jmeter/reporters/gui/SummariserGui.java rename to src/core/src/main/java/org/apache/jmeter/reporters/gui/SummariserGui.java diff --git a/src/core/org/apache/jmeter/rmi/AliasKeyManager.java b/src/core/src/main/java/org/apache/jmeter/rmi/AliasKeyManager.java similarity index 100% rename from src/core/org/apache/jmeter/rmi/AliasKeyManager.java rename to src/core/src/main/java/org/apache/jmeter/rmi/AliasKeyManager.java diff --git a/src/core/org/apache/jmeter/rmi/RMIServerSocketFactoryImpl.java b/src/core/src/main/java/org/apache/jmeter/rmi/RMIServerSocketFactoryImpl.java similarity index 100% rename from src/core/org/apache/jmeter/rmi/RMIServerSocketFactoryImpl.java rename to src/core/src/main/java/org/apache/jmeter/rmi/RMIServerSocketFactoryImpl.java diff --git a/src/core/org/apache/jmeter/rmi/RmiUtils.java b/src/core/src/main/java/org/apache/jmeter/rmi/RmiUtils.java similarity index 100% rename from src/core/org/apache/jmeter/rmi/RmiUtils.java rename to src/core/src/main/java/org/apache/jmeter/rmi/RmiUtils.java diff --git a/src/core/org/apache/jmeter/rmi/SSLRMIClientSocketFactory.java b/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIClientSocketFactory.java similarity index 100% rename from src/core/org/apache/jmeter/rmi/SSLRMIClientSocketFactory.java rename to src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIClientSocketFactory.java diff --git a/src/core/org/apache/jmeter/rmi/SSLRMIServerSocketFactory.java b/src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIServerSocketFactory.java similarity index 100% rename from src/core/org/apache/jmeter/rmi/SSLRMIServerSocketFactory.java rename to src/core/src/main/java/org/apache/jmeter/rmi/SSLRMIServerSocketFactory.java diff --git a/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/AbstractSampleSender.java rename to src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java diff --git a/src/core/org/apache/jmeter/samplers/AbstractSampler.java b/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampler.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/AbstractSampler.java rename to src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampler.java diff --git a/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/AsynchSampleSender.java rename to src/core/src/main/java/org/apache/jmeter/samplers/AsynchSampleSender.java diff --git a/src/core/org/apache/jmeter/samplers/BatchSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/BatchSampleSender.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/BatchSampleSender.java rename to src/core/src/main/java/org/apache/jmeter/samplers/BatchSampleSender.java diff --git a/src/core/org/apache/jmeter/samplers/Clearable.java b/src/core/src/main/java/org/apache/jmeter/samplers/Clearable.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/Clearable.java rename to src/core/src/main/java/org/apache/jmeter/samplers/Clearable.java diff --git a/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/DataStrippingSampleSender.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java rename to src/core/src/main/java/org/apache/jmeter/samplers/DataStrippingSampleSender.java diff --git a/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/DiskStoreSampleSender.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java rename to src/core/src/main/java/org/apache/jmeter/samplers/DiskStoreSampleSender.java diff --git a/src/core/org/apache/jmeter/samplers/Entry.java b/src/core/src/main/java/org/apache/jmeter/samplers/Entry.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/Entry.java rename to src/core/src/main/java/org/apache/jmeter/samplers/Entry.java diff --git a/src/core/org/apache/jmeter/samplers/HoldSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/HoldSampleSender.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/HoldSampleSender.java rename to src/core/src/main/java/org/apache/jmeter/samplers/HoldSampleSender.java diff --git a/src/core/org/apache/jmeter/samplers/Interruptible.java b/src/core/src/main/java/org/apache/jmeter/samplers/Interruptible.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/Interruptible.java rename to src/core/src/main/java/org/apache/jmeter/samplers/Interruptible.java diff --git a/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java b/src/core/src/main/java/org/apache/jmeter/samplers/RemoteListenerWrapper.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java rename to src/core/src/main/java/org/apache/jmeter/samplers/RemoteListenerWrapper.java diff --git a/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java b/src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListener.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/RemoteSampleListener.java rename to src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListener.java diff --git a/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java b/src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java rename to src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java diff --git a/src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java b/src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java rename to src/core/src/main/java/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java diff --git a/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java b/src/core/src/main/java/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java rename to src/core/src/main/java/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java diff --git a/src/core/org/apache/jmeter/samplers/Remoteable.java b/src/core/src/main/java/org/apache/jmeter/samplers/Remoteable.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/Remoteable.java rename to src/core/src/main/java/org/apache/jmeter/samplers/Remoteable.java diff --git a/src/core/org/apache/jmeter/samplers/SampleEvent.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleEvent.java similarity index 98% rename from src/core/org/apache/jmeter/samplers/SampleEvent.java rename to src/core/src/main/java/org/apache/jmeter/samplers/SampleEvent.java index 2c39cae1497..3c4bfe84a0b 100644 --- a/src/core/org/apache/jmeter/samplers/SampleEvent.java +++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleEvent.java @@ -83,9 +83,6 @@ public SampleEvent() { /** * Creates SampleEvent without saving any variables. - *

- * Use by {@link org.apache.jmeter.protocol.http.proxy.ProxyControl - * ProxyControl} and {@link StatisticalSampleSender}. * * @param result * The SampleResult to be associated with this event diff --git a/src/core/org/apache/jmeter/samplers/SampleListener.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleListener.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/SampleListener.java rename to src/core/src/main/java/org/apache/jmeter/samplers/SampleListener.java diff --git a/src/core/org/apache/jmeter/samplers/SampleMonitor.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleMonitor.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/SampleMonitor.java rename to src/core/src/main/java/org/apache/jmeter/samplers/SampleMonitor.java diff --git a/src/core/org/apache/jmeter/samplers/SampleResult.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/SampleResult.java rename to src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java diff --git a/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java rename to src/core/src/main/java/org/apache/jmeter/samplers/SampleSaveConfiguration.java diff --git a/src/core/org/apache/jmeter/samplers/SampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSender.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/SampleSender.java rename to src/core/src/main/java/org/apache/jmeter/samplers/SampleSender.java diff --git a/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleSenderFactory.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/SampleSenderFactory.java rename to src/core/src/main/java/org/apache/jmeter/samplers/SampleSenderFactory.java diff --git a/src/core/org/apache/jmeter/samplers/Sampler.java b/src/core/src/main/java/org/apache/jmeter/samplers/Sampler.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/Sampler.java rename to src/core/src/main/java/org/apache/jmeter/samplers/Sampler.java diff --git a/src/core/org/apache/jmeter/samplers/StandardSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/StandardSampleSender.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/StandardSampleSender.java rename to src/core/src/main/java/org/apache/jmeter/samplers/StandardSampleSender.java diff --git a/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java b/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleResult.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java rename to src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleResult.java diff --git a/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleSender.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java rename to src/core/src/main/java/org/apache/jmeter/samplers/StatisticalSampleSender.java diff --git a/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java b/src/core/src/main/java/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java similarity index 100% rename from src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java rename to src/core/src/main/java/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java diff --git a/src/core/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java similarity index 100% rename from src/core/org/apache/jmeter/save/CSVSaveService.java rename to src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java diff --git a/src/core/org/apache/jmeter/save/ListenerResultWrapper.java b/src/core/src/main/java/org/apache/jmeter/save/ListenerResultWrapper.java similarity index 100% rename from src/core/org/apache/jmeter/save/ListenerResultWrapper.java rename to src/core/src/main/java/org/apache/jmeter/save/ListenerResultWrapper.java diff --git a/src/core/org/apache/jmeter/save/SaveGraphicsService.java b/src/core/src/main/java/org/apache/jmeter/save/SaveGraphicsService.java similarity index 100% rename from src/core/org/apache/jmeter/save/SaveGraphicsService.java rename to src/core/src/main/java/org/apache/jmeter/save/SaveGraphicsService.java diff --git a/src/core/org/apache/jmeter/save/SaveService.java b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java similarity index 100% rename from src/core/org/apache/jmeter/save/SaveService.java rename to src/core/src/main/java/org/apache/jmeter/save/SaveService.java diff --git a/src/core/org/apache/jmeter/save/ScriptWrapper.java b/src/core/src/main/java/org/apache/jmeter/save/ScriptWrapper.java similarity index 100% rename from src/core/org/apache/jmeter/save/ScriptWrapper.java rename to src/core/src/main/java/org/apache/jmeter/save/ScriptWrapper.java diff --git a/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java b/src/core/src/main/java/org/apache/jmeter/save/ScriptWrapperConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/ScriptWrapperConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/ScriptWrapperConverter.java diff --git a/src/core/org/apache/jmeter/save/TestResultWrapper.java b/src/core/src/main/java/org/apache/jmeter/save/TestResultWrapper.java similarity index 100% rename from src/core/org/apache/jmeter/save/TestResultWrapper.java rename to src/core/src/main/java/org/apache/jmeter/save/TestResultWrapper.java diff --git a/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/BooleanPropertyConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/BooleanPropertyConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/ConversionHelp.java b/src/core/src/main/java/org/apache/jmeter/save/converters/ConversionHelp.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/ConversionHelp.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/ConversionHelp.java diff --git a/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/HashTreeConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/HashTreeConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/HashTreeConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/IntegerPropertyConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/IntegerPropertyConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/LongPropertyConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/LongPropertyConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/MultiPropertyConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/MultiPropertyConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleEventConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/SampleEventConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/SampleEventConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/SampleResultConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/StringPropertyConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/StringPropertyConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/TestElementConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/TestElementConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/TestElementConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/TestElementPropertyConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/TestElementPropertyConverter.java diff --git a/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/TestResultWrapperConverter.java similarity index 100% rename from src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java rename to src/core/src/main/java/org/apache/jmeter/save/converters/TestResultWrapperConverter.java diff --git a/src/core/org/apache/jmeter/services/FileServer.java b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java similarity index 100% rename from src/core/org/apache/jmeter/services/FileServer.java rename to src/core/src/main/java/org/apache/jmeter/services/FileServer.java diff --git a/src/core/org/apache/jmeter/swing/HtmlPane.java b/src/core/src/main/java/org/apache/jmeter/swing/HtmlPane.java similarity index 100% rename from src/core/org/apache/jmeter/swing/HtmlPane.java rename to src/core/src/main/java/org/apache/jmeter/swing/HtmlPane.java diff --git a/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java b/src/core/src/main/java/org/apache/jmeter/testbeans/BeanInfoSupport.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/BeanInfoSupport.java diff --git a/src/core/org/apache/jmeter/testbeans/TestBean.java b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBean.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/TestBean.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/TestBean.java diff --git a/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanBeanInfo.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanBeanInfo.java diff --git a/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java b/src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/TestBeanHelper.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/TestBeanHelper.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/ComboStringEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/EnumEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/EnumEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FieldStringEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/FieldStringEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/FileEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/FileEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/IntegerPropertyEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/IntegerPropertyEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/IntegerPropertyEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/IntegerPropertyEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/LongPropertyEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/LongPropertyEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/LongPropertyEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/LongPropertyEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/PasswordEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/SharedCustomizer.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/SharedCustomizer.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/SharedCustomizer.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/SharedCustomizer.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/TableEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/TableEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/TextAreaEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/TypeEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TypeEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/TypeEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/TypeEditor.java diff --git a/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java similarity index 100% rename from src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java rename to src/core/src/main/java/org/apache/jmeter/testbeans/gui/WrapperEditor.java diff --git a/src/core/org/apache/jmeter/testelement/AbstractScopedAssertion.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedAssertion.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/AbstractScopedAssertion.java rename to src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedAssertion.java diff --git a/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java rename to src/core/src/main/java/org/apache/jmeter/testelement/AbstractScopedTestElement.java diff --git a/src/core/org/apache/jmeter/testelement/AbstractTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/AbstractTestElement.java rename to src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java diff --git a/src/core/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java b/src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java rename to src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElementBeanInfo.java diff --git a/src/core/org/apache/jmeter/testelement/NonTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/NonTestElement.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/NonTestElement.java rename to src/core/src/main/java/org/apache/jmeter/testelement/NonTestElement.java diff --git a/src/core/org/apache/jmeter/testelement/OnErrorTestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/OnErrorTestElement.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/OnErrorTestElement.java rename to src/core/src/main/java/org/apache/jmeter/testelement/OnErrorTestElement.java diff --git a/src/core/org/apache/jmeter/testelement/TestCloneable.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestCloneable.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/TestCloneable.java rename to src/core/src/main/java/org/apache/jmeter/testelement/TestCloneable.java diff --git a/src/core/org/apache/jmeter/testelement/TestElement.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestElement.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/TestElement.java rename to src/core/src/main/java/org/apache/jmeter/testelement/TestElement.java diff --git a/src/core/org/apache/jmeter/testelement/TestElementTraverser.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestElementTraverser.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/TestElementTraverser.java rename to src/core/src/main/java/org/apache/jmeter/testelement/TestElementTraverser.java diff --git a/src/core/org/apache/jmeter/testelement/TestIterationListener.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestIterationListener.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/TestIterationListener.java rename to src/core/src/main/java/org/apache/jmeter/testelement/TestIterationListener.java diff --git a/src/core/org/apache/jmeter/testelement/TestPlan.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/TestPlan.java rename to src/core/src/main/java/org/apache/jmeter/testelement/TestPlan.java diff --git a/src/core/org/apache/jmeter/testelement/TestStateListener.java b/src/core/src/main/java/org/apache/jmeter/testelement/TestStateListener.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/TestStateListener.java rename to src/core/src/main/java/org/apache/jmeter/testelement/TestStateListener.java diff --git a/src/core/org/apache/jmeter/testelement/ThreadListener.java b/src/core/src/main/java/org/apache/jmeter/testelement/ThreadListener.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/ThreadListener.java rename to src/core/src/main/java/org/apache/jmeter/testelement/ThreadListener.java diff --git a/src/core/org/apache/jmeter/testelement/VariablesCollection.java b/src/core/src/main/java/org/apache/jmeter/testelement/VariablesCollection.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/VariablesCollection.java rename to src/core/src/main/java/org/apache/jmeter/testelement/VariablesCollection.java diff --git a/src/core/org/apache/jmeter/testelement/WorkBench.java b/src/core/src/main/java/org/apache/jmeter/testelement/WorkBench.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/WorkBench.java rename to src/core/src/main/java/org/apache/jmeter/testelement/WorkBench.java diff --git a/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/AbstractProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/BooleanProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/CollectionProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/CollectionProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/DoubleProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/DoubleProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/DoubleProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/FloatProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/FloatProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/FloatProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/FloatProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/FunctionProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/FunctionProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/IntegerProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/IntegerProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/IntegerProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/JMeterProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/JMeterProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/JMeterProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/LongProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/LongProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/LongProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/LongProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/MapProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/MapProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/MapProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/MapProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/MultiProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/MultiProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/MultiProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/MultiProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/NullProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/NullProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/NullProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/NullProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/NumberProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/NumberProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/NumberProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/NumberProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/ObjectProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/ObjectProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/ObjectProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/PropertyIterator.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIterator.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/PropertyIterator.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIterator.java diff --git a/src/core/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java diff --git a/src/core/org/apache/jmeter/testelement/property/StringProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/StringProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/StringProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/StringProperty.java diff --git a/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/TestElementProperty.java similarity index 100% rename from src/core/org/apache/jmeter/testelement/property/TestElementProperty.java rename to src/core/src/main/java/org/apache/jmeter/testelement/property/TestElementProperty.java diff --git a/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java similarity index 100% rename from src/core/org/apache/jmeter/threads/AbstractThreadGroup.java rename to src/core/src/main/java/org/apache/jmeter/threads/AbstractThreadGroup.java diff --git a/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java b/src/core/src/main/java/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java similarity index 100% rename from src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java rename to src/core/src/main/java/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java diff --git a/src/core/org/apache/jmeter/threads/JMeterContext.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterContext.java similarity index 100% rename from src/core/org/apache/jmeter/threads/JMeterContext.java rename to src/core/src/main/java/org/apache/jmeter/threads/JMeterContext.java diff --git a/src/core/org/apache/jmeter/threads/JMeterContextService.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterContextService.java similarity index 96% rename from src/core/org/apache/jmeter/threads/JMeterContextService.java rename to src/core/src/main/java/org/apache/jmeter/threads/JMeterContextService.java index 7a11dab0423..990c945e539 100644 --- a/src/core/org/apache/jmeter/threads/JMeterContextService.java +++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterContextService.java @@ -70,10 +70,7 @@ static void removeContext(){ // Currently only used by JMeterThread } /** - * Replace Thread Context by the parameter. Currently only used by the - * private class ASyncSample in - * {@link org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase - * HTTPSamplerBase} + * Replace Thread Context by the parameter. * * @param context * {@link JMeterContext} diff --git a/src/core/org/apache/jmeter/threads/JMeterThread.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java similarity index 100% rename from src/core/org/apache/jmeter/threads/JMeterThread.java rename to src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java diff --git a/src/core/org/apache/jmeter/threads/JMeterThreadMonitor.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThreadMonitor.java similarity index 100% rename from src/core/org/apache/jmeter/threads/JMeterThreadMonitor.java rename to src/core/src/main/java/org/apache/jmeter/threads/JMeterThreadMonitor.java diff --git a/src/core/org/apache/jmeter/threads/JMeterVariables.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterVariables.java similarity index 100% rename from src/core/org/apache/jmeter/threads/JMeterVariables.java rename to src/core/src/main/java/org/apache/jmeter/threads/JMeterVariables.java diff --git a/src/core/org/apache/jmeter/threads/ListenerNotifier.java b/src/core/src/main/java/org/apache/jmeter/threads/ListenerNotifier.java similarity index 100% rename from src/core/org/apache/jmeter/threads/ListenerNotifier.java rename to src/core/src/main/java/org/apache/jmeter/threads/ListenerNotifier.java diff --git a/src/core/org/apache/jmeter/threads/PostThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/PostThreadGroup.java similarity index 100% rename from src/core/org/apache/jmeter/threads/PostThreadGroup.java rename to src/core/src/main/java/org/apache/jmeter/threads/PostThreadGroup.java diff --git a/src/core/org/apache/jmeter/threads/RemoteThreadsLifeCycleListener.java b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsLifeCycleListener.java similarity index 100% rename from src/core/org/apache/jmeter/threads/RemoteThreadsLifeCycleListener.java rename to src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsLifeCycleListener.java diff --git a/src/core/org/apache/jmeter/threads/RemoteThreadsListener.java b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListener.java similarity index 100% rename from src/core/org/apache/jmeter/threads/RemoteThreadsListener.java rename to src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListener.java diff --git a/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java similarity index 100% rename from src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java rename to src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java diff --git a/src/core/org/apache/jmeter/threads/RemoteThreadsListenerTestElement.java b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerTestElement.java similarity index 100% rename from src/core/org/apache/jmeter/threads/RemoteThreadsListenerTestElement.java rename to src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerTestElement.java diff --git a/src/core/org/apache/jmeter/threads/RemoteThreadsListenerWrapper.java b/src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerWrapper.java similarity index 100% rename from src/core/org/apache/jmeter/threads/RemoteThreadsListenerWrapper.java rename to src/core/src/main/java/org/apache/jmeter/threads/RemoteThreadsListenerWrapper.java diff --git a/src/core/org/apache/jmeter/threads/SamplePackage.java b/src/core/src/main/java/org/apache/jmeter/threads/SamplePackage.java similarity index 100% rename from src/core/org/apache/jmeter/threads/SamplePackage.java rename to src/core/src/main/java/org/apache/jmeter/threads/SamplePackage.java diff --git a/src/core/org/apache/jmeter/threads/SetupThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/SetupThreadGroup.java similarity index 100% rename from src/core/org/apache/jmeter/threads/SetupThreadGroup.java rename to src/core/src/main/java/org/apache/jmeter/threads/SetupThreadGroup.java diff --git a/src/core/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java similarity index 100% rename from src/core/org/apache/jmeter/threads/TestCompiler.java rename to src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java diff --git a/src/core/org/apache/jmeter/threads/TestCompilerHelper.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompilerHelper.java similarity index 100% rename from src/core/org/apache/jmeter/threads/TestCompilerHelper.java rename to src/core/src/main/java/org/apache/jmeter/threads/TestCompilerHelper.java diff --git a/src/core/org/apache/jmeter/threads/ThreadGroup.java b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java similarity index 100% rename from src/core/org/apache/jmeter/threads/ThreadGroup.java rename to src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java diff --git a/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java b/src/core/src/main/java/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java similarity index 100% rename from src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java rename to src/core/src/main/java/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java diff --git a/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java similarity index 100% rename from src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java rename to src/core/src/main/java/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java diff --git a/src/core/org/apache/jmeter/threads/gui/PostThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/PostThreadGroupGui.java similarity index 100% rename from src/core/org/apache/jmeter/threads/gui/PostThreadGroupGui.java rename to src/core/src/main/java/org/apache/jmeter/threads/gui/PostThreadGroupGui.java diff --git a/src/core/org/apache/jmeter/threads/gui/SetupThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/SetupThreadGroupGui.java similarity index 100% rename from src/core/org/apache/jmeter/threads/gui/SetupThreadGroupGui.java rename to src/core/src/main/java/org/apache/jmeter/threads/gui/SetupThreadGroupGui.java diff --git a/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java b/src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java similarity index 100% rename from src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java rename to src/core/src/main/java/org/apache/jmeter/threads/gui/ThreadGroupGui.java diff --git a/src/core/org/apache/jmeter/timers/ModifiableTimer.java b/src/core/src/main/java/org/apache/jmeter/timers/ModifiableTimer.java similarity index 100% rename from src/core/org/apache/jmeter/timers/ModifiableTimer.java rename to src/core/src/main/java/org/apache/jmeter/timers/ModifiableTimer.java diff --git a/src/core/org/apache/jmeter/timers/Timer.java b/src/core/src/main/java/org/apache/jmeter/timers/Timer.java similarity index 100% rename from src/core/org/apache/jmeter/timers/Timer.java rename to src/core/src/main/java/org/apache/jmeter/timers/Timer.java diff --git a/src/core/org/apache/jmeter/timers/TimerService.java b/src/core/src/main/java/org/apache/jmeter/timers/TimerService.java similarity index 100% rename from src/core/org/apache/jmeter/timers/TimerService.java rename to src/core/src/main/java/org/apache/jmeter/timers/TimerService.java diff --git a/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java b/src/core/src/main/java/org/apache/jmeter/timers/gui/AbstractTimerGui.java similarity index 100% rename from src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java rename to src/core/src/main/java/org/apache/jmeter/timers/gui/AbstractTimerGui.java diff --git a/src/core/org/apache/jmeter/util/BSFBeanInfoSupport.java b/src/core/src/main/java/org/apache/jmeter/util/BSFBeanInfoSupport.java similarity index 100% rename from src/core/org/apache/jmeter/util/BSFBeanInfoSupport.java rename to src/core/src/main/java/org/apache/jmeter/util/BSFBeanInfoSupport.java diff --git a/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java b/src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java similarity index 100% rename from src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java rename to src/core/src/main/java/org/apache/jmeter/util/BSFJavaScriptEngine.java diff --git a/src/core/org/apache/jmeter/util/BSFTestElement.java b/src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java similarity index 100% rename from src/core/org/apache/jmeter/util/BSFTestElement.java rename to src/core/src/main/java/org/apache/jmeter/util/BSFTestElement.java diff --git a/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellBeanInfoSupport.java similarity index 100% rename from src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java rename to src/core/src/main/java/org/apache/jmeter/util/BeanShellBeanInfoSupport.java diff --git a/src/core/org/apache/jmeter/util/BeanShellInterpreter.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java similarity index 100% rename from src/core/org/apache/jmeter/util/BeanShellInterpreter.java rename to src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java diff --git a/src/core/org/apache/jmeter/util/BeanShellServer.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java similarity index 100% rename from src/core/org/apache/jmeter/util/BeanShellServer.java rename to src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java diff --git a/src/core/org/apache/jmeter/util/BeanShellTestElement.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java similarity index 100% rename from src/core/org/apache/jmeter/util/BeanShellTestElement.java rename to src/core/src/main/java/org/apache/jmeter/util/BeanShellTestElement.java diff --git a/src/core/org/apache/jmeter/util/CPSPauser.java b/src/core/src/main/java/org/apache/jmeter/util/CPSPauser.java similarity index 100% rename from src/core/org/apache/jmeter/util/CPSPauser.java rename to src/core/src/main/java/org/apache/jmeter/util/CPSPauser.java diff --git a/src/core/org/apache/jmeter/util/Calculator.java b/src/core/src/main/java/org/apache/jmeter/util/Calculator.java similarity index 100% rename from src/core/org/apache/jmeter/util/Calculator.java rename to src/core/src/main/java/org/apache/jmeter/util/Calculator.java diff --git a/src/core/org/apache/jmeter/util/ColorHelper.java b/src/core/src/main/java/org/apache/jmeter/util/ColorHelper.java similarity index 100% rename from src/core/org/apache/jmeter/util/ColorHelper.java rename to src/core/src/main/java/org/apache/jmeter/util/ColorHelper.java diff --git a/src/core/org/apache/jmeter/util/CustomX509TrustManager.java b/src/core/src/main/java/org/apache/jmeter/util/CustomX509TrustManager.java similarity index 100% rename from src/core/org/apache/jmeter/util/CustomX509TrustManager.java rename to src/core/src/main/java/org/apache/jmeter/util/CustomX509TrustManager.java diff --git a/src/core/org/apache/jmeter/util/Document.java b/src/core/src/main/java/org/apache/jmeter/util/Document.java similarity index 100% rename from src/core/org/apache/jmeter/util/Document.java rename to src/core/src/main/java/org/apache/jmeter/util/Document.java diff --git a/src/core/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java b/src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java similarity index 100% rename from src/core/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java rename to src/core/src/main/java/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java diff --git a/src/core/org/apache/jmeter/util/JMeterTreeNodeTransferable.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterTreeNodeTransferable.java similarity index 100% rename from src/core/org/apache/jmeter/util/JMeterTreeNodeTransferable.java rename to src/core/src/main/java/org/apache/jmeter/util/JMeterTreeNodeTransferable.java diff --git a/src/core/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java similarity index 100% rename from src/core/org/apache/jmeter/util/JMeterUtils.java rename to src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java diff --git a/src/core/org/apache/jmeter/util/JMeterVersion.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterVersion.java similarity index 100% rename from src/core/org/apache/jmeter/util/JMeterVersion.java rename to src/core/src/main/java/org/apache/jmeter/util/JMeterVersion.java diff --git a/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java b/src/core/src/main/java/org/apache/jmeter/util/JSR223BeanInfoSupport.java similarity index 100% rename from src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java rename to src/core/src/main/java/org/apache/jmeter/util/JSR223BeanInfoSupport.java diff --git a/src/core/org/apache/jmeter/util/JSR223TestElement.java b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java similarity index 100% rename from src/core/org/apache/jmeter/util/JSR223TestElement.java rename to src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java diff --git a/src/core/org/apache/jmeter/util/JsseSSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java similarity index 100% rename from src/core/org/apache/jmeter/util/JsseSSLManager.java rename to src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java diff --git a/src/core/org/apache/jmeter/util/LocaleChangeEvent.java b/src/core/src/main/java/org/apache/jmeter/util/LocaleChangeEvent.java similarity index 100% rename from src/core/org/apache/jmeter/util/LocaleChangeEvent.java rename to src/core/src/main/java/org/apache/jmeter/util/LocaleChangeEvent.java diff --git a/src/core/org/apache/jmeter/util/LocaleChangeListener.java b/src/core/src/main/java/org/apache/jmeter/util/LocaleChangeListener.java similarity index 100% rename from src/core/org/apache/jmeter/util/LocaleChangeListener.java rename to src/core/src/main/java/org/apache/jmeter/util/LocaleChangeListener.java diff --git a/src/core/org/apache/jmeter/util/NameUpdater.java b/src/core/src/main/java/org/apache/jmeter/util/NameUpdater.java similarity index 100% rename from src/core/org/apache/jmeter/util/NameUpdater.java rename to src/core/src/main/java/org/apache/jmeter/util/NameUpdater.java diff --git a/src/core/org/apache/jmeter/util/NamedObject.java b/src/core/src/main/java/org/apache/jmeter/util/NamedObject.java similarity index 100% rename from src/core/org/apache/jmeter/util/NamedObject.java rename to src/core/src/main/java/org/apache/jmeter/util/NamedObject.java diff --git a/src/core/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java similarity index 100% rename from src/core/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java rename to src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java diff --git a/src/core/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java similarity index 100% rename from src/core/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java rename to src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java diff --git a/src/core/org/apache/jmeter/util/SSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java similarity index 100% rename from src/core/org/apache/jmeter/util/SSLManager.java rename to src/core/src/main/java/org/apache/jmeter/util/SSLManager.java diff --git a/src/core/org/apache/jmeter/util/ScopePanel.java b/src/core/src/main/java/org/apache/jmeter/util/ScopePanel.java similarity index 100% rename from src/core/org/apache/jmeter/util/ScopePanel.java rename to src/core/src/main/java/org/apache/jmeter/util/ScopePanel.java diff --git a/src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java b/src/core/src/main/java/org/apache/jmeter/util/ScriptingBeanInfoSupport.java similarity index 100% rename from src/core/org/apache/jmeter/util/ScriptingBeanInfoSupport.java rename to src/core/src/main/java/org/apache/jmeter/util/ScriptingBeanInfoSupport.java diff --git a/src/core/org/apache/jmeter/util/ScriptingTestElement.java b/src/core/src/main/java/org/apache/jmeter/util/ScriptingTestElement.java similarity index 100% rename from src/core/org/apache/jmeter/util/ScriptingTestElement.java rename to src/core/src/main/java/org/apache/jmeter/util/ScriptingTestElement.java diff --git a/src/core/org/apache/jmeter/util/SlowInputStream.java b/src/core/src/main/java/org/apache/jmeter/util/SlowInputStream.java similarity index 100% rename from src/core/org/apache/jmeter/util/SlowInputStream.java rename to src/core/src/main/java/org/apache/jmeter/util/SlowInputStream.java diff --git a/src/core/org/apache/jmeter/util/SlowOutputStream.java b/src/core/src/main/java/org/apache/jmeter/util/SlowOutputStream.java similarity index 100% rename from src/core/org/apache/jmeter/util/SlowOutputStream.java rename to src/core/src/main/java/org/apache/jmeter/util/SlowOutputStream.java diff --git a/src/core/org/apache/jmeter/util/SlowSSLSocket.java b/src/core/src/main/java/org/apache/jmeter/util/SlowSSLSocket.java similarity index 100% rename from src/core/org/apache/jmeter/util/SlowSSLSocket.java rename to src/core/src/main/java/org/apache/jmeter/util/SlowSSLSocket.java diff --git a/src/core/org/apache/jmeter/util/SlowSocket.java b/src/core/src/main/java/org/apache/jmeter/util/SlowSocket.java similarity index 100% rename from src/core/org/apache/jmeter/util/SlowSocket.java rename to src/core/src/main/java/org/apache/jmeter/util/SlowSocket.java diff --git a/src/core/org/apache/jmeter/util/StringUtilities.java b/src/core/src/main/java/org/apache/jmeter/util/StringUtilities.java similarity index 100% rename from src/core/org/apache/jmeter/util/StringUtilities.java rename to src/core/src/main/java/org/apache/jmeter/util/StringUtilities.java diff --git a/src/core/org/apache/jmeter/util/TemplateUtil.java b/src/core/src/main/java/org/apache/jmeter/util/TemplateUtil.java similarity index 100% rename from src/core/org/apache/jmeter/util/TemplateUtil.java rename to src/core/src/main/java/org/apache/jmeter/util/TemplateUtil.java diff --git a/src/core/org/apache/jmeter/util/TidyException.java b/src/core/src/main/java/org/apache/jmeter/util/TidyException.java similarity index 100% rename from src/core/org/apache/jmeter/util/TidyException.java rename to src/core/src/main/java/org/apache/jmeter/util/TidyException.java diff --git a/src/core/org/apache/jmeter/util/TrustAllSSLSocketFactory.java b/src/core/src/main/java/org/apache/jmeter/util/TrustAllSSLSocketFactory.java similarity index 100% rename from src/core/org/apache/jmeter/util/TrustAllSSLSocketFactory.java rename to src/core/src/main/java/org/apache/jmeter/util/TrustAllSSLSocketFactory.java diff --git a/src/core/org/apache/jmeter/util/XPathQueryCacheLoader.java b/src/core/src/main/java/org/apache/jmeter/util/XPathQueryCacheLoader.java similarity index 100% rename from src/core/org/apache/jmeter/util/XPathQueryCacheLoader.java rename to src/core/src/main/java/org/apache/jmeter/util/XPathQueryCacheLoader.java diff --git a/src/core/org/apache/jmeter/util/XPathUtil.java b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java similarity index 100% rename from src/core/org/apache/jmeter/util/XPathUtil.java rename to src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java diff --git a/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java b/src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java similarity index 100% rename from src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java rename to src/core/src/main/java/org/apache/jmeter/util/keystore/JmeterKeyStore.java diff --git a/src/core/org/apache/jmeter/visualizers/CachingStatCalculator.java b/src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/CachingStatCalculator.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/CachingStatCalculator.java diff --git a/src/core/org/apache/jmeter/visualizers/ImageVisualizer.java b/src/core/src/main/java/org/apache/jmeter/visualizers/ImageVisualizer.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/ImageVisualizer.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/ImageVisualizer.java diff --git a/src/core/org/apache/jmeter/visualizers/Printable.java b/src/core/src/main/java/org/apache/jmeter/visualizers/Printable.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/Printable.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/Printable.java diff --git a/src/core/org/apache/jmeter/visualizers/RunningSample.java b/src/core/src/main/java/org/apache/jmeter/visualizers/RunningSample.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/RunningSample.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/RunningSample.java diff --git a/src/core/org/apache/jmeter/visualizers/Sample.java b/src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/Sample.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/Sample.java diff --git a/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java b/src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java diff --git a/src/core/org/apache/jmeter/visualizers/TableSample.java b/src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/TableSample.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/TableSample.java diff --git a/src/core/org/apache/jmeter/visualizers/Visualizer.java b/src/core/src/main/java/org/apache/jmeter/visualizers/Visualizer.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/Visualizer.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/Visualizer.java diff --git a/src/core/org/apache/jmeter/visualizers/backend/Backend.java b/src/core/src/main/java/org/apache/jmeter/visualizers/backend/Backend.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/backend/Backend.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/backend/Backend.java diff --git a/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java b/src/core/src/main/java/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java similarity index 100% rename from src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java diff --git a/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java b/src/core/src/main/java/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java similarity index 98% rename from src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java rename to src/core/src/main/java/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java index 3867b7a2925..3aa0e724704 100644 --- a/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java +++ b/src/core/src/main/java/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java @@ -94,9 +94,7 @@ * {@link org.apache.jmeter.reporters.ResultCollector ResultCollector} as well * and modify the {@link #configure(TestElement)}, * {@link #modifyTestElement(TestElement)}, and {@link #createTestElement()} - * methods to create and modify your alternate ResultCollector. For an example - * of this, see the - * {@link org.apache.jmeter.visualizers.MailerVisualizer MailerVisualizer}. + * methods to create and modify your alternate ResultCollector. */ public abstract class AbstractVisualizer extends AbstractListenerGui diff --git a/src/core/org/apache/jmeter/gui/action/schematic.xsl b/src/core/src/main/resources/org/apache/jmeter/gui/action/schematic.xsl similarity index 100% rename from src/core/org/apache/jmeter/gui/action/schematic.xsl rename to src/core/src/main/resources/org/apache/jmeter/gui/action/schematic.xsl diff --git a/src/core/org/apache/jmeter/gui/action/template/templates.dtd b/src/core/src/main/resources/org/apache/jmeter/gui/action/template/templates.dtd similarity index 100% rename from src/core/org/apache/jmeter/gui/action/template/templates.dtd rename to src/core/src/main/resources/org/apache/jmeter/gui/action/template/templates.dtd diff --git a/src/core/org/apache/jmeter/gui/util/textarea.properties b/src/core/src/main/resources/org/apache/jmeter/gui/util/textarea.properties similarity index 100% rename from src/core/org/apache/jmeter/gui/util/textarea.properties rename to src/core/src/main/resources/org/apache/jmeter/gui/util/textarea.properties diff --git a/src/core/org/apache/jmeter/gui/util/theme/darcula_theme.xml b/src/core/src/main/resources/org/apache/jmeter/gui/util/theme/darcula_theme.xml similarity index 100% rename from src/core/org/apache/jmeter/gui/util/theme/darcula_theme.xml rename to src/core/src/main/resources/org/apache/jmeter/gui/util/theme/darcula_theme.xml diff --git a/src/core/org/apache/jmeter/help.txt b/src/core/src/main/resources/org/apache/jmeter/help.txt similarity index 100% rename from src/core/org/apache/jmeter/help.txt rename to src/core/src/main/resources/org/apache/jmeter/help.txt diff --git a/src/core/org/apache/jmeter/images/about.down.gif b/src/core/src/main/resources/org/apache/jmeter/images/about.down.gif similarity index 100% rename from src/core/org/apache/jmeter/images/about.down.gif rename to src/core/src/main/resources/org/apache/jmeter/images/about.down.gif diff --git a/src/core/org/apache/jmeter/images/about.off.gif b/src/core/src/main/resources/org/apache/jmeter/images/about.off.gif similarity index 100% rename from src/core/org/apache/jmeter/images/about.off.gif rename to src/core/src/main/resources/org/apache/jmeter/images/about.off.gif diff --git a/src/core/org/apache/jmeter/images/about.on.gif b/src/core/src/main/resources/org/apache/jmeter/images/about.on.gif similarity index 100% rename from src/core/org/apache/jmeter/images/about.on.gif rename to src/core/src/main/resources/org/apache/jmeter/images/about.on.gif diff --git a/src/core/org/apache/jmeter/images/about.over.gif b/src/core/src/main/resources/org/apache/jmeter/images/about.over.gif similarity index 100% rename from src/core/org/apache/jmeter/images/about.over.gif rename to src/core/src/main/resources/org/apache/jmeter/images/about.over.gif diff --git a/src/core/org/apache/jmeter/images/beaker.gif b/src/core/src/main/resources/org/apache/jmeter/images/beaker.gif similarity index 100% rename from src/core/org/apache/jmeter/images/beaker.gif rename to src/core/src/main/resources/org/apache/jmeter/images/beaker.gif diff --git a/src/core/org/apache/jmeter/images/clear.down.gif b/src/core/src/main/resources/org/apache/jmeter/images/clear.down.gif similarity index 100% rename from src/core/org/apache/jmeter/images/clear.down.gif rename to src/core/src/main/resources/org/apache/jmeter/images/clear.down.gif diff --git a/src/core/org/apache/jmeter/images/clear.off.gif b/src/core/src/main/resources/org/apache/jmeter/images/clear.off.gif similarity index 100% rename from src/core/org/apache/jmeter/images/clear.off.gif rename to src/core/src/main/resources/org/apache/jmeter/images/clear.off.gif diff --git a/src/core/org/apache/jmeter/images/clear.on.gif b/src/core/src/main/resources/org/apache/jmeter/images/clear.on.gif similarity index 100% rename from src/core/org/apache/jmeter/images/clear.on.gif rename to src/core/src/main/resources/org/apache/jmeter/images/clear.on.gif diff --git a/src/core/org/apache/jmeter/images/clear.over.gif b/src/core/src/main/resources/org/apache/jmeter/images/clear.over.gif similarity index 100% rename from src/core/org/apache/jmeter/images/clear.over.gif rename to src/core/src/main/resources/org/apache/jmeter/images/clear.over.gif diff --git a/src/core/org/apache/jmeter/images/clipboard.gif b/src/core/src/main/resources/org/apache/jmeter/images/clipboard.gif similarity index 100% rename from src/core/org/apache/jmeter/images/clipboard.gif rename to src/core/src/main/resources/org/apache/jmeter/images/clipboard.gif diff --git a/src/core/org/apache/jmeter/images/collapse-close.png b/src/core/src/main/resources/org/apache/jmeter/images/collapse-close.png similarity index 100% rename from src/core/org/apache/jmeter/images/collapse-close.png rename to src/core/src/main/resources/org/apache/jmeter/images/collapse-close.png diff --git a/src/core/org/apache/jmeter/images/collapse-open.png b/src/core/src/main/resources/org/apache/jmeter/images/collapse-open.png similarity index 100% rename from src/core/org/apache/jmeter/images/collapse-open.png rename to src/core/src/main/resources/org/apache/jmeter/images/collapse-open.png diff --git a/src/core/org/apache/jmeter/images/ear.gif b/src/core/src/main/resources/org/apache/jmeter/images/ear.gif similarity index 100% rename from src/core/org/apache/jmeter/images/ear.gif rename to src/core/src/main/resources/org/apache/jmeter/images/ear.gif diff --git a/src/core/org/apache/jmeter/images/feather.gif b/src/core/src/main/resources/org/apache/jmeter/images/feather.gif similarity index 100% rename from src/core/org/apache/jmeter/images/feather.gif rename to src/core/src/main/resources/org/apache/jmeter/images/feather.gif diff --git a/src/core/org/apache/jmeter/images/icon-apache.png b/src/core/src/main/resources/org/apache/jmeter/images/icon-apache.png similarity index 100% rename from src/core/org/apache/jmeter/images/icon-apache.png rename to src/core/src/main/resources/org/apache/jmeter/images/icon-apache.png diff --git a/src/core/org/apache/jmeter/images/icon.properties b/src/core/src/main/resources/org/apache/jmeter/images/icon.properties similarity index 100% rename from src/core/org/apache/jmeter/images/icon.properties rename to src/core/src/main/resources/org/apache/jmeter/images/icon.properties diff --git a/src/core/org/apache/jmeter/images/icon_1.properties b/src/core/src/main/resources/org/apache/jmeter/images/icon_1.properties similarity index 100% rename from src/core/org/apache/jmeter/images/icon_1.properties rename to src/core/src/main/resources/org/apache/jmeter/images/icon_1.properties diff --git a/src/core/org/apache/jmeter/images/icon_error_sml.gif b/src/core/src/main/resources/org/apache/jmeter/images/icon_error_sml.gif similarity index 100% rename from src/core/org/apache/jmeter/images/icon_error_sml.gif rename to src/core/src/main/resources/org/apache/jmeter/images/icon_error_sml.gif diff --git a/src/core/org/apache/jmeter/images/icon_old.properties b/src/core/src/main/resources/org/apache/jmeter/images/icon_old.properties similarity index 100% rename from src/core/org/apache/jmeter/images/icon_old.properties rename to src/core/src/main/resources/org/apache/jmeter/images/icon_old.properties diff --git a/src/core/org/apache/jmeter/images/icon_success_sml.gif b/src/core/src/main/resources/org/apache/jmeter/images/icon_success_sml.gif similarity index 100% rename from src/core/org/apache/jmeter/images/icon_success_sml.gif rename to src/core/src/main/resources/org/apache/jmeter/images/icon_success_sml.gif diff --git a/src/core/org/apache/jmeter/images/icon_warning_sml.gif b/src/core/src/main/resources/org/apache/jmeter/images/icon_warning_sml.gif similarity index 100% rename from src/core/org/apache/jmeter/images/icon_warning_sml.gif rename to src/core/src/main/resources/org/apache/jmeter/images/icon_warning_sml.gif diff --git a/src/core/org/apache/jmeter/images/jmeter.png b/src/core/src/main/resources/org/apache/jmeter/images/jmeter.png similarity index 100% rename from src/core/org/apache/jmeter/images/jmeter.png rename to src/core/src/main/resources/org/apache/jmeter/images/jmeter.png diff --git a/src/core/org/apache/jmeter/images/knob.gif b/src/core/src/main/resources/org/apache/jmeter/images/knob.gif similarity index 100% rename from src/core/org/apache/jmeter/images/knob.gif rename to src/core/src/main/resources/org/apache/jmeter/images/knob.gif diff --git a/src/core/org/apache/jmeter/images/leafnode.gif b/src/core/src/main/resources/org/apache/jmeter/images/leafnode.gif similarity index 100% rename from src/core/org/apache/jmeter/images/leafnode.gif rename to src/core/src/main/resources/org/apache/jmeter/images/leafnode.gif diff --git a/src/core/org/apache/jmeter/images/leafnodeflip.gif b/src/core/src/main/resources/org/apache/jmeter/images/leafnodeflip.gif similarity index 100% rename from src/core/org/apache/jmeter/images/leafnodeflip.gif rename to src/core/src/main/resources/org/apache/jmeter/images/leafnodeflip.gif diff --git a/src/core/org/apache/jmeter/images/meter.png b/src/core/src/main/resources/org/apache/jmeter/images/meter.png similarity index 100% rename from src/core/org/apache/jmeter/images/meter.png rename to src/core/src/main/resources/org/apache/jmeter/images/meter.png diff --git a/src/core/org/apache/jmeter/images/new/barchart.png b/src/core/src/main/resources/org/apache/jmeter/images/new/barchart.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/barchart.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/barchart.png diff --git a/src/core/org/apache/jmeter/images/new/barchart.png-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/barchart.png-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/barchart.png-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/barchart.png-grey.png diff --git a/src/core/org/apache/jmeter/images/new/blue-quill.png b/src/core/src/main/resources/org/apache/jmeter/images/new/blue-quill.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/blue-quill.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/blue-quill.png diff --git a/src/core/org/apache/jmeter/images/new/book-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/book-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/book-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/book-grey.png diff --git a/src/core/org/apache/jmeter/images/new/book.png b/src/core/src/main/resources/org/apache/jmeter/images/new/book.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/book.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/book.png diff --git a/src/core/org/apache/jmeter/images/new/chart-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/chart-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/chart-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/chart-grey.png diff --git a/src/core/org/apache/jmeter/images/new/chart.png b/src/core/src/main/resources/org/apache/jmeter/images/new/chart.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/chart.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/chart.png diff --git a/src/core/org/apache/jmeter/images/new/clock-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/clock-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/clock-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/clock-grey.png diff --git a/src/core/org/apache/jmeter/images/new/clock.png b/src/core/src/main/resources/org/apache/jmeter/images/new/clock.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/clock.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/clock.png diff --git a/src/core/org/apache/jmeter/images/new/funnel-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/funnel-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/funnel-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/funnel-grey.png diff --git a/src/core/org/apache/jmeter/images/new/funnel.png b/src/core/src/main/resources/org/apache/jmeter/images/new/funnel.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/funnel.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/funnel.png diff --git a/src/core/org/apache/jmeter/images/new/glasses-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/glasses-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/glasses-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/glasses-grey.png diff --git a/src/core/org/apache/jmeter/images/new/glasses.png b/src/core/src/main/resources/org/apache/jmeter/images/new/glasses.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/glasses.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/glasses.png diff --git a/src/core/org/apache/jmeter/images/new/mglass-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/mglass-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/mglass-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/mglass-grey.png diff --git a/src/core/org/apache/jmeter/images/new/mglass.png b/src/core/src/main/resources/org/apache/jmeter/images/new/mglass.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/mglass.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/mglass.png diff --git a/src/core/org/apache/jmeter/images/new/pencil-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/pencil-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/pencil-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/pencil-grey.png diff --git a/src/core/org/apache/jmeter/images/new/pencil.png b/src/core/src/main/resources/org/apache/jmeter/images/new/pencil.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/pencil.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/pencil.png diff --git a/src/core/org/apache/jmeter/images/new/pin-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/pin-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/pin-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/pin-grey.png diff --git a/src/core/org/apache/jmeter/images/new/pin.png b/src/core/src/main/resources/org/apache/jmeter/images/new/pin.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/pin.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/pin.png diff --git a/src/core/org/apache/jmeter/images/new/puzzle-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/puzzle-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/puzzle-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/puzzle-grey.png diff --git a/src/core/org/apache/jmeter/images/new/puzzle.png b/src/core/src/main/resources/org/apache/jmeter/images/new/puzzle.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/puzzle.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/puzzle.png diff --git a/src/core/org/apache/jmeter/images/new/remote-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/remote-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/remote-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/remote-grey.png diff --git a/src/core/org/apache/jmeter/images/new/remote.png b/src/core/src/main/resources/org/apache/jmeter/images/new/remote.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/remote.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/remote.png diff --git a/src/core/org/apache/jmeter/images/new/scroll-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/scroll-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/scroll-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/scroll-grey.png diff --git a/src/core/org/apache/jmeter/images/new/scroll.png b/src/core/src/main/resources/org/apache/jmeter/images/new/scroll.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/scroll.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/scroll.png diff --git a/src/core/org/apache/jmeter/images/new/table-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/table-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/table-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/table-grey.png diff --git a/src/core/org/apache/jmeter/images/new/table.png b/src/core/src/main/resources/org/apache/jmeter/images/new/table.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/table.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/table.png diff --git a/src/core/org/apache/jmeter/images/new/thread-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/thread-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/thread-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/thread-grey.png diff --git a/src/core/org/apache/jmeter/images/new/thread.png b/src/core/src/main/resources/org/apache/jmeter/images/new/thread.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/thread.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/thread.png diff --git a/src/core/org/apache/jmeter/images/new/typewriter-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/new/typewriter-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/typewriter-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/typewriter-grey.png diff --git a/src/core/org/apache/jmeter/images/new/typewriter.png b/src/core/src/main/resources/org/apache/jmeter/images/new/typewriter.png similarity index 100% rename from src/core/org/apache/jmeter/images/new/typewriter.png rename to src/core/src/main/resources/org/apache/jmeter/images/new/typewriter.png diff --git a/src/core/org/apache/jmeter/images/pipet.png b/src/core/src/main/resources/org/apache/jmeter/images/pipet.png similarity index 100% rename from src/core/org/apache/jmeter/images/pipet.png rename to src/core/src/main/resources/org/apache/jmeter/images/pipet.png diff --git a/src/core/org/apache/jmeter/images/question.gif b/src/core/src/main/resources/org/apache/jmeter/images/question.gif similarity index 100% rename from src/core/org/apache/jmeter/images/question.gif rename to src/core/src/main/resources/org/apache/jmeter/images/question.gif diff --git a/src/core/org/apache/jmeter/images/smallthread.disabled.gif b/src/core/src/main/resources/org/apache/jmeter/images/smallthread.disabled.gif similarity index 100% rename from src/core/org/apache/jmeter/images/smallthread.disabled.gif rename to src/core/src/main/resources/org/apache/jmeter/images/smallthread.disabled.gif diff --git a/src/core/org/apache/jmeter/images/smallthread.enabled.gif b/src/core/src/main/resources/org/apache/jmeter/images/smallthread.enabled.gif similarity index 100% rename from src/core/org/apache/jmeter/images/smallthread.enabled.gif rename to src/core/src/main/resources/org/apache/jmeter/images/smallthread.enabled.gif diff --git a/src/core/org/apache/jmeter/images/smallthread.idle.gif b/src/core/src/main/resources/org/apache/jmeter/images/smallthread.idle.gif similarity index 100% rename from src/core/org/apache/jmeter/images/smallthread.idle.gif rename to src/core/src/main/resources/org/apache/jmeter/images/smallthread.idle.gif diff --git a/src/core/org/apache/jmeter/images/start.down.gif b/src/core/src/main/resources/org/apache/jmeter/images/start.down.gif similarity index 100% rename from src/core/org/apache/jmeter/images/start.down.gif rename to src/core/src/main/resources/org/apache/jmeter/images/start.down.gif diff --git a/src/core/org/apache/jmeter/images/start.off.gif b/src/core/src/main/resources/org/apache/jmeter/images/start.off.gif similarity index 100% rename from src/core/org/apache/jmeter/images/start.off.gif rename to src/core/src/main/resources/org/apache/jmeter/images/start.off.gif diff --git a/src/core/org/apache/jmeter/images/start.on.gif b/src/core/src/main/resources/org/apache/jmeter/images/start.on.gif similarity index 100% rename from src/core/org/apache/jmeter/images/start.on.gif rename to src/core/src/main/resources/org/apache/jmeter/images/start.on.gif diff --git a/src/core/org/apache/jmeter/images/start.over.gif b/src/core/src/main/resources/org/apache/jmeter/images/start.over.gif similarity index 100% rename from src/core/org/apache/jmeter/images/start.over.gif rename to src/core/src/main/resources/org/apache/jmeter/images/start.over.gif diff --git a/src/core/org/apache/jmeter/images/status/22x22/dialog-error-5.png b/src/core/src/main/resources/org/apache/jmeter/images/status/22x22/dialog-error-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/22x22/dialog-error-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/22x22/dialog-error-5.png diff --git a/src/core/org/apache/jmeter/images/status/22x22/pictogram-din-w000-general.png b/src/core/src/main/resources/org/apache/jmeter/images/status/22x22/pictogram-din-w000-general.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/22x22/pictogram-din-w000-general.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/22x22/pictogram-din-w000-general.png diff --git a/src/core/org/apache/jmeter/images/status/22x22/task-complete.png b/src/core/src/main/resources/org/apache/jmeter/images/status/22x22/task-complete.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/22x22/task-complete.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/22x22/task-complete.png diff --git a/src/core/org/apache/jmeter/images/status/22x22/task-recurring.png b/src/core/src/main/resources/org/apache/jmeter/images/status/22x22/task-recurring.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/22x22/task-recurring.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/22x22/task-recurring.png diff --git a/src/core/org/apache/jmeter/images/status/22x22/user-offline-2.png b/src/core/src/main/resources/org/apache/jmeter/images/status/22x22/user-offline-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/22x22/user-offline-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/22x22/user-offline-2.png diff --git a/src/core/org/apache/jmeter/images/status/22x22/user-online-2.png b/src/core/src/main/resources/org/apache/jmeter/images/status/22x22/user-online-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/22x22/user-online-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/22x22/user-online-2.png diff --git a/src/core/org/apache/jmeter/images/status/32x32/dialog-error-5.png b/src/core/src/main/resources/org/apache/jmeter/images/status/32x32/dialog-error-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/32x32/dialog-error-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/32x32/dialog-error-5.png diff --git a/src/core/org/apache/jmeter/images/status/32x32/pictogram-din-w000-general.png b/src/core/src/main/resources/org/apache/jmeter/images/status/32x32/pictogram-din-w000-general.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/32x32/pictogram-din-w000-general.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/32x32/pictogram-din-w000-general.png diff --git a/src/core/org/apache/jmeter/images/status/32x32/task-complete.png b/src/core/src/main/resources/org/apache/jmeter/images/status/32x32/task-complete.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/32x32/task-complete.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/32x32/task-complete.png diff --git a/src/core/org/apache/jmeter/images/status/32x32/task-recurring.png b/src/core/src/main/resources/org/apache/jmeter/images/status/32x32/task-recurring.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/32x32/task-recurring.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/32x32/task-recurring.png diff --git a/src/core/org/apache/jmeter/images/status/32x32/user-offline-2.png b/src/core/src/main/resources/org/apache/jmeter/images/status/32x32/user-offline-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/32x32/user-offline-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/32x32/user-offline-2.png diff --git a/src/core/org/apache/jmeter/images/status/32x32/user-online-2.png b/src/core/src/main/resources/org/apache/jmeter/images/status/32x32/user-online-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/32x32/user-online-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/32x32/user-online-2.png diff --git a/src/core/org/apache/jmeter/images/status/48x48/dialog-error-5.png b/src/core/src/main/resources/org/apache/jmeter/images/status/48x48/dialog-error-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/48x48/dialog-error-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/48x48/dialog-error-5.png diff --git a/src/core/org/apache/jmeter/images/status/48x48/pictogram-din-w000-general.png b/src/core/src/main/resources/org/apache/jmeter/images/status/48x48/pictogram-din-w000-general.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/48x48/pictogram-din-w000-general.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/48x48/pictogram-din-w000-general.png diff --git a/src/core/org/apache/jmeter/images/status/48x48/task-complete.png b/src/core/src/main/resources/org/apache/jmeter/images/status/48x48/task-complete.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/48x48/task-complete.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/48x48/task-complete.png diff --git a/src/core/org/apache/jmeter/images/status/48x48/task-recurring.png b/src/core/src/main/resources/org/apache/jmeter/images/status/48x48/task-recurring.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/48x48/task-recurring.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/48x48/task-recurring.png diff --git a/src/core/org/apache/jmeter/images/status/48x48/user-offline-2.png b/src/core/src/main/resources/org/apache/jmeter/images/status/48x48/user-offline-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/48x48/user-offline-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/48x48/user-offline-2.png diff --git a/src/core/org/apache/jmeter/images/status/48x48/user-online-2.png b/src/core/src/main/resources/org/apache/jmeter/images/status/48x48/user-online-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/status/48x48/user-online-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/status/48x48/user-online-2.png diff --git a/src/core/org/apache/jmeter/images/stop.down.gif b/src/core/src/main/resources/org/apache/jmeter/images/stop.down.gif similarity index 100% rename from src/core/org/apache/jmeter/images/stop.down.gif rename to src/core/src/main/resources/org/apache/jmeter/images/stop.down.gif diff --git a/src/core/org/apache/jmeter/images/stop.off.gif b/src/core/src/main/resources/org/apache/jmeter/images/stop.off.gif similarity index 100% rename from src/core/org/apache/jmeter/images/stop.off.gif rename to src/core/src/main/resources/org/apache/jmeter/images/stop.off.gif diff --git a/src/core/org/apache/jmeter/images/stop.on.gif b/src/core/src/main/resources/org/apache/jmeter/images/stop.on.gif similarity index 100% rename from src/core/org/apache/jmeter/images/stop.on.gif rename to src/core/src/main/resources/org/apache/jmeter/images/stop.on.gif diff --git a/src/core/org/apache/jmeter/images/stop.over.gif b/src/core/src/main/resources/org/apache/jmeter/images/stop.over.gif similarity index 100% rename from src/core/org/apache/jmeter/images/stop.over.gif rename to src/core/src/main/resources/org/apache/jmeter/images/stop.over.gif diff --git a/src/core/org/apache/jmeter/images/testtubes.png b/src/core/src/main/resources/org/apache/jmeter/images/testtubes.png similarity index 100% rename from src/core/org/apache/jmeter/images/testtubes.png rename to src/core/src/main/resources/org/apache/jmeter/images/testtubes.png diff --git a/src/core/org/apache/jmeter/images/thread.disabled.gif b/src/core/src/main/resources/org/apache/jmeter/images/thread.disabled.gif similarity index 100% rename from src/core/org/apache/jmeter/images/thread.disabled.gif rename to src/core/src/main/resources/org/apache/jmeter/images/thread.disabled.gif diff --git a/src/core/org/apache/jmeter/images/thread.enabled.gif b/src/core/src/main/resources/org/apache/jmeter/images/thread.enabled.gif similarity index 100% rename from src/core/org/apache/jmeter/images/thread.enabled.gif rename to src/core/src/main/resources/org/apache/jmeter/images/thread.enabled.gif diff --git a/src/core/org/apache/jmeter/images/thread.gif b/src/core/src/main/resources/org/apache/jmeter/images/thread.gif similarity index 100% rename from src/core/org/apache/jmeter/images/thread.gif rename to src/core/src/main/resources/org/apache/jmeter/images/thread.gif diff --git a/src/core/org/apache/jmeter/images/thread.idle.gif b/src/core/src/main/resources/org/apache/jmeter/images/thread.idle.gif similarity index 100% rename from src/core/org/apache/jmeter/images/thread.idle.gif rename to src/core/src/main/resources/org/apache/jmeter/images/thread.idle.gif diff --git a/src/core/org/apache/jmeter/images/timer.gif b/src/core/src/main/resources/org/apache/jmeter/images/timer.gif similarity index 100% rename from src/core/org/apache/jmeter/images/timer.gif rename to src/core/src/main/resources/org/apache/jmeter/images/timer.gif diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/applications-office.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/applications-office.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/applications-office.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/applications-office.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-notimer.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-notimer.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-notimer.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-notimer.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-startremoteall.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-startremoteall.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-startremoteall.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/arrow-right-3-startremoteall.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/arrow-right-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/arrow-right-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/arrow-right-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/arrow-right-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/color-picker-toggle.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/color-picker-toggle.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/color-picker-toggle.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/color-picker-toggle.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/document-new-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/document-new-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/document-new-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/document-new-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/document-open-2.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/document-open-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/document-open-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/document-open-2.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/document-save-5.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/document-save-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/document-save-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/document-save-5.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/document-save-as-5.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/document-save-as-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/document-save-as-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/document-save-as-5.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/documentation.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/documentation.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/documentation.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/documentation.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/edit-clear-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-clear-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/edit-clear-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-clear-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/edit-copy-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-copy-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/edit-copy-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-copy-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/edit-cut-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-cut-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/edit-cut-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-cut-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/edit-find-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-find-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/edit-find-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-find-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/edit-paste-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-paste-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/edit-paste-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-paste-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/edit-redo-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-redo-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/edit-redo-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-redo-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/edit-undo-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-undo-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/edit-undo-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/edit-undo-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/help-contents-5.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/help-contents-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/help-contents-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/help-contents-5.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/list-add-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/list-add-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/list-add-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/list-add-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/list-remove-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/list-remove-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/list-remove-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/list-remove-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/process-stop-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/process-stop-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/process-stop-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/process-stop-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/process-stop-7-shutdownremoteall.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/process-stop-7-shutdownremoteall.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/process-stop-7-shutdownremoteall.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/process-stop-7-shutdownremoteall.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/process-stop-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/process-stop-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/process-stop-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/process-stop-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop-stopremoteall.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop-stopremoteall.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop-stopremoteall.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop-stopremoteall.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/road-sign-us-stop.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/run-build-clean.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/run-build-clean.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/run-build-clean.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/run-build-clean.png diff --git a/src/core/org/apache/jmeter/images/toolbar/22x22/run-build-prune.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/run-build-prune.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/22x22/run-build-prune.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/22x22/run-build-prune.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/applications-office.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/applications-office.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/applications-office.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/applications-office.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-notimer.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-notimer.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-notimer.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-notimer.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-startremoteall.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-startremoteall.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-startremoteall.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/arrow-right-3-startremoteall.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/arrow-right-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/arrow-right-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/arrow-right-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/arrow-right-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/color-picker-toggle.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/color-picker-toggle.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/color-picker-toggle.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/color-picker-toggle.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/document-new-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/document-new-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/document-new-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/document-new-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/document-open-2.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/document-open-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/document-open-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/document-open-2.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/document-save-5.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/document-save-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/document-save-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/document-save-5.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/document-save-as-5.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/document-save-as-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/document-save-as-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/document-save-as-5.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/documentation.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/documentation.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/documentation.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/documentation.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/edit-clear-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-clear-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/edit-clear-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-clear-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/edit-copy-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-copy-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/edit-copy-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-copy-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/edit-cut-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-cut-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/edit-cut-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-cut-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/edit-find-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-find-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/edit-find-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-find-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/edit-paste-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-paste-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/edit-paste-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-paste-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/edit-redo-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-redo-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/edit-redo-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-redo-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/edit-undo-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-undo-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/edit-undo-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/edit-undo-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/help-contents-5.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/help-contents-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/help-contents-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/help-contents-5.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/list-add-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/list-add-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/list-add-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/list-add-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/list-remove-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/list-remove-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/list-remove-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/list-remove-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/process-stop-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/process-stop-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/process-stop-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/process-stop-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/process-stop-7-shutdownremoteall.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/process-stop-7-shutdownremoteall.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/process-stop-7-shutdownremoteall.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/process-stop-7-shutdownremoteall.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/process-stop-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/process-stop-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/process-stop-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/process-stop-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop-stopremoteall.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop-stopremoteall.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop-stopremoteall.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop-stopremoteall.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/road-sign-us-stop.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/run-build-clean.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/run-build-clean.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/run-build-clean.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/run-build-clean.png diff --git a/src/core/org/apache/jmeter/images/toolbar/32x32/run-build-prune.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/run-build-prune.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/32x32/run-build-prune.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/32x32/run-build-prune.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/applications-office.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/applications-office.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/applications-office.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/applications-office.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-notimer.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-notimer.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-notimer.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-notimer.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-startremoteall.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-startremoteall.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-startremoteall.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/arrow-right-3-startremoteall.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/arrow-right-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/arrow-right-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/arrow-right-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/arrow-right-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/color-picker-toggle.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/color-picker-toggle.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/color-picker-toggle.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/color-picker-toggle.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/document-new-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/document-new-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/document-new-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/document-new-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/document-open-2.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/document-open-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/document-open-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/document-open-2.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/document-save-5.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/document-save-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/document-save-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/document-save-5.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/document-save-as-5.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/document-save-as-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/document-save-as-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/document-save-as-5.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/documentation.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/documentation.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/documentation.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/documentation.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/edit-clear-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-clear-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/edit-clear-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-clear-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/edit-copy-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-copy-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/edit-copy-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-copy-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/edit-cut-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-cut-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/edit-cut-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-cut-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/edit-find-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-find-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/edit-find-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-find-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/edit-paste-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-paste-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/edit-paste-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-paste-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/edit-redo-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-redo-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/edit-redo-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-redo-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/edit-undo-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-undo-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/edit-undo-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/edit-undo-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/help-contents-5.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/help-contents-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/help-contents-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/help-contents-5.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/list-add-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/list-add-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/list-add-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/list-add-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/list-remove-3.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/list-remove-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/list-remove-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/list-remove-3.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/process-stop-4.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/process-stop-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/process-stop-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/process-stop-4.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/process-stop-7-shutdownremoteall.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/process-stop-7-shutdownremoteall.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/process-stop-7-shutdownremoteall.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/process-stop-7-shutdownremoteall.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/process-stop-7.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/process-stop-7.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/process-stop-7.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/process-stop-7.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop-stopremoteall.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop-stopremoteall.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop-stopremoteall.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop-stopremoteall.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/road-sign-us-stop.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/run-build-clean.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/run-build-clean.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/run-build-clean.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/run-build-clean.png diff --git a/src/core/org/apache/jmeter/images/toolbar/48x48/run-build-prune.png b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/run-build-prune.png similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/48x48/run-build-prune.png rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/48x48/run-build-prune.png diff --git a/src/core/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-notimer.svg b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-notimer.svg similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-notimer.svg rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-notimer.svg diff --git a/src/core/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-startremoteall.svg b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-startremoteall.svg similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-startremoteall.svg rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/arrow-right-3-startremoteall.svg diff --git a/src/core/org/apache/jmeter/images/toolbar/icons-custom/color-picker-toggle.svg b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/color-picker-toggle.svg similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/icons-custom/color-picker-toggle.svg rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/color-picker-toggle.svg diff --git a/src/core/org/apache/jmeter/images/toolbar/icons-custom/process-stop-7-shutdownremoteall.svg b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/process-stop-7-shutdownremoteall.svg similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/icons-custom/process-stop-7-shutdownremoteall.svg rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/process-stop-7-shutdownremoteall.svg diff --git a/src/core/org/apache/jmeter/images/toolbar/icons-custom/road-sign-us-stop-stopremoteall.svg b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/road-sign-us-stop-stopremoteall.svg similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/icons-custom/road-sign-us-stop-stopremoteall.svg rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-custom/road-sign-us-stop-stopremoteall.svg diff --git a/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties b/src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-toolbar.properties similarity index 100% rename from src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties rename to src/core/src/main/resources/org/apache/jmeter/images/toolbar/icons-toolbar.properties diff --git a/src/core/org/apache/jmeter/images/tree/19x19/applications-science-3.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/applications-science-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/applications-science-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/applications-science-3.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/appointment-new-3.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/appointment-new-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/appointment-new-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/appointment-new-3.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/color-picker-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/color-picker-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/color-picker-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/color-picker-grey.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/document-export-4_custom.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/document-export-4_custom.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/document-export-4_custom.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/document-export-4_custom.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/document-import-2_custom.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/document-import-2_custom.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/document-import-2_custom.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/document-import-2_custom.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/document-preview.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/document-preview.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/document-preview.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/document-preview.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/office-chart-area.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/office-chart-area.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/office-chart-area.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/office-chart-area.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/preferences-system-4.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/preferences-system-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/preferences-system-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/preferences-system-4.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/system-run-5.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/system-run-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/system-run-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/system-run-5.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/view-list-tree-4.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/view-list-tree-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/view-list-tree-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/view-list-tree-4.png diff --git a/src/core/org/apache/jmeter/images/tree/19x19/view-pim-tasks.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/view-pim-tasks.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/19x19/view-pim-tasks.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/19x19/view-pim-tasks.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/applications-science-3.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/applications-science-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/applications-science-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/applications-science-3.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/appointment-new-3.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/appointment-new-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/appointment-new-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/appointment-new-3.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/color-picker-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/color-picker-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/color-picker-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/color-picker-grey.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/document-export-4_custom.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/document-export-4_custom.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/document-export-4_custom.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/document-export-4_custom.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/document-import-2_custom.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/document-import-2_custom.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/document-import-2_custom.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/document-import-2_custom.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/document-preview.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/document-preview.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/document-preview.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/document-preview.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/office-chart-area.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/office-chart-area.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/office-chart-area.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/office-chart-area.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/preferences-system-4.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/preferences-system-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/preferences-system-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/preferences-system-4.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/system-run-5.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/system-run-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/system-run-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/system-run-5.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/view-list-tree-4.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/view-list-tree-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/view-list-tree-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/view-list-tree-4.png diff --git a/src/core/org/apache/jmeter/images/tree/24x24/view-pim-tasks.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/view-pim-tasks.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/24x24/view-pim-tasks.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/24x24/view-pim-tasks.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/applications-science-3.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/applications-science-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/applications-science-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/applications-science-3.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/appointment-new-3.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/appointment-new-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/appointment-new-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/appointment-new-3.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/color-picker-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/color-picker-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/color-picker-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/color-picker-grey.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/document-export-4_custom.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/document-export-4_custom.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/document-export-4_custom.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/document-export-4_custom.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/document-import-2_custom.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/document-import-2_custom.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/document-import-2_custom.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/document-import-2_custom.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/document-preview.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/document-preview.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/document-preview.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/document-preview.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/office-chart-area.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/office-chart-area.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/office-chart-area.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/office-chart-area.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/preferences-system-4.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/preferences-system-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/preferences-system-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/preferences-system-4.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/system-run-5.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/system-run-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/system-run-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/system-run-5.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/view-list-tree-4.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/view-list-tree-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/view-list-tree-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/view-list-tree-4.png diff --git a/src/core/org/apache/jmeter/images/tree/32x32/view-pim-tasks.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/view-pim-tasks.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/32x32/view-pim-tasks.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/32x32/view-pim-tasks.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/applications-science-3.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/applications-science-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/applications-science-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/applications-science-3.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/appointment-new-3.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/appointment-new-3.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/appointment-new-3.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/appointment-new-3.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/color-picker-grey.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/color-picker-grey.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/color-picker-grey.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/color-picker-grey.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/document-export-4_custom.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/document-export-4_custom.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/document-export-4_custom.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/document-export-4_custom.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/document-import-2_custom.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/document-import-2_custom.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/document-import-2_custom.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/document-import-2_custom.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/document-preview.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/document-preview.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/document-preview.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/document-preview.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/office-chart-area.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/office-chart-area.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/office-chart-area.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/office-chart-area.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/preferences-system-4.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/preferences-system-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/preferences-system-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/preferences-system-4.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/system-run-5.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/system-run-5.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/system-run-5.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/system-run-5.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/view-list-tree-4.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/view-list-tree-4.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/view-list-tree-4.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/view-list-tree-4.png diff --git a/src/core/org/apache/jmeter/images/tree/48x48/view-pim-tasks.png b/src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/view-pim-tasks.png similarity index 100% rename from src/core/org/apache/jmeter/images/tree/48x48/view-pim-tasks.png rename to src/core/src/main/resources/org/apache/jmeter/images/tree/48x48/view-pim-tasks.png diff --git a/src/core/org/apache/jmeter/images/tree/icons-custom/document-export-4_custom.svg b/src/core/src/main/resources/org/apache/jmeter/images/tree/icons-custom/document-export-4_custom.svg similarity index 100% rename from src/core/org/apache/jmeter/images/tree/icons-custom/document-export-4_custom.svg rename to src/core/src/main/resources/org/apache/jmeter/images/tree/icons-custom/document-export-4_custom.svg diff --git a/src/core/org/apache/jmeter/images/tree/icons-custom/document-import-2_custom.svg b/src/core/src/main/resources/org/apache/jmeter/images/tree/icons-custom/document-import-2_custom.svg similarity index 100% rename from src/core/org/apache/jmeter/images/tree/icons-custom/document-import-2_custom.svg rename to src/core/src/main/resources/org/apache/jmeter/images/tree/icons-custom/document-import-2_custom.svg diff --git a/src/core/org/apache/jmeter/images/vrt/19x19/security-high-2.png b/src/core/src/main/resources/org/apache/jmeter/images/vrt/19x19/security-high-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/vrt/19x19/security-high-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/vrt/19x19/security-high-2.png diff --git a/src/core/org/apache/jmeter/images/vrt/19x19/security-low-2.png b/src/core/src/main/resources/org/apache/jmeter/images/vrt/19x19/security-low-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/vrt/19x19/security-low-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/vrt/19x19/security-low-2.png diff --git a/src/core/org/apache/jmeter/images/vrt/24x24/security-high-2.png b/src/core/src/main/resources/org/apache/jmeter/images/vrt/24x24/security-high-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/vrt/24x24/security-high-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/vrt/24x24/security-high-2.png diff --git a/src/core/org/apache/jmeter/images/vrt/24x24/security-low-2.png b/src/core/src/main/resources/org/apache/jmeter/images/vrt/24x24/security-low-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/vrt/24x24/security-low-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/vrt/24x24/security-low-2.png diff --git a/src/core/org/apache/jmeter/images/vrt/32x32/security-high-2.png b/src/core/src/main/resources/org/apache/jmeter/images/vrt/32x32/security-high-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/vrt/32x32/security-high-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/vrt/32x32/security-high-2.png diff --git a/src/core/org/apache/jmeter/images/vrt/32x32/security-low-2.png b/src/core/src/main/resources/org/apache/jmeter/images/vrt/32x32/security-low-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/vrt/32x32/security-low-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/vrt/32x32/security-low-2.png diff --git a/src/core/org/apache/jmeter/images/vrt/48x48/security-high-2.png b/src/core/src/main/resources/org/apache/jmeter/images/vrt/48x48/security-high-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/vrt/48x48/security-high-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/vrt/48x48/security-high-2.png diff --git a/src/core/org/apache/jmeter/images/vrt/48x48/security-low-2.png b/src/core/src/main/resources/org/apache/jmeter/images/vrt/48x48/security-low-2.png similarity index 100% rename from src/core/org/apache/jmeter/images/vrt/48x48/security-low-2.png rename to src/core/src/main/resources/org/apache/jmeter/images/vrt/48x48/security-low-2.png diff --git a/src/core/org/apache/jmeter/images/warning.png b/src/core/src/main/resources/org/apache/jmeter/images/warning.png similarity index 100% rename from src/core/org/apache/jmeter/images/warning.png rename to src/core/src/main/resources/org/apache/jmeter/images/warning.png diff --git a/src/core/org/apache/jmeter/report/config/package.html b/src/core/src/main/resources/org/apache/jmeter/report/config/package.html similarity index 100% rename from src/core/org/apache/jmeter/report/config/package.html rename to src/core/src/main/resources/org/apache/jmeter/report/config/package.html diff --git a/src/core/org/apache/jmeter/report/core/package.html b/src/core/src/main/resources/org/apache/jmeter/report/core/package.html similarity index 100% rename from src/core/org/apache/jmeter/report/core/package.html rename to src/core/src/main/resources/org/apache/jmeter/report/core/package.html diff --git a/src/core/org/apache/jmeter/report/dashboard/package.html b/src/core/src/main/resources/org/apache/jmeter/report/dashboard/package.html similarity index 100% rename from src/core/org/apache/jmeter/report/dashboard/package.html rename to src/core/src/main/resources/org/apache/jmeter/report/dashboard/package.html diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/package.html b/src/core/src/main/resources/org/apache/jmeter/report/processor/graph/impl/package.html similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/impl/package.html rename to src/core/src/main/resources/org/apache/jmeter/report/processor/graph/impl/package.html diff --git a/src/core/org/apache/jmeter/report/processor/graph/package.html b/src/core/src/main/resources/org/apache/jmeter/report/processor/graph/package.html similarity index 100% rename from src/core/org/apache/jmeter/report/processor/graph/package.html rename to src/core/src/main/resources/org/apache/jmeter/report/processor/graph/package.html diff --git a/src/core/org/apache/jmeter/report/processor/package.html b/src/core/src/main/resources/org/apache/jmeter/report/processor/package.html similarity index 100% rename from src/core/org/apache/jmeter/report/processor/package.html rename to src/core/src/main/resources/org/apache/jmeter/report/processor/package.html diff --git a/src/core/org/apache/jmeter/resources/messages.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages.properties diff --git a/src/core/org/apache/jmeter/resources/messages_de.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_de.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_de.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_de.properties diff --git a/src/core/org/apache/jmeter/resources/messages_es.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_es.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_es.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_es.properties diff --git a/src/core/org/apache/jmeter/resources/messages_fr.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_fr.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties diff --git a/src/core/org/apache/jmeter/resources/messages_ja.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_ja.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_ja.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_ja.properties diff --git a/src/core/org/apache/jmeter/resources/messages_no.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_no.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_no.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_no.properties diff --git a/src/core/org/apache/jmeter/resources/messages_pl.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_pl.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_pl.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_pl.properties diff --git a/src/core/org/apache/jmeter/resources/messages_pt_BR.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_pt_BR.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_pt_BR.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_pt_BR.properties diff --git a/src/core/org/apache/jmeter/resources/messages_tr.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_tr.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_tr.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_tr.properties diff --git a/src/core/org/apache/jmeter/resources/messages_zh_CN.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_zh_CN.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties diff --git a/src/core/org/apache/jmeter/resources/messages_zh_TW.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_TW.properties similarity index 100% rename from src/core/org/apache/jmeter/resources/messages_zh_TW.properties rename to src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_TW.properties diff --git a/src/core/org/apache/jmeter/visualizers/package.html b/src/core/src/main/resources/org/apache/jmeter/visualizers/package.html similarity index 100% rename from src/core/org/apache/jmeter/visualizers/package.html rename to src/core/src/main/resources/org/apache/jmeter/visualizers/package.html diff --git a/test/src/org/apache/jmeter/gui/HtmlReportGUISpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/gui/HtmlReportGUISpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/gui/HtmlReportGUISpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/gui/HtmlReportGUISpec.groovy diff --git a/src/core/src/test/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy new file mode 100644 index 00000000000..9bfd93d2915 --- /dev/null +++ b/src/core/src/test/groovy/org/apache/jmeter/junit/spock/JMeterSpec.groovy @@ -0,0 +1,61 @@ +/* + * 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. + */ + +package org.apache.jmeter.junit.spock + +import org.apache.jmeter.junit.JMeterTestCaseJUnit +import org.apache.jmeter.junit.JMeterTestUtils +import org.apache.jmeter.util.JMeterUtils +import spock.lang.Specification + +import java.nio.charset.Charset + +/** + * Common setup for Spock test cases. + *

+ * Please only use this class if you need the things set up here. + *

+ * Otherwise, extend {@link Specification} + */ +abstract class JMeterSpec extends Specification { + + /* + * If not running under AllTests.java, make sure that the properties (and + * log file) are set up correctly. + * + * N.B. This assumes the JUnit test are executed in the + * project root, bin directory or one level down, and all the JMeter jars + * (plus any others needed at run-time) need to be on the classpath. + */ + static { + // Initialize JMeterTestCaseJUnit which will setup JMeter properties, home, etc + JMeterTestCaseJUnit.class.getSuperclass(); + } + + private static void logprop(String prop) { + System.out.println(prop + "=" + System.getProperty(prop)) + } + + protected String getResourceFilePath(String resource) { + return JMeterTestUtils.getResourceFilePath(getClass(), resource); + } + + protected static boolean isHeadless() { + System.properties['java.awt.headless'] == 'true' + } + +} diff --git a/test/src/org/apache/jmeter/report/core/ConvertersSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/core/ConvertersSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/report/core/ConvertersSpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/report/core/ConvertersSpec.groovy diff --git a/test/src/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/report/core/SampleMetadataParserSpec.groovy diff --git a/test/src/org/apache/jmeter/report/processor/ApdexSummaryConsumerSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/processor/ApdexSummaryConsumerSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/report/processor/ApdexSummaryConsumerSpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/report/processor/ApdexSummaryConsumerSpec.groovy diff --git a/test/src/org/apache/jmeter/report/processor/FieldSampleComparatorSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/processor/FieldSampleComparatorSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/report/processor/FieldSampleComparatorSpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/report/processor/FieldSampleComparatorSpec.groovy diff --git a/test/src/org/apache/jmeter/report/processor/ListResultDataSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/processor/ListResultDataSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/report/processor/ListResultDataSpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/report/processor/ListResultDataSpec.groovy diff --git a/test/src/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerSpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumerSpec.groovy diff --git a/test/src/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/report/processor/Top5ErrorsSummaryDataSpec.groovy diff --git a/test/src/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerSpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumerSpec.groovy diff --git a/test/src/org/apache/jmeter/services/FileServerSpec.groovy b/src/core/src/test/groovy/org/apache/jmeter/services/FileServerSpec.groovy similarity index 98% rename from test/src/org/apache/jmeter/services/FileServerSpec.groovy rename to src/core/src/test/groovy/org/apache/jmeter/services/FileServerSpec.groovy index 2a9e1935f5f..69d020fee62 100644 --- a/test/src/org/apache/jmeter/services/FileServerSpec.groovy +++ b/src/core/src/test/groovy/org/apache/jmeter/services/FileServerSpec.groovy @@ -25,8 +25,8 @@ class FileServerSpec extends JMeterSpec { def sut = new FileServer() - def testFile = findTestPath("testfiles/unit/FileServerSpec.csv") - def emptyFile = findTestPath("testfiles/empty.csv") + def testFile = getResourceFilePath("testfiles/unit/FileServerSpec.csv") + def emptyFile = getResourceFilePath("testfiles/empty.csv") def setup() { diff --git a/test/src/org/apache/jmeter/JMeterTest.java b/src/core/src/test/java/org/apache/jmeter/JMeterTest.java similarity index 100% rename from test/src/org/apache/jmeter/JMeterTest.java rename to src/core/src/test/java/org/apache/jmeter/JMeterTest.java diff --git a/test/src/org/apache/jmeter/engine/DistributedRunnerTest.java b/src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java similarity index 100% rename from test/src/org/apache/jmeter/engine/DistributedRunnerTest.java rename to src/core/src/test/java/org/apache/jmeter/engine/DistributedRunnerTest.java diff --git a/test/src/org/apache/jmeter/engine/LocalHostTest.java b/src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java similarity index 100% rename from test/src/org/apache/jmeter/engine/LocalHostTest.java rename to src/core/src/test/java/org/apache/jmeter/engine/LocalHostTest.java diff --git a/test/src/org/apache/jmeter/engine/TestTreeCloner.java b/src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java similarity index 100% rename from test/src/org/apache/jmeter/engine/TestTreeCloner.java rename to src/core/src/test/java/org/apache/jmeter/engine/TestTreeCloner.java diff --git a/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java b/src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java similarity index 100% rename from test/src/org/apache/jmeter/engine/util/TestValueReplacer.java rename to src/core/src/test/java/org/apache/jmeter/engine/util/TestValueReplacer.java diff --git a/test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java b/src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java similarity index 100% rename from test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java rename to src/core/src/test/java/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java diff --git a/test/src/org/apache/jmeter/gui/util/JSyntaxTextAreaTest.java b/src/core/src/test/java/org/apache/jmeter/gui/util/JSyntaxTextAreaTest.java similarity index 100% rename from test/src/org/apache/jmeter/gui/util/JSyntaxTextAreaTest.java rename to src/core/src/test/java/org/apache/jmeter/gui/util/JSyntaxTextAreaTest.java diff --git a/test/src/org/apache/jmeter/gui/util/TristateCheckBoxTest.java b/src/core/src/test/java/org/apache/jmeter/gui/util/TristateCheckBoxTest.java similarity index 100% rename from test/src/org/apache/jmeter/gui/util/TristateCheckBoxTest.java rename to src/core/src/test/java/org/apache/jmeter/gui/util/TristateCheckBoxTest.java diff --git a/test/src/org/apache/jmeter/junit/JMeterTestCase.java b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCase.java similarity index 91% rename from test/src/org/apache/jmeter/junit/JMeterTestCase.java rename to src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCase.java index 81a182c8efb..a94e2d0593c 100644 --- a/test/src/org/apache/jmeter/junit/JMeterTestCase.java +++ b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCase.java @@ -82,7 +82,7 @@ public abstract class JMeterTestCase { logprop("os.arch"); logprop("java.class.path"); } else { - filePrefix = ""; + filePrefix = JMeterTestUtils.setupJMeterHome(); } } @@ -153,4 +153,15 @@ protected void checkInvalidParameterCounts(AbstractFunction func, int min, public static void assertPrimitiveEquals(boolean expected, boolean actual) { org.junit.Assert.assertEquals(Boolean.valueOf(expected), Boolean.valueOf(actual)); } + + /** + * Returns absolute path of a resource file. + * It allows to have test resources in {@code test/resources/org/apache...} folder + * and reference it as {@code getResourceFilePath("test1.txt")}. + * @param resource argument for klass.getResource. Relative (to current class) or absolute resource path + * @return absolute file path of a resource + */ + protected String getResourceFilePath(String resource) { + return JMeterTestUtils.getResourceFilePath(getClass(), resource); + } } diff --git a/test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit.java b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java similarity index 88% rename from test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit.java rename to src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java index fa5a8318120..aa330c130c6 100644 --- a/test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit.java +++ b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java @@ -88,7 +88,7 @@ public JMeterTestCaseJUnit(String name) { logprop("os.arch"); logprop("java.class.path"); } else { - filePrefix = ""; + filePrefix = JMeterTestUtils.setupJMeterHome(); } } @@ -119,4 +119,15 @@ protected void checkInvalidParameterCounts(AbstractFunction func, int minimum) } func.setParameters(parms); } + + /** + * Returns absolute path of a resource file. + * It allows to have test resources in {@code test/resources/org/apache...} folder + * and reference it as {@code getResourceFilePath("test1.txt")}. + * @param resource argument for klass.getResource. Relative (to current class) or absolute resource path + * @return absolute file path of a resource + */ + protected String getResourceFilePath(String resource) { + return JMeterTestUtils.getResourceFilePath(getClass(), resource); + } } diff --git a/test/src/org/apache/jmeter/junit/JMeterTestUtils.java b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java similarity index 50% rename from test/src/org/apache/jmeter/junit/JMeterTestUtils.java rename to src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java index cfd3e8ea3b6..9f0f7468d7a 100644 --- a/test/src/org/apache/jmeter/junit/JMeterTestUtils.java +++ b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java @@ -19,6 +19,10 @@ package org.apache.jmeter.junit; import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Paths; import org.apache.jmeter.util.JMeterUtils; @@ -35,24 +39,41 @@ private JMeterTestUtils() { public static String setupJMeterHome() { if (JMeterUtils.getJMeterProperties() == null) { String file = "jmeter.properties"; - File f = new File(file); - if (!f.canRead()) { - System.out.println("Can't find " + file + " - trying bin/ and ../bin"); - if (!new File("bin/" + file).canRead()) { - // When running tests inside IntelliJ - filePrefix = "../bin/"; // JMeterUtils assumes Unix-style separators - } else { - filePrefix = "bin/"; // JMeterUtils assumes Unix-style separators - } - file = filePrefix + file; - } else { - filePrefix = ""; + String prefix = "."; + for (int i = 0; i < 5 && !new File(prefix, "bin/jmeter.properties").canRead(); i++) { + prefix = "../" + prefix; } // Used to be done in initializeProperties - String home=new File(System.getProperty("user.dir"),filePrefix).getParent(); + String home = new File(prefix).getAbsolutePath(); + filePrefix = prefix + "/bin/"; System.out.println("Setting JMeterHome: "+home); JMeterUtils.setJMeterHome(home); } return filePrefix; } + + /** + * Returns absolute path of a resource file. + * It allows to have test resources in {@code test/resources/org/apache...} folder + * and reference it as {@code getResourceFilePath(MyTest.class, "test1.txt")}. + * @param klass class to resolve the resource + * @param resource argument for klass.getResource. Relative or absolute file path + * @return "" when input is "", input resource when resource is not found, or absolute file path of a resource + */ + public static String getResourceFilePath(Class klass, String resource) { + try { + if ("".equals(resource)) { + return resource; + } + URL url = klass.getResource(resource); + if (url == null) { + // Resource not found, assume the path is relative to the current dir + return resource; + } + URI uri = url.toURI(); + return Paths.get(uri).toAbsolutePath().toString(); + } catch (URISyntaxException e) { + throw new IllegalArgumentException("Unable to resolve resource " + resource, e); + } + } } diff --git a/test/src/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java b/src/core/src/test/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java similarity index 100% rename from test/src/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java rename to src/core/src/test/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java diff --git a/test/src/org/apache/jmeter/junit/categories/NeedGuiTests.java b/src/core/src/test/java/org/apache/jmeter/junit/categories/NeedGuiTests.java similarity index 100% rename from test/src/org/apache/jmeter/junit/categories/NeedGuiTests.java rename to src/core/src/test/java/org/apache/jmeter/junit/categories/NeedGuiTests.java diff --git a/test/src/org/apache/jmeter/junit/stubs/TestSampler.java b/src/core/src/test/java/org/apache/jmeter/junit/stubs/TestSampler.java similarity index 100% rename from test/src/org/apache/jmeter/junit/stubs/TestSampler.java rename to src/core/src/test/java/org/apache/jmeter/junit/stubs/TestSampler.java diff --git a/test/src/org/apache/jmeter/listeners/TestResultAction.java b/src/core/src/test/java/org/apache/jmeter/listeners/TestResultAction.java similarity index 100% rename from test/src/org/apache/jmeter/listeners/TestResultAction.java rename to src/core/src/test/java/org/apache/jmeter/listeners/TestResultAction.java diff --git a/test/src/org/apache/jmeter/report/core/CsvSampleReaderTest.java b/src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java similarity index 100% rename from test/src/org/apache/jmeter/report/core/CsvSampleReaderTest.java rename to src/core/src/test/java/org/apache/jmeter/report/core/CsvSampleReaderTest.java diff --git a/test/src/org/apache/jmeter/report/core/SampleMetadataTest.java b/src/core/src/test/java/org/apache/jmeter/report/core/SampleMetadataTest.java similarity index 100% rename from test/src/org/apache/jmeter/report/core/SampleMetadataTest.java rename to src/core/src/test/java/org/apache/jmeter/report/core/SampleMetadataTest.java diff --git a/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java b/src/core/src/test/java/org/apache/jmeter/report/core/TestCsvSampleWriter.java similarity index 100% rename from test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java rename to src/core/src/test/java/org/apache/jmeter/report/core/TestCsvSampleWriter.java diff --git a/test/src/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java b/src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java similarity index 100% rename from test/src/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java rename to src/core/src/test/java/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java diff --git a/test/src/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java similarity index 100% rename from test/src/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java rename to src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java diff --git a/test/src/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java b/src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java similarity index 100% rename from test/src/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java rename to src/core/src/test/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java diff --git a/test/src/org/apache/jmeter/resources/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java similarity index 100% rename from test/src/org/apache/jmeter/resources/PackageTest.java rename to src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java diff --git a/test/src/org/apache/jmeter/samplers/NullSampler.java b/src/core/src/test/java/org/apache/jmeter/samplers/NullSampler.java similarity index 100% rename from test/src/org/apache/jmeter/samplers/NullSampler.java rename to src/core/src/test/java/org/apache/jmeter/samplers/NullSampler.java diff --git a/test/src/org/apache/jmeter/samplers/TestSampleResult.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java similarity index 100% rename from test/src/org/apache/jmeter/samplers/TestSampleResult.java rename to src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java diff --git a/test/src/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java similarity index 100% rename from test/src/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java rename to src/core/src/test/java/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java diff --git a/test/src/org/apache/jmeter/save/TestCSVSaveService.java b/src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java similarity index 100% rename from test/src/org/apache/jmeter/save/TestCSVSaveService.java rename to src/core/src/test/java/org/apache/jmeter/save/TestCSVSaveService.java diff --git a/test/src/org/apache/jmeter/test/ResourceLocator.java b/src/core/src/test/java/org/apache/jmeter/test/ResourceLocator.java similarity index 100% rename from test/src/org/apache/jmeter/test/ResourceLocator.java rename to src/core/src/test/java/org/apache/jmeter/test/ResourceLocator.java diff --git a/test/src/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java similarity index 100% rename from test/src/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java rename to src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestBooleanPropertyEditor.java diff --git a/test/src/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java similarity index 100% rename from test/src/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java rename to src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestComboStringEditor.java diff --git a/test/src/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java b/src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java similarity index 100% rename from test/src/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java rename to src/core/src/test/java/org/apache/jmeter/testbeans/gui/TestFieldStringEditor.java diff --git a/test/src/org/apache/jmeter/testelement/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/PackageTest.java similarity index 100% rename from test/src/org/apache/jmeter/testelement/PackageTest.java rename to src/core/src/test/java/org/apache/jmeter/testelement/PackageTest.java diff --git a/test/src/org/apache/jmeter/testelement/TestNumberProperty.java b/src/core/src/test/java/org/apache/jmeter/testelement/TestNumberProperty.java similarity index 100% rename from test/src/org/apache/jmeter/testelement/TestNumberProperty.java rename to src/core/src/test/java/org/apache/jmeter/testelement/TestNumberProperty.java diff --git a/test/src/org/apache/jmeter/testelement/property/AbstractPropertyTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java similarity index 100% rename from test/src/org/apache/jmeter/testelement/property/AbstractPropertyTest.java rename to src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java diff --git a/test/src/org/apache/jmeter/testelement/property/MapPropertyTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java similarity index 100% rename from test/src/org/apache/jmeter/testelement/property/MapPropertyTest.java rename to src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java diff --git a/test/src/org/apache/jmeter/testelement/property/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/PackageTest.java similarity index 100% rename from test/src/org/apache/jmeter/testelement/property/PackageTest.java rename to src/core/src/test/java/org/apache/jmeter/testelement/property/PackageTest.java diff --git a/test/src/org/apache/jmeter/threads/JMeterContextServiceHelper.java b/src/core/src/test/java/org/apache/jmeter/threads/JMeterContextServiceHelper.java similarity index 100% rename from test/src/org/apache/jmeter/threads/JMeterContextServiceHelper.java rename to src/core/src/test/java/org/apache/jmeter/threads/JMeterContextServiceHelper.java diff --git a/test/src/org/apache/jmeter/threads/TestJMeterContextService.java b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterContextService.java similarity index 100% rename from test/src/org/apache/jmeter/threads/TestJMeterContextService.java rename to src/core/src/test/java/org/apache/jmeter/threads/TestJMeterContextService.java diff --git a/test/src/org/apache/jmeter/threads/TestJMeterThread.java b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java similarity index 89% rename from test/src/org/apache/jmeter/threads/TestJMeterThread.java rename to src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java index 960f850e420..2e98c92c674 100644 --- a/test/src/org/apache/jmeter/threads/TestJMeterThread.java +++ b/src/core/src/test/java/org/apache/jmeter/threads/TestJMeterThread.java @@ -27,8 +27,9 @@ import org.apache.jmeter.samplers.AbstractSampler; import org.apache.jmeter.samplers.Entry; import org.apache.jmeter.samplers.SampleResult; +import org.apache.jmeter.testelement.AbstractTestElement; import org.apache.jmeter.testelement.ThreadListener; -import org.apache.jmeter.timers.ConstantTimer; +import org.apache.jmeter.timers.Timer; import org.apache.jorphan.collections.HashTree; import org.junit.Test; @@ -76,6 +77,19 @@ public boolean equals(Object obj) { } + private static class DummyTimer extends AbstractTestElement implements Timer { + private long delay; + + void setDelay(long delay) { + this.delay = delay; + } + + @Override + public long delay() { + return delay; + } + } + private static class ThrowingThreadListener implements ThreadListener { private boolean throwError; @@ -129,7 +143,7 @@ public void testBug63490EndTestWhenDelayIsTooLongForScheduler() { HashTree testTree = new HashTree(); LoopController samplerController = createLoopController(); testTree.add(samplerController); - testTree.add(samplerController, createConstantTimer("3000")); + testTree.add(samplerController, createConstantTimer(3000)); DummySampler dummySampler = createSampler(); testTree.add(samplerController, dummySampler); @@ -169,11 +183,11 @@ private DummySampler createSampler() { return result; } - private ConstantTimer createConstantTimer(String delay) { - ConstantTimer constantTimer = new ConstantTimer(); - constantTimer.setEnabled(true); - constantTimer.setDelay(delay); - constantTimer.setName("Long delay"); - return constantTimer; + private Timer createConstantTimer(long delay) { + DummyTimer timer = new DummyTimer(); + timer.setEnabled(true); + timer.setDelay(delay); + timer.setName("Long delay"); + return timer; } } diff --git a/test/src/org/apache/jmeter/threads/TestTestCompiler.java b/src/core/src/test/java/org/apache/jmeter/threads/TestTestCompiler.java similarity index 100% rename from test/src/org/apache/jmeter/threads/TestTestCompiler.java rename to src/core/src/test/java/org/apache/jmeter/threads/TestTestCompiler.java diff --git a/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java b/src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java similarity index 100% rename from test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java rename to src/core/src/test/java/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java diff --git a/test/src/org/apache/jmeter/util/JSR223TestElementTest.java b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java similarity index 100% rename from test/src/org/apache/jmeter/util/JSR223TestElementTest.java rename to src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java diff --git a/test/src/org/apache/jmeter/util/LogRecord.java b/src/core/src/test/java/org/apache/jmeter/util/LogRecord.java similarity index 100% rename from test/src/org/apache/jmeter/util/LogRecord.java rename to src/core/src/test/java/org/apache/jmeter/util/LogRecord.java diff --git a/test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java b/src/core/src/test/java/org/apache/jmeter/util/LogRecordingDelegatingLogger.java similarity index 100% rename from test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java rename to src/core/src/test/java/org/apache/jmeter/util/LogRecordingDelegatingLogger.java diff --git a/test/src/org/apache/jmeter/util/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/util/PackageTest.java similarity index 100% rename from test/src/org/apache/jmeter/util/PackageTest.java rename to src/core/src/test/java/org/apache/jmeter/util/PackageTest.java diff --git a/test/src/org/apache/jmeter/util/StringUtilitiesTest.java b/src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java similarity index 100% rename from test/src/org/apache/jmeter/util/StringUtilitiesTest.java rename to src/core/src/test/java/org/apache/jmeter/util/StringUtilitiesTest.java diff --git a/test/src/org/apache/jmeter/util/TestJMeterUtils.java b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java similarity index 100% rename from test/src/org/apache/jmeter/util/TestJMeterUtils.java rename to src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java diff --git a/test/src/org/apache/jmeter/util/XPathUtilTest.java b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java similarity index 93% rename from test/src/org/apache/jmeter/util/XPathUtilTest.java rename to src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java index f5cbd36f4f7..1c279e6f747 100644 --- a/test/src/org/apache/jmeter/util/XPathUtilTest.java +++ b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java @@ -38,11 +38,9 @@ import javax.xml.transform.stream.StreamSource; import org.apache.jmeter.assertions.AssertionResult; -import org.apache.jmeter.assertions.gui.XPath2Panel; import org.hamcrest.CoreMatchers; import org.junit.Test; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.xml.sax.SAXException; import net.sf.saxon.s9api.Processor; @@ -175,20 +173,6 @@ public void testFormatXmlInvalid() { System.setErr(origErr); } - @Test() - public void testValidateXPath2() throws ParserConfigurationException { - Document testDoc = XPathUtil.makeDocumentBuilder(false, false, false, false).newDocument(); - Element el = testDoc.createElement("root"); //$NON-NLS-1$ - testDoc.appendChild(el); - String namespaces = "a=http://www.w3.org/2003/01/geo/wgs84_pos# b=http://www.w3.org/2003/01/geo/wgs85_pos#"; - String xPathQuery = "//Employees/b:Employee[1]/a:ag"; - assertTrue("When the user give namspaces, the result of validation should be true", - XPath2Panel.validXPath(xPathQuery, false, namespaces)); - namespaces = "a=http://www.w3.org/2003/01/geo/wgs84_pos#"; - assertFalse("When the user doesn't give namspaces, the result of validation should be false", - XPath2Panel.validXPath(xPathQuery, false, namespaces)); - } - @Test() public void testMakeDocument() throws ParserConfigurationException, SAXException, IOException, TidyException { String responseData = "onetwo"; diff --git a/test/src/org/apache/jorphan/TestXMLBuffer.java b/src/core/src/test/java/org/apache/jorphan/TestXMLBuffer.java similarity index 100% rename from test/src/org/apache/jorphan/TestXMLBuffer.java rename to src/core/src/test/java/org/apache/jorphan/TestXMLBuffer.java diff --git a/test/src/org/apache/jorphan/reflect/TestFunctor.java b/src/core/src/test/java/org/apache/jorphan/reflect/TestFunctor.java similarity index 100% rename from test/src/org/apache/jorphan/reflect/TestFunctor.java rename to src/core/src/test/java/org/apache/jorphan/reflect/TestFunctor.java diff --git a/test/src/org/apache/jorphan/test/AllTests.java b/src/core/src/test/java/org/apache/jorphan/test/AllTests.java similarity index 100% rename from test/src/org/apache/jorphan/test/AllTests.java rename to src/core/src/test/java/org/apache/jorphan/test/AllTests.java diff --git a/test/src/org/apache/jorphan/test/JMeterSerialTest.java b/src/core/src/test/java/org/apache/jorphan/test/JMeterSerialTest.java similarity index 100% rename from test/src/org/apache/jorphan/test/JMeterSerialTest.java rename to src/core/src/test/java/org/apache/jorphan/test/JMeterSerialTest.java diff --git a/test/resources/XPathUtilTestXml.xml b/src/core/src/test/resources/XPathUtilTestXml.xml similarity index 100% rename from test/resources/XPathUtilTestXml.xml rename to src/core/src/test/resources/XPathUtilTestXml.xml diff --git a/test/resources/log4j2.xml b/src/core/src/test/resources/log4j2.xml similarity index 100% rename from test/resources/log4j2.xml rename to src/core/src/test/resources/log4j2.xml diff --git a/test/resources/org/apache/jmeter/report/dashboard/reportgenerator_test.properties b/src/core/src/test/resources/org/apache/jmeter/report/dashboard/reportgenerator_test.properties similarity index 100% rename from test/resources/org/apache/jmeter/report/dashboard/reportgenerator_test.properties rename to src/core/src/test/resources/org/apache/jmeter/report/dashboard/reportgenerator_test.properties diff --git a/bin/testfiles/empty.csv b/src/core/src/test/resources/org/apache/jmeter/services/testfiles/empty.csv similarity index 100% rename from bin/testfiles/empty.csv rename to src/core/src/test/resources/org/apache/jmeter/services/testfiles/empty.csv diff --git a/bin/testfiles/unit/FileServerSpec.csv b/src/core/src/test/resources/org/apache/jmeter/services/testfiles/unit/FileServerSpec.csv similarity index 100% rename from bin/testfiles/unit/FileServerSpec.csv rename to src/core/src/test/resources/org/apache/jmeter/services/testfiles/unit/FileServerSpec.csv diff --git a/test/resources/resourcefile.txt b/src/core/src/test/resources/resourcefile.txt similarity index 100% rename from test/resources/resourcefile.txt rename to src/core/src/test/resources/resourcefile.txt diff --git a/test/src/org/apache/jmeter/engine/util/PackageSpec.groovy b/src/dist-check/src/test/groovy/org/apache/jmeter/engine/util/PackageSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/engine/util/PackageSpec.groovy rename to src/dist-check/src/test/groovy/org/apache/jmeter/engine/util/PackageSpec.groovy diff --git a/test/src/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy b/src/dist-check/src/test/groovy/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy rename to src/dist-check/src/test/groovy/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy diff --git a/test/src/org/apache/jmeter/gui/util/MenuFactorySpec.groovy b/src/dist-check/src/test/groovy/org/apache/jmeter/gui/util/MenuFactorySpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/gui/util/MenuFactorySpec.groovy rename to src/dist-check/src/test/groovy/org/apache/jmeter/gui/util/MenuFactorySpec.groovy diff --git a/test/src/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy b/src/dist-check/src/test/groovy/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy rename to src/dist-check/src/test/groovy/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy diff --git a/test/src/org/apache/jmeter/control/TestSwitchController.java b/src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java similarity index 100% rename from test/src/org/apache/jmeter/control/TestSwitchController.java rename to src/dist-check/src/test/java/org/apache/jmeter/control/TestSwitchController.java diff --git a/test/src/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java similarity index 98% rename from test/src/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java rename to src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java index d410d70301c..bd0df2d6f05 100644 --- a/test/src/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java +++ b/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java @@ -96,7 +96,7 @@ private Element getBodyFromXMLDocument(InputStream stream) public void createFunctionSet() throws Exception { funcTitles = new HashMap<>(20); String compref = "../xdocs/usermanual/functions.xml"; - try (InputStream stream = new FileInputStream(compref)) { + try (InputStream stream = new FileInputStream(findTestFile(compref))) { Element body = getBodyFromXMLDocument(stream); Element section = (Element) body.getElementsByTagName("section").item(0); NodeList subSections = section.getElementsByTagName("subsection"); diff --git a/test/src/org/apache/jmeter/gui/action/TestLoad.java b/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java similarity index 95% rename from test/src/org/apache/jmeter/gui/action/TestLoad.java rename to src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java index 88c4714f019..662a5865e39 100644 --- a/test/src/org/apache/jmeter/gui/action/TestLoad.java +++ b/src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java @@ -35,7 +35,7 @@ */ public class TestLoad extends JMeterTestCaseJUnit { - private static final String basedir = new File(System.getProperty("user.dir")).getParent(); + private static final String basedir = new File(System.getProperty("user.dir")).getParentFile().getParent(); private static final File testfiledir = new File(basedir,"bin/testfiles"); private static final File demofiledir = new File(basedir,"xdocs/demos"); @@ -79,6 +79,9 @@ public static TestSuite suite(){ private static void scanFiles(TestSuite suite, File parent) { String dir = parent.getName(); File[] testFiles = parent.listFiles(jmxFilter); + if (testFiles == null) { + fail("*.jmx files for test should be present in folder " + parent); + } for (File file : testFiles) { suite.addTest(new TestLoad("checkTestFile", file, dir)); } diff --git a/test/src/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java similarity index 98% rename from test/src/org/apache/jmeter/junit/JMeterTest.java rename to src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java index ab6cb54fe11..9c147267621 100644 --- a/test/src/org/apache/jmeter/junit/JMeterTest.java +++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java @@ -451,6 +451,10 @@ public static Collection getObjects(Class extendsClass) throws Except if (n.endsWith("RemoteJMeterEngineImpl")) { continue; // Don't try to instantiate remote server } + if (n.endsWith("RemoteSampleListenerImpl")) { + // TODO: Cannot start. travis-job-e984b3d5-f93f-4b0f-b6c0-50988a5ece9d is a loopback address. + continue; + } caught = instantiateClass(exName, myThis, objects, n, caught); } caughtError = false; diff --git a/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java b/src/dist-check/src/test/java/org/apache/jmeter/resources/TestPropertiesFiles.java similarity index 100% rename from test/src/org/apache/jmeter/resources/TestPropertiesFiles.java rename to src/dist-check/src/test/java/org/apache/jmeter/resources/TestPropertiesFiles.java diff --git a/test/src/org/apache/jmeter/save/TestSaveService.java b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java similarity index 98% rename from test/src/org/apache/jmeter/save/TestSaveService.java rename to src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java index 44699e63dd7..a3475954555 100644 --- a/test/src/org/apache/jmeter/save/TestSaveService.java +++ b/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java @@ -207,7 +207,8 @@ public void testLoad() throws Exception { HashTree tree = SaveService.loadTree(file); assertNotNull(tree); } catch (IllegalArgumentException ex) { - fail("Exception loading " + file.getAbsolutePath()); + ex.addSuppressed(new Throwable("fileName=" + file.getAbsolutePath())); + throw ex; } } } diff --git a/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java b/src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java similarity index 100% rename from test/src/org/apache/jmeter/testbeans/gui/PackageTest.java rename to src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java diff --git a/test/src/org/apache/jmeter/testelement/TestElementTest.java b/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java similarity index 100% rename from test/src/org/apache/jmeter/testelement/TestElementTest.java rename to src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java diff --git a/test/src/org/apache/jorphan/TestFunctorUsers.java b/src/dist-check/src/test/java/org/apache/jorphan/TestFunctorUsers.java similarity index 100% rename from test/src/org/apache/jorphan/TestFunctorUsers.java rename to src/dist-check/src/test/java/org/apache/jorphan/TestFunctorUsers.java diff --git a/test/src/org/apache/jorphan/reflect/TestClassFinder.java b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java similarity index 89% rename from test/src/org/apache/jorphan/reflect/TestClassFinder.java rename to src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java index 69da5881013..552e9c8ed90 100644 --- a/test/src/org/apache/jorphan/reflect/TestClassFinder.java +++ b/src/dist-check/src/test/java/org/apache/jorphan/reflect/TestClassFinder.java @@ -19,8 +19,6 @@ package org.apache.jorphan.reflect; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.stream.Collectors; @@ -111,19 +109,6 @@ public void testFindAnnotatedClasses() throws Exception { Assert.assertFalse(annotatedClasses.isEmpty()); } - @Test - public void testFindAllClassesInJar() throws Exception { - List jarsPaths = Files.find(Paths.get(libDirs[0]), 1, (p, a) -> String.valueOf(p).endsWith(".jar")) - .collect(Collectors.toList()); - for (Path jarPath : jarsPaths) { - if (!ClassFinder.findClasses(new String[] { jarPath.toRealPath().toString() }, c -> true).isEmpty()) { - // ok, we found an annotated class - return; - } - } - Assert.fail("No classes found in: " + jarsPaths); - } - @Test public void testFindAnnotatedInnerClasses() throws Exception { @SuppressWarnings("unchecked") diff --git a/test/resources/org/apache/jmeter/gui/report/HTMLReportExpect.json b/src/dist-check/src/test/resources/org/apache/jmeter/gui/report/HTMLReportExpect.json similarity index 100% rename from test/resources/org/apache/jmeter/gui/report/HTMLReportExpect.json rename to src/dist-check/src/test/resources/org/apache/jmeter/gui/report/HTMLReportExpect.json diff --git a/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java b/src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java similarity index 100% rename from src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java rename to src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java diff --git a/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java b/src/examples/src/main/java/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java similarity index 100% rename from src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java rename to src/examples/src/main/java/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java b/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example1/Example1.java similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java rename to src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example1/Example1.java diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java b/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example2/Example2.java similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java rename to src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example2/Example2.java diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2BeanInfo.java b/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example2/Example2BeanInfo.java similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example2/Example2BeanInfo.java rename to src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example2/Example2BeanInfo.java diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3.java b/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3.java similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example3/Example3.java rename to src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3.java diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java b/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java rename to src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources.properties b/src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources.properties similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources.properties rename to src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources.properties diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_es.properties b/src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources_es.properties similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_es.properties rename to src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources_es.properties diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_pt_BR.properties b/src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources_pt_BR.properties similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_pt_BR.properties rename to src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources_pt_BR.properties diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_tr.properties b/src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources_tr.properties similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_tr.properties rename to src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources_tr.properties diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_zh_TW.properties b/src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources_zh_TW.properties similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_zh_TW.properties rename to src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example2/Example2Resources_zh_TW.properties diff --git a/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3Resources.properties b/src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example3/Example3Resources.properties similarity index 100% rename from src/examples/org/apache/jmeter/examples/testbeans/example3/Example3Resources.properties rename to src/examples/src/main/resources/org/apache/jmeter/examples/testbeans/example3/Example3Resources.properties diff --git a/src/functions/org/apache/jmeter/functions/AbstractFunctionByKey.java b/src/functions/src/main/java/org/apache/jmeter/functions/AbstractFunctionByKey.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/AbstractFunctionByKey.java rename to src/functions/src/main/java/org/apache/jmeter/functions/AbstractFunctionByKey.java diff --git a/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java b/src/functions/src/main/java/org/apache/jmeter/functions/AbstractHostIPName.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/AbstractHostIPName.java rename to src/functions/src/main/java/org/apache/jmeter/functions/AbstractHostIPName.java diff --git a/src/functions/org/apache/jmeter/functions/BeanShell.java b/src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/BeanShell.java rename to src/functions/src/main/java/org/apache/jmeter/functions/BeanShell.java diff --git a/src/functions/org/apache/jmeter/functions/CSVRead.java b/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/CSVRead.java rename to src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java diff --git a/src/functions/org/apache/jmeter/functions/ChangeCase.java b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/ChangeCase.java rename to src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java diff --git a/src/functions/org/apache/jmeter/functions/CharFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/CharFunction.java rename to src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java diff --git a/src/functions/org/apache/jmeter/functions/DateTimeConvertFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/DateTimeConvertFunction.java rename to src/functions/src/main/java/org/apache/jmeter/functions/DateTimeConvertFunction.java diff --git a/src/functions/org/apache/jmeter/functions/DigestEncodeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/DigestEncodeFunction.java rename to src/functions/src/main/java/org/apache/jmeter/functions/DigestEncodeFunction.java diff --git a/src/functions/org/apache/jmeter/functions/EscapeHtml.java b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/EscapeHtml.java rename to src/functions/src/main/java/org/apache/jmeter/functions/EscapeHtml.java diff --git a/src/functions/org/apache/jmeter/functions/EscapeOroRegexpChars.java b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/EscapeOroRegexpChars.java rename to src/functions/src/main/java/org/apache/jmeter/functions/EscapeOroRegexpChars.java diff --git a/src/functions/org/apache/jmeter/functions/EscapeXml.java b/src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/EscapeXml.java rename to src/functions/src/main/java/org/apache/jmeter/functions/EscapeXml.java diff --git a/src/functions/org/apache/jmeter/functions/EvalFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/EvalFunction.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/EvalFunction.java rename to src/functions/src/main/java/org/apache/jmeter/functions/EvalFunction.java diff --git a/src/functions/org/apache/jmeter/functions/EvalVarFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/EvalVarFunction.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/EvalVarFunction.java rename to src/functions/src/main/java/org/apache/jmeter/functions/EvalVarFunction.java diff --git a/src/functions/org/apache/jmeter/functions/FileRowColContainer.java b/src/functions/src/main/java/org/apache/jmeter/functions/FileRowColContainer.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/FileRowColContainer.java rename to src/functions/src/main/java/org/apache/jmeter/functions/FileRowColContainer.java diff --git a/src/functions/org/apache/jmeter/functions/FileToString.java b/src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/FileToString.java rename to src/functions/src/main/java/org/apache/jmeter/functions/FileToString.java diff --git a/src/functions/org/apache/jmeter/functions/FileWrapper.java b/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/FileWrapper.java rename to src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java diff --git a/src/functions/org/apache/jmeter/functions/Groovy.java b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/Groovy.java rename to src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java diff --git a/src/functions/org/apache/jmeter/functions/IntSum.java b/src/functions/src/main/java/org/apache/jmeter/functions/IntSum.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/IntSum.java rename to src/functions/src/main/java/org/apache/jmeter/functions/IntSum.java diff --git a/src/functions/org/apache/jmeter/functions/IsPropDefined.java b/src/functions/src/main/java/org/apache/jmeter/functions/IsPropDefined.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/IsPropDefined.java rename to src/functions/src/main/java/org/apache/jmeter/functions/IsPropDefined.java diff --git a/src/functions/org/apache/jmeter/functions/IsVarDefined.java b/src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/IsVarDefined.java rename to src/functions/src/main/java/org/apache/jmeter/functions/IsVarDefined.java diff --git a/src/functions/org/apache/jmeter/functions/IterationCounter.java b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/IterationCounter.java rename to src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java diff --git a/src/functions/org/apache/jmeter/functions/JavaScript.java b/src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/JavaScript.java rename to src/functions/src/main/java/org/apache/jmeter/functions/JavaScript.java diff --git a/src/functions/org/apache/jmeter/functions/Jexl2Function.java b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/Jexl2Function.java rename to src/functions/src/main/java/org/apache/jmeter/functions/Jexl2Function.java diff --git a/src/functions/org/apache/jmeter/functions/Jexl3Function.java b/src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/Jexl3Function.java rename to src/functions/src/main/java/org/apache/jmeter/functions/Jexl3Function.java diff --git a/src/functions/org/apache/jmeter/functions/LogFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/LogFunction.java rename to src/functions/src/main/java/org/apache/jmeter/functions/LogFunction.java diff --git a/src/functions/org/apache/jmeter/functions/LogFunction2.java b/src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/LogFunction2.java rename to src/functions/src/main/java/org/apache/jmeter/functions/LogFunction2.java diff --git a/src/functions/org/apache/jmeter/functions/LongSum.java b/src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/LongSum.java rename to src/functions/src/main/java/org/apache/jmeter/functions/LongSum.java diff --git a/src/functions/org/apache/jmeter/functions/MachineIP.java b/src/functions/src/main/java/org/apache/jmeter/functions/MachineIP.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/MachineIP.java rename to src/functions/src/main/java/org/apache/jmeter/functions/MachineIP.java diff --git a/src/functions/org/apache/jmeter/functions/MachineName.java b/src/functions/src/main/java/org/apache/jmeter/functions/MachineName.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/MachineName.java rename to src/functions/src/main/java/org/apache/jmeter/functions/MachineName.java diff --git a/src/functions/org/apache/jmeter/functions/Property.java b/src/functions/src/main/java/org/apache/jmeter/functions/Property.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/Property.java rename to src/functions/src/main/java/org/apache/jmeter/functions/Property.java diff --git a/src/functions/org/apache/jmeter/functions/Property2.java b/src/functions/src/main/java/org/apache/jmeter/functions/Property2.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/Property2.java rename to src/functions/src/main/java/org/apache/jmeter/functions/Property2.java diff --git a/src/functions/org/apache/jmeter/functions/Random.java b/src/functions/src/main/java/org/apache/jmeter/functions/Random.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/Random.java rename to src/functions/src/main/java/org/apache/jmeter/functions/Random.java diff --git a/src/functions/org/apache/jmeter/functions/RandomDate.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/RandomDate.java rename to src/functions/src/main/java/org/apache/jmeter/functions/RandomDate.java diff --git a/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java rename to src/functions/src/main/java/org/apache/jmeter/functions/RandomFromMultipleVars.java diff --git a/src/functions/org/apache/jmeter/functions/RandomString.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/RandomString.java rename to src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java diff --git a/src/functions/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/RegexFunction.java rename to src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java diff --git a/src/functions/org/apache/jmeter/functions/SamplerName.java b/src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/SamplerName.java rename to src/functions/src/main/java/org/apache/jmeter/functions/SamplerName.java diff --git a/src/functions/org/apache/jmeter/functions/SetProperty.java b/src/functions/src/main/java/org/apache/jmeter/functions/SetProperty.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/SetProperty.java rename to src/functions/src/main/java/org/apache/jmeter/functions/SetProperty.java diff --git a/src/functions/org/apache/jmeter/functions/SplitFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/SplitFunction.java rename to src/functions/src/main/java/org/apache/jmeter/functions/SplitFunction.java diff --git a/src/functions/org/apache/jmeter/functions/StringFromFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/StringFromFile.java rename to src/functions/src/main/java/org/apache/jmeter/functions/StringFromFile.java diff --git a/src/functions/org/apache/jmeter/functions/StringToFile.java b/src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/StringToFile.java rename to src/functions/src/main/java/org/apache/jmeter/functions/StringToFile.java diff --git a/src/functions/org/apache/jmeter/functions/TestPlanName.java b/src/functions/src/main/java/org/apache/jmeter/functions/TestPlanName.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/TestPlanName.java rename to src/functions/src/main/java/org/apache/jmeter/functions/TestPlanName.java diff --git a/src/functions/org/apache/jmeter/functions/ThreadGroupName.java b/src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/ThreadGroupName.java rename to src/functions/src/main/java/org/apache/jmeter/functions/ThreadGroupName.java diff --git a/src/functions/org/apache/jmeter/functions/ThreadNumber.java b/src/functions/src/main/java/org/apache/jmeter/functions/ThreadNumber.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/ThreadNumber.java rename to src/functions/src/main/java/org/apache/jmeter/functions/ThreadNumber.java diff --git a/src/functions/org/apache/jmeter/functions/TimeFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/TimeFunction.java rename to src/functions/src/main/java/org/apache/jmeter/functions/TimeFunction.java diff --git a/src/functions/org/apache/jmeter/functions/TimeShift.java b/src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/TimeShift.java rename to src/functions/src/main/java/org/apache/jmeter/functions/TimeShift.java diff --git a/src/functions/org/apache/jmeter/functions/UnEscape.java b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/UnEscape.java rename to src/functions/src/main/java/org/apache/jmeter/functions/UnEscape.java diff --git a/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java b/src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/UnEscapeHtml.java rename to src/functions/src/main/java/org/apache/jmeter/functions/UnEscapeHtml.java diff --git a/src/functions/org/apache/jmeter/functions/UrlDecode.java b/src/functions/src/main/java/org/apache/jmeter/functions/UrlDecode.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/UrlDecode.java rename to src/functions/src/main/java/org/apache/jmeter/functions/UrlDecode.java diff --git a/src/functions/org/apache/jmeter/functions/UrlEncode.java b/src/functions/src/main/java/org/apache/jmeter/functions/UrlEncode.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/UrlEncode.java rename to src/functions/src/main/java/org/apache/jmeter/functions/UrlEncode.java diff --git a/src/functions/org/apache/jmeter/functions/Uuid.java b/src/functions/src/main/java/org/apache/jmeter/functions/Uuid.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/Uuid.java rename to src/functions/src/main/java/org/apache/jmeter/functions/Uuid.java diff --git a/src/functions/org/apache/jmeter/functions/Variable.java b/src/functions/src/main/java/org/apache/jmeter/functions/Variable.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/Variable.java rename to src/functions/src/main/java/org/apache/jmeter/functions/Variable.java diff --git a/src/functions/org/apache/jmeter/functions/XPath.java b/src/functions/src/main/java/org/apache/jmeter/functions/XPath.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/XPath.java rename to src/functions/src/main/java/org/apache/jmeter/functions/XPath.java diff --git a/src/functions/org/apache/jmeter/functions/XPathFileContainer.java b/src/functions/src/main/java/org/apache/jmeter/functions/XPathFileContainer.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/XPathFileContainer.java rename to src/functions/src/main/java/org/apache/jmeter/functions/XPathFileContainer.java diff --git a/src/functions/org/apache/jmeter/functions/XPathWrapper.java b/src/functions/src/main/java/org/apache/jmeter/functions/XPathWrapper.java similarity index 100% rename from src/functions/org/apache/jmeter/functions/XPathWrapper.java rename to src/functions/src/main/java/org/apache/jmeter/functions/XPathWrapper.java diff --git a/src/functions/org/apache/jmeter/functions/package.html b/src/functions/src/main/resources/org/apache/jmeter/functions/package.html similarity index 100% rename from src/functions/org/apache/jmeter/functions/package.html rename to src/functions/src/main/resources/org/apache/jmeter/functions/package.html diff --git a/test/src/org/apache/jmeter/functions/ChangeCaseSpec.groovy b/src/functions/src/test/groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/functions/ChangeCaseSpec.groovy rename to src/functions/src/test/groovy/org/apache/jmeter/functions/ChangeCaseSpec.groovy diff --git a/test/src/org/apache/jmeter/functions/gui/FunctionHelperSpec.groovy b/src/functions/src/test/groovy/org/apache/jmeter/functions/gui/FunctionHelperSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/functions/gui/FunctionHelperSpec.groovy rename to src/functions/src/test/groovy/org/apache/jmeter/functions/gui/FunctionHelperSpec.groovy diff --git a/test/src/org/apache/jmeter/functions/CSVReadFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/CSVReadFunctionTest.java similarity index 97% rename from test/src/org/apache/jmeter/functions/CSVReadFunctionTest.java rename to src/functions/src/test/java/org/apache/jmeter/functions/CSVReadFunctionTest.java index 633690a045a..1929ef58709 100644 --- a/test/src/org/apache/jmeter/functions/CSVReadFunctionTest.java +++ b/src/functions/src/test/java/org/apache/jmeter/functions/CSVReadFunctionTest.java @@ -36,11 +36,11 @@ public class CSVReadFunctionTest extends JMeterTestCase implements JMeterSerialT private static final Logger log = LoggerFactory.getLogger(CSVReadFunctionTest.class); // Create the CSVRead function and set its parameters. - private static CSVRead setCSVReadParams(String p1, String p2) throws Exception { + private CSVRead setCSVReadParams(String p1, String p2) throws Exception { CSVRead cr = new CSVRead(); Collection parms = new LinkedList<>(); if (p1 != null) { - parms.add(new CompoundVariable(p1)); + parms.add(new CompoundVariable(getResourceFilePath(p1))); } if (p2 != null) { parms.add(new CompoundVariable(p2)); diff --git a/test/src/org/apache/jmeter/functions/EvalFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/EvalFunctionTest.java similarity index 100% rename from test/src/org/apache/jmeter/functions/EvalFunctionTest.java rename to src/functions/src/test/java/org/apache/jmeter/functions/EvalFunctionTest.java diff --git a/test/src/org/apache/jmeter/functions/FunctionTestHelper.java b/src/functions/src/test/java/org/apache/jmeter/functions/FunctionTestHelper.java similarity index 100% rename from test/src/org/apache/jmeter/functions/FunctionTestHelper.java rename to src/functions/src/test/java/org/apache/jmeter/functions/FunctionTestHelper.java diff --git a/test/src/org/apache/jmeter/functions/PackageTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java similarity index 95% rename from test/src/org/apache/jmeter/functions/PackageTest.java rename to src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java index 42199318908..14702692c52 100644 --- a/test/src/org/apache/jmeter/functions/PackageTest.java +++ b/src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java @@ -50,11 +50,11 @@ public PackageTest(String arg0) { } // Create the CSVRead function and set its parameters. - private static CSVRead setCSVReadParams(String p1, String p2) throws Exception { + private CSVRead setCSVReadParams(String p1, String p2) throws Exception { CSVRead cr = new CSVRead(); Collection parms = new LinkedList<>(); if (p1 != null) { - parms.add(new CompoundVariable(p1)); + parms.add(new CompoundVariable(getResourceFilePath(p1))); } if (p2 != null) { parms.add(new CompoundVariable(p2)); @@ -298,7 +298,7 @@ public void XPathtestNull() throws Exception { } public void XPathtestrowNum() throws Exception { - XPathFileContainer f = new XPathFileContainer("../build.xml", "/project/target/@name"); + XPathFileContainer f = new XPathFileContainer(getResourceFilePath("xpathfilecontainer.xml"), "/project/target/@name"); assertNotNull(f); int myRow = f.nextRow(); @@ -315,7 +315,7 @@ public void XPathtestrowNum() throws Exception { } public void XPathtestColumns() throws Exception { - XPathFileContainer f = new XPathFileContainer("../build.xml", "/project/target/@name"); + XPathFileContainer f = new XPathFileContainer(getResourceFilePath("xpathfilecontainer.xml"), "/project/target/@name"); assertNotNull(f); assertTrue("Not empty", f.size() > 0); int last = 0; @@ -328,7 +328,7 @@ public void XPathtestColumns() throws Exception { } public void XPathtestDefault() throws Exception { - XPathFileContainer f = new XPathFileContainer("../build.xml", "/project/@default"); + XPathFileContainer f = new XPathFileContainer(getResourceFilePath("xpathfilecontainer.xml"), "/project/@default"); assertNotNull(f); assertTrue("Not empty", f.size() > 0); assertEquals("install", f.getXPathString(0)); @@ -430,7 +430,7 @@ public void XPathThread2() throws Exception { private XPath setupXPath(String file, String expr) throws Exception{ Collection parms = new LinkedList<>(); - parms.add(new CompoundVariable(file)); + parms.add(new CompoundVariable(getResourceFilePath(file))); parms.add(new CompoundVariable(expr)); XPath xp = new XPath(); xp.setParameters(parms); diff --git a/test/src/org/apache/jmeter/functions/RandomFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java similarity index 100% rename from test/src/org/apache/jmeter/functions/RandomFunctionTest.java rename to src/functions/src/test/java/org/apache/jmeter/functions/RandomFunctionTest.java diff --git a/test/src/org/apache/jmeter/functions/SplitFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java similarity index 100% rename from test/src/org/apache/jmeter/functions/SplitFunctionTest.java rename to src/functions/src/test/java/org/apache/jmeter/functions/SplitFunctionTest.java diff --git a/test/src/org/apache/jmeter/functions/StringFromFileFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java similarity index 90% rename from test/src/org/apache/jmeter/functions/StringFromFileFunctionTest.java rename to src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java index 6d6fbde6529..7ecfd1e8538 100644 --- a/test/src/org/apache/jmeter/functions/StringFromFileFunctionTest.java +++ b/src/functions/src/test/java/org/apache/jmeter/functions/StringFromFileFunctionTest.java @@ -33,7 +33,10 @@ public class StringFromFileFunctionTest extends JMeterTestCase { @Test public void SFFTest1() throws Exception { - StringFromFile sff1 = SFFParams("testfiles/SFFTest#'.'txt", "", "1", "3"); + String dir = getResourceFilePath("testfiles/"); + // It is processed by DecimalFormat, and dots in path would result in + // IllegalArgumentException: Multiple decimal separators in pattern + StringFromFile sff1 = SFFParams("'" + dir.replaceAll("'", "''") + "/SFFTest'#'.'txt", "", "1", "3"); assertEquals("uno", sff1.execute()); assertEquals("dos", sff1.execute()); assertEquals("tres", sff1.execute()); @@ -117,11 +120,11 @@ public void SFFTest5() throws Exception { } // Create the StringFromFile function and set its parameters. - private static StringFromFile SFFParams(String p1, String p2, String p3, String p4) throws Exception { + private StringFromFile SFFParams(String p1, String p2, String p3, String p4) throws Exception { StringFromFile sff = new StringFromFile(); Collection parms = new LinkedList<>(); if (p1 != null) { - parms.add(new CompoundVariable(p1)); + parms.add(new CompoundVariable(getResourceFilePath(p1))); } if (p2 != null) { parms.add(new CompoundVariable(p2)); diff --git a/test/src/org/apache/jmeter/functions/SumFunctionTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java similarity index 100% rename from test/src/org/apache/jmeter/functions/SumFunctionTest.java rename to src/functions/src/test/java/org/apache/jmeter/functions/SumFunctionTest.java diff --git a/test/src/org/apache/jmeter/functions/TestChangeCase.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestChangeCase.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestChangeCase.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestChangeCase.java diff --git a/test/src/org/apache/jmeter/functions/TestDateTimeConvertFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestDateTimeConvertFunction.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestDateTimeConvertFunction.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestDateTimeConvertFunction.java diff --git a/test/src/org/apache/jmeter/functions/TestDigestFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestDigestFunction.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestDigestFunction.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestDigestFunction.java diff --git a/test/src/org/apache/jmeter/functions/TestEscapeOroRegexpChars.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestEscapeOroRegexpChars.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestEscapeOroRegexpChars.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestEscapeOroRegexpChars.java diff --git a/test/src/org/apache/jmeter/functions/TestFileRowColContainer.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestFileRowColContainer.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestFileRowColContainer.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestFileRowColContainer.java diff --git a/test/src/org/apache/jmeter/functions/TestFileToString.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestFileToString.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestFileToString.java diff --git a/test/src/org/apache/jmeter/functions/TestGroovyFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestGroovyFunction.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestGroovyFunction.java diff --git a/test/src/org/apache/jmeter/functions/TestIsPropDefined.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestIsPropDefined.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestIsPropDefined.java diff --git a/test/src/org/apache/jmeter/functions/TestIsVarDefined.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestIsVarDefined.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestIsVarDefined.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestIsVarDefined.java diff --git a/test/src/org/apache/jmeter/functions/TestJavascriptFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunction.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestJavascriptFunction.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunction.java diff --git a/test/src/org/apache/jmeter/functions/TestJavascriptFunctionWithRhino.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunctionWithRhino.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestJavascriptFunctionWithRhino.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestJavascriptFunctionWithRhino.java diff --git a/test/src/org/apache/jmeter/functions/TestJexl2Function.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestJexl2Function.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestJexl2Function.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestJexl2Function.java diff --git a/test/src/org/apache/jmeter/functions/TestJexl3Function.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestJexl3Function.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestJexl3Function.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestJexl3Function.java diff --git a/test/src/org/apache/jmeter/functions/TestMachineIPName.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestMachineIPName.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestMachineIPName.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestMachineIPName.java diff --git a/test/src/org/apache/jmeter/functions/TestRandomFromMultipleVars.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestRandomFromMultipleVars.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestRandomFromMultipleVars.java diff --git a/test/src/org/apache/jmeter/functions/TestRegexFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestRegexFunction.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestRegexFunction.java diff --git a/test/src/org/apache/jmeter/functions/TestSamplerNameFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestSamplerNameFunction.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestSamplerNameFunction.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestSamplerNameFunction.java diff --git a/test/src/org/apache/jmeter/functions/TestSetProperty.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestSetProperty.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestSetProperty.java diff --git a/test/src/org/apache/jmeter/functions/TestSimpleFunctions.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestSimpleFunctions.java similarity index 97% rename from test/src/org/apache/jmeter/functions/TestSimpleFunctions.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestSimpleFunctions.java index 248095c4547..d5f5b1878a7 100644 --- a/test/src/org/apache/jmeter/functions/TestSimpleFunctions.java +++ b/src/functions/src/test/java/org/apache/jmeter/functions/TestSimpleFunctions.java @@ -26,7 +26,7 @@ import org.apache.jmeter.engine.util.CompoundVariable; import org.apache.jmeter.junit.JMeterTestCase; -import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy; +import org.apache.jmeter.junit.stubs.TestSampler; import org.apache.jmeter.samplers.SampleResult; import org.apache.jmeter.services.FileServer; import org.apache.jmeter.threads.JMeterContext; @@ -178,7 +178,7 @@ public void testTestPlanName() throws Exception { public void testThreadGroupName() throws Exception { AbstractFunctionByKey function = new ThreadGroupName(); try { - HTTPSamplerProxy httpRequest = new HTTPSamplerProxy(); + TestSampler httpRequest = new TestSampler(); ThreadGroup threadGroup = new ThreadGroup(); threadGroup.setName("ThreadGroup-1"); JMeterContext context = JMeterContextService.getContext(); @@ -195,7 +195,7 @@ public void testThreadGroupName() throws Exception { public void testThreadGroupNameBug63241() throws Exception { AbstractFunctionByKey function = new ThreadGroupName(); try { - HTTPSamplerProxy httpRequest = new HTTPSamplerProxy(); + TestSampler httpRequest = new TestSampler(); JMeterContext context = JMeterContextService.getContext(); // This is the state when called from a non test thread context.setThreadGroup(null); diff --git a/test/src/org/apache/jmeter/functions/TestStringtoFile.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestStringtoFile.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestStringtoFile.java diff --git a/test/src/org/apache/jmeter/functions/TestTimeFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeFunction.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestTimeFunction.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestTimeFunction.java diff --git a/test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestTimeRandomDateFunction.java diff --git a/test/src/org/apache/jmeter/functions/TestTimeShiftFunction.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestTimeShiftFunction.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestTimeShiftFunction.java diff --git a/test/src/org/apache/jmeter/functions/TestUrlEncodeDecode.java b/src/functions/src/test/java/org/apache/jmeter/functions/TestUrlEncodeDecode.java similarity index 100% rename from test/src/org/apache/jmeter/functions/TestUrlEncodeDecode.java rename to src/functions/src/test/java/org/apache/jmeter/functions/TestUrlEncodeDecode.java diff --git a/test/src/org/apache/jmeter/functions/VariableTest.java b/src/functions/src/test/java/org/apache/jmeter/functions/VariableTest.java similarity index 100% rename from test/src/org/apache/jmeter/functions/VariableTest.java rename to src/functions/src/test/java/org/apache/jmeter/functions/VariableTest.java diff --git a/bin/testfiles/BeanShellTest.bsh b/src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/BeanShellTest.bsh similarity index 100% rename from bin/testfiles/BeanShellTest.bsh rename to src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/BeanShellTest.bsh diff --git a/bin/testfiles/SFFTest1.txt b/src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/SFFTest1.txt similarity index 100% rename from bin/testfiles/SFFTest1.txt rename to src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/SFFTest1.txt diff --git a/bin/testfiles/SFFTest2.txt b/src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/SFFTest2.txt similarity index 100% rename from bin/testfiles/SFFTest2.txt rename to src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/SFFTest2.txt diff --git a/bin/testfiles/SFFTest3.txt b/src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/SFFTest3.txt similarity index 100% rename from bin/testfiles/SFFTest3.txt rename to src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/SFFTest3.txt diff --git a/bin/testfiles/XPathTest.xml b/src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/XPathTest.xml similarity index 100% rename from bin/testfiles/XPathTest.xml rename to src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/XPathTest.xml diff --git a/bin/testfiles/XPathTest2.xml b/src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/XPathTest2.xml similarity index 100% rename from bin/testfiles/XPathTest2.xml rename to src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/XPathTest2.xml diff --git a/bin/testfiles/testblank.csv b/src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/testblank.csv similarity index 100% rename from bin/testfiles/testblank.csv rename to src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/testblank.csv diff --git a/bin/testfiles/unit/CSVReadFunctionTest.csv b/src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/unit/CSVReadFunctionTest.csv similarity index 100% rename from bin/testfiles/unit/CSVReadFunctionTest.csv rename to src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/unit/CSVReadFunctionTest.csv diff --git a/bin/testfiles/unit/FunctionsPackageTest.csv b/src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/unit/FunctionsPackageTest.csv similarity index 100% rename from bin/testfiles/unit/FunctionsPackageTest.csv rename to src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/unit/FunctionsPackageTest.csv diff --git a/src/functions/src/test/resources/org/apache/jmeter/functions/xpathfilecontainer.xml b/src/functions/src/test/resources/org/apache/jmeter/functions/xpathfilecontainer.xml new file mode 100644 index 00000000000..eb2bb958667 --- /dev/null +++ b/src/functions/src/test/resources/org/apache/jmeter/functions/xpathfilecontainer.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java b/src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java similarity index 100% rename from test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java rename to src/generator/src/main/java/org/apache/jmeter/visualizers/GenerateTreeGui.java diff --git a/src/jorphan/org/apache/commons/cli/avalon/AbstractParserControl.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/AbstractParserControl.java similarity index 100% rename from src/jorphan/org/apache/commons/cli/avalon/AbstractParserControl.java rename to src/jorphan/src/main/java/org/apache/commons/cli/avalon/AbstractParserControl.java diff --git a/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java similarity index 100% rename from src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java rename to src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java diff --git a/src/jorphan/org/apache/commons/cli/avalon/CLOption.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOption.java similarity index 100% rename from src/jorphan/org/apache/commons/cli/avalon/CLOption.java rename to src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOption.java diff --git a/src/jorphan/org/apache/commons/cli/avalon/CLOptionDescriptor.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOptionDescriptor.java similarity index 100% rename from src/jorphan/org/apache/commons/cli/avalon/CLOptionDescriptor.java rename to src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOptionDescriptor.java diff --git a/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLUtil.java similarity index 100% rename from src/jorphan/org/apache/commons/cli/avalon/CLUtil.java rename to src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLUtil.java diff --git a/src/jorphan/org/apache/commons/cli/avalon/ParserControl.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/ParserControl.java similarity index 100% rename from src/jorphan/org/apache/commons/cli/avalon/ParserControl.java rename to src/jorphan/src/main/java/org/apache/commons/cli/avalon/ParserControl.java diff --git a/src/jorphan/org/apache/commons/cli/avalon/Token.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/Token.java similarity index 100% rename from src/jorphan/org/apache/commons/cli/avalon/Token.java rename to src/jorphan/src/main/java/org/apache/commons/cli/avalon/Token.java diff --git a/src/jorphan/org/apache/jorphan/collections/Data.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/Data.java similarity index 100% rename from src/jorphan/org/apache/jorphan/collections/Data.java rename to src/jorphan/src/main/java/org/apache/jorphan/collections/Data.java diff --git a/src/jorphan/org/apache/jorphan/collections/HashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java similarity index 100% rename from src/jorphan/org/apache/jorphan/collections/HashTree.java rename to src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java diff --git a/src/jorphan/org/apache/jorphan/collections/HashTreeTraverser.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTreeTraverser.java similarity index 100% rename from src/jorphan/org/apache/jorphan/collections/HashTreeTraverser.java rename to src/jorphan/src/main/java/org/apache/jorphan/collections/HashTreeTraverser.java diff --git a/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java similarity index 100% rename from src/jorphan/org/apache/jorphan/collections/ListedHashTree.java rename to src/jorphan/src/main/java/org/apache/jorphan/collections/ListedHashTree.java diff --git a/src/jorphan/org/apache/jorphan/collections/SearchByClass.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/SearchByClass.java similarity index 100% rename from src/jorphan/org/apache/jorphan/collections/SearchByClass.java rename to src/jorphan/src/main/java/org/apache/jorphan/collections/SearchByClass.java diff --git a/src/jorphan/org/apache/jorphan/documentation/VisibleForTesting.java b/src/jorphan/src/main/java/org/apache/jorphan/documentation/VisibleForTesting.java similarity index 100% rename from src/jorphan/org/apache/jorphan/documentation/VisibleForTesting.java rename to src/jorphan/src/main/java/org/apache/jorphan/documentation/VisibleForTesting.java diff --git a/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java similarity index 100% rename from src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java rename to src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java diff --git a/src/jorphan/org/apache/jorphan/exec/StreamCopier.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/StreamCopier.java similarity index 100% rename from src/jorphan/org/apache/jorphan/exec/StreamCopier.java rename to src/jorphan/src/main/java/org/apache/jorphan/exec/StreamCopier.java diff --git a/src/jorphan/org/apache/jorphan/exec/SystemCommand.java b/src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java similarity index 100% rename from src/jorphan/org/apache/jorphan/exec/SystemCommand.java rename to src/jorphan/src/main/java/org/apache/jorphan/exec/SystemCommand.java diff --git a/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/AbstractTreeTableModel.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/AbstractTreeTableModel.java diff --git a/src/jorphan/org/apache/jorphan/gui/ComponentUtil.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ComponentUtil.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/ComponentUtil.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/ComponentUtil.java diff --git a/src/jorphan/org/apache/jorphan/gui/DefaultTreeTableModel.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/DefaultTreeTableModel.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/DefaultTreeTableModel.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/DefaultTreeTableModel.java diff --git a/src/jorphan/org/apache/jorphan/gui/GuiUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/GuiUtils.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/GuiUtils.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/GuiUtils.java diff --git a/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledChoice.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledChoice.java diff --git a/src/jorphan/org/apache/jorphan/gui/JLabeledField.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledField.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/JLabeledField.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledField.java diff --git a/src/jorphan/org/apache/jorphan/gui/JLabeledPasswordField.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledPasswordField.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/JLabeledPasswordField.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledPasswordField.java diff --git a/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledTextArea.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledTextArea.java diff --git a/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledTextField.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/JLabeledTextField.java diff --git a/src/jorphan/org/apache/jorphan/gui/JTreeTable.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/JTreeTable.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/JTreeTable.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/JTreeTable.java diff --git a/src/jorphan/org/apache/jorphan/gui/MenuScroller.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/MenuScroller.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/MenuScroller.java diff --git a/src/jorphan/org/apache/jorphan/gui/MinMaxLongRenderer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/MinMaxLongRenderer.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java diff --git a/src/jorphan/org/apache/jorphan/gui/NumberRenderer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/NumberRenderer.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/NumberRenderer.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/NumberRenderer.java diff --git a/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableModel.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableModel.java diff --git a/src/jorphan/org/apache/jorphan/gui/ObjectTableSorter.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/ObjectTableSorter.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java diff --git a/src/jorphan/org/apache/jorphan/gui/RateRenderer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/RateRenderer.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java diff --git a/src/jorphan/org/apache/jorphan/gui/RendererUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/RendererUtils.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/RendererUtils.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/RendererUtils.java diff --git a/src/jorphan/org/apache/jorphan/gui/RightAlignRenderer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/RightAlignRenderer.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/RightAlignRenderer.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/RightAlignRenderer.java diff --git a/src/jorphan/org/apache/jorphan/gui/TreeTableModel.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/TreeTableModel.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/TreeTableModel.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/TreeTableModel.java diff --git a/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java similarity index 100% rename from src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java rename to src/jorphan/src/main/java/org/apache/jorphan/gui/layout/VerticalLayout.java diff --git a/src/jorphan/org/apache/jorphan/io/TextFile.java b/src/jorphan/src/main/java/org/apache/jorphan/io/TextFile.java similarity index 100% rename from src/jorphan/org/apache/jorphan/io/TextFile.java rename to src/jorphan/src/main/java/org/apache/jorphan/io/TextFile.java diff --git a/src/jorphan/org/apache/jorphan/logging/LoggingManager.java b/src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java similarity index 100% rename from src/jorphan/org/apache/jorphan/logging/LoggingManager.java rename to src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java diff --git a/src/jorphan/org/apache/jorphan/logging/Slf4jLogkitLogger.java b/src/jorphan/src/main/java/org/apache/jorphan/logging/Slf4jLogkitLogger.java similarity index 100% rename from src/jorphan/org/apache/jorphan/logging/Slf4jLogkitLogger.java rename to src/jorphan/src/main/java/org/apache/jorphan/logging/Slf4jLogkitLogger.java diff --git a/src/jorphan/org/apache/jorphan/math/NumberComparator.java b/src/jorphan/src/main/java/org/apache/jorphan/math/NumberComparator.java similarity index 100% rename from src/jorphan/org/apache/jorphan/math/NumberComparator.java rename to src/jorphan/src/main/java/org/apache/jorphan/math/NumberComparator.java diff --git a/src/jorphan/org/apache/jorphan/math/StatCalculator.java b/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculator.java similarity index 100% rename from src/jorphan/org/apache/jorphan/math/StatCalculator.java rename to src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculator.java diff --git a/src/jorphan/org/apache/jorphan/math/StatCalculatorInteger.java b/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorInteger.java similarity index 100% rename from src/jorphan/org/apache/jorphan/math/StatCalculatorInteger.java rename to src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorInteger.java diff --git a/src/jorphan/org/apache/jorphan/math/StatCalculatorLong.java b/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorLong.java similarity index 100% rename from src/jorphan/org/apache/jorphan/math/StatCalculatorLong.java rename to src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorLong.java diff --git a/src/jorphan/org/apache/jorphan/reflect/ClassFilter.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFilter.java similarity index 100% rename from src/jorphan/org/apache/jorphan/reflect/ClassFilter.java rename to src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFilter.java diff --git a/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java similarity index 100% rename from src/jorphan/org/apache/jorphan/reflect/ClassFinder.java rename to src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java diff --git a/src/jorphan/org/apache/jorphan/reflect/ClassTools.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java similarity index 100% rename from src/jorphan/org/apache/jorphan/reflect/ClassTools.java rename to src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java diff --git a/src/jorphan/org/apache/jorphan/reflect/Functor.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/Functor.java similarity index 100% rename from src/jorphan/org/apache/jorphan/reflect/Functor.java rename to src/jorphan/src/main/java/org/apache/jorphan/reflect/Functor.java diff --git a/src/jorphan/org/apache/jorphan/test/UnitTestManager.java b/src/jorphan/src/main/java/org/apache/jorphan/test/UnitTestManager.java similarity index 100% rename from src/jorphan/org/apache/jorphan/test/UnitTestManager.java rename to src/jorphan/src/main/java/org/apache/jorphan/test/UnitTestManager.java diff --git a/src/jorphan/org/apache/jorphan/util/Converter.java b/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/Converter.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java diff --git a/src/jorphan/org/apache/jorphan/util/HeapDumper.java b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/HeapDumper.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java diff --git a/src/jorphan/org/apache/jorphan/util/JMeterError.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JMeterError.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/JMeterError.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/JMeterError.java diff --git a/src/jorphan/org/apache/jorphan/util/JMeterException.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JMeterException.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/JMeterException.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/JMeterException.java diff --git a/src/jorphan/org/apache/jorphan/util/JMeterStopTestException.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JMeterStopTestException.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/JMeterStopTestException.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/JMeterStopTestException.java diff --git a/src/jorphan/org/apache/jorphan/util/JMeterStopTestNowException.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JMeterStopTestNowException.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/JMeterStopTestNowException.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/JMeterStopTestNowException.java diff --git a/src/jorphan/org/apache/jorphan/util/JMeterStopThreadException.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JMeterStopThreadException.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/JMeterStopThreadException.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/JMeterStopThreadException.java diff --git a/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/JOrphanUtils.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java diff --git a/src/jorphan/org/apache/jorphan/util/ThreadDumper.java b/src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/ThreadDumper.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/ThreadDumper.java diff --git a/src/jorphan/org/apache/jorphan/util/XMLBuffer.java b/src/jorphan/src/main/java/org/apache/jorphan/util/XMLBuffer.java similarity index 100% rename from src/jorphan/org/apache/jorphan/util/XMLBuffer.java rename to src/jorphan/src/main/java/org/apache/jorphan/util/XMLBuffer.java diff --git a/src/jorphan/org/apache/log/ContextMap.java b/src/jorphan/src/main/java/org/apache/log/ContextMap.java similarity index 100% rename from src/jorphan/org/apache/log/ContextMap.java rename to src/jorphan/src/main/java/org/apache/log/ContextMap.java diff --git a/src/jorphan/org/apache/log/LogEvent.java b/src/jorphan/src/main/java/org/apache/log/LogEvent.java similarity index 100% rename from src/jorphan/org/apache/log/LogEvent.java rename to src/jorphan/src/main/java/org/apache/log/LogEvent.java diff --git a/src/jorphan/org/apache/log/LogTarget.java b/src/jorphan/src/main/java/org/apache/log/LogTarget.java similarity index 100% rename from src/jorphan/org/apache/log/LogTarget.java rename to src/jorphan/src/main/java/org/apache/log/LogTarget.java diff --git a/src/jorphan/org/apache/log/Logger.java b/src/jorphan/src/main/java/org/apache/log/Logger.java similarity index 100% rename from src/jorphan/org/apache/log/Logger.java rename to src/jorphan/src/main/java/org/apache/log/Logger.java diff --git a/src/jorphan/org/apache/log/Priority.java b/src/jorphan/src/main/java/org/apache/log/Priority.java similarity index 100% rename from src/jorphan/org/apache/log/Priority.java rename to src/jorphan/src/main/java/org/apache/log/Priority.java diff --git a/src/jorphan/org/apache/commons/cli/avalon/package.html b/src/jorphan/src/main/resources/org/apache/commons/cli/avalon/package.html similarity index 100% rename from src/jorphan/org/apache/commons/cli/avalon/package.html rename to src/jorphan/src/main/resources/org/apache/commons/cli/avalon/package.html diff --git a/test/src/org/apache/jorphan/io/TextFileSpec.groovy b/src/jorphan/src/test/groovy/org/apache/jorphan/io/TextFileSpec.groovy similarity index 100% rename from test/src/org/apache/jorphan/io/TextFileSpec.groovy rename to src/jorphan/src/test/groovy/org/apache/jorphan/io/TextFileSpec.groovy diff --git a/test/src/org/apache/jorphan/util/ConverterSpec.groovy b/src/jorphan/src/test/groovy/org/apache/jorphan/util/ConverterSpec.groovy similarity index 100% rename from test/src/org/apache/jorphan/util/ConverterSpec.groovy rename to src/jorphan/src/test/groovy/org/apache/jorphan/util/ConverterSpec.groovy diff --git a/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java b/src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java similarity index 100% rename from test/src/org/apache/commons/cli/avalon/ClutilTestCase.java rename to src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java diff --git a/test/src/org/apache/jorphan/collections/PackageTest.java b/src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java similarity index 100% rename from test/src/org/apache/jorphan/collections/PackageTest.java rename to src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java diff --git a/test/src/org/apache/jorphan/exec/TestKeyToolUtils.java b/src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java similarity index 100% rename from test/src/org/apache/jorphan/exec/TestKeyToolUtils.java rename to src/jorphan/src/test/java/org/apache/jorphan/exec/TestKeyToolUtils.java diff --git a/test/src/org/apache/jorphan/gui/MinMaxLongRendererTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java similarity index 100% rename from test/src/org/apache/jorphan/gui/MinMaxLongRendererTest.java rename to src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java diff --git a/test/src/org/apache/jorphan/gui/ObjectTableModelTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java similarity index 100% rename from test/src/org/apache/jorphan/gui/ObjectTableModelTest.java rename to src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableModelTest.java diff --git a/test/src/org/apache/jorphan/gui/ObjectTableSorterTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java similarity index 100% rename from test/src/org/apache/jorphan/gui/ObjectTableSorterTest.java rename to src/jorphan/src/test/java/org/apache/jorphan/gui/ObjectTableSorterTest.java diff --git a/test/src/org/apache/jorphan/gui/TableModelEventBacker.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/TableModelEventBacker.java similarity index 100% rename from test/src/org/apache/jorphan/gui/TableModelEventBacker.java rename to src/jorphan/src/test/java/org/apache/jorphan/gui/TableModelEventBacker.java diff --git a/test/src/org/apache/jorphan/math/TestStatCalculator.java b/src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java similarity index 100% rename from test/src/org/apache/jorphan/math/TestStatCalculator.java rename to src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java diff --git a/test/src/org/apache/jorphan/reflect/TestClassTools.java b/src/jorphan/src/test/java/org/apache/jorphan/reflect/TestClassTools.java similarity index 100% rename from test/src/org/apache/jorphan/reflect/TestClassTools.java rename to src/jorphan/src/test/java/org/apache/jorphan/reflect/TestClassTools.java diff --git a/test/src/org/apache/jorphan/util/TestConverter.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java similarity index 100% rename from test/src/org/apache/jorphan/util/TestConverter.java rename to src/jorphan/src/test/java/org/apache/jorphan/util/TestConverter.java diff --git a/test/src/org/apache/jorphan/util/TestJorphanUtils.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java similarity index 100% rename from test/src/org/apache/jorphan/util/TestJorphanUtils.java rename to src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java diff --git a/src/core/org/apache/jmeter/DynamicClassLoader.java b/src/launcher/src/main/java/org/apache/jmeter/DynamicClassLoader.java similarity index 100% rename from src/core/org/apache/jmeter/DynamicClassLoader.java rename to src/launcher/src/main/java/org/apache/jmeter/DynamicClassLoader.java diff --git a/src/core/org/apache/jmeter/NewDriver.java b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java similarity index 100% rename from src/core/org/apache/jmeter/NewDriver.java rename to src/launcher/src/main/java/org/apache/jmeter/NewDriver.java diff --git a/src/core/org/apache/jmeter/util/ShutdownClient.java b/src/launcher/src/main/java/org/apache/jmeter/util/ShutdownClient.java similarity index 95% rename from src/core/org/apache/jmeter/util/ShutdownClient.java rename to src/launcher/src/main/java/org/apache/jmeter/util/ShutdownClient.java index 78a54672fb4..6a5795831b6 100644 --- a/src/core/org/apache/jmeter/util/ShutdownClient.java +++ b/src/launcher/src/main/java/org/apache/jmeter/util/ShutdownClient.java @@ -23,15 +23,14 @@ import java.net.DatagramSocket; import java.net.InetAddress; -import org.apache.jmeter.JMeter; - - /** * Simple utility to send a shutdown message to a non-GUI instance of JMeter */ public class ShutdownClient { + public static final int UDP_PORT_DEFAULT = 4445; + public static void main(String[] args) throws IOException { - int port = JMeter.UDP_PORT_DEFAULT; + int port = UDP_PORT_DEFAULT; if (args.length > 1){ port = Integer.parseInt(args[1]); } else if (args.length == 0) { diff --git a/res/META-INF/jmeter_as_ascii_art.txt b/src/launcher/src/main/resources/org/apache/jmeter/jmeter_as_ascii_art.txt similarity index 80% rename from res/META-INF/jmeter_as_ascii_art.txt rename to src/launcher/src/main/resources/org/apache/jmeter/jmeter_as_ascii_art.txt index 4e02dc9812d..e941be57a33 100644 --- a/res/META-INF/jmeter_as_ascii_art.txt +++ b/src/launcher/src/main/resources/org/apache/jmeter/jmeter_as_ascii_art.txt @@ -1,7 +1,7 @@ - _ ____ _ ____ _ _ _____ _ __ __ _____ _____ _____ ____ - / \ | _ \ / \ / ___| | | | ____| | | \/ | ____|_ _| ____| _ \ - / _ \ | |_) / _ \| | | |_| | _| _ | | |\/| | _| | | | _| | |_) | - / ___ \| __/ ___ \ |___| _ | |___ | |_| | | | | |___ | | | |___| _ < -/_/ \_\_| /_/ \_\____|_| |_|_____| \___/|_| |_|_____| |_| |_____|_| \_\ @VERSION@ + _ ____ _ ____ _ _ _____ _ __ __ _____ _____ _____ ____ + / \ | _ \ / \ / ___| | | | ____| | | \/ | ____|_ _| ____| _ \ + / _ \ | |_) / _ \| | | |_| | _| _ | | |\/| | _| | | | _| | |_) | + / ___ \| __/ ___ \ |___| _ | |___ | |_| | | | | |___ | | | |___| _ < +/_/ \_\_| /_/ \_\____|_| |_|_____| \___/|_| |_|_____| |_| |_____|_| \_\ @VERSION@ Copyright (c) 1999-@YEAR@ The Apache Software Foundation diff --git a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java similarity index 100% rename from src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java rename to src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java diff --git a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java similarity index 100% rename from src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java rename to src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java diff --git a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java b/src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java similarity index 100% rename from src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java rename to src/protocol/ftp/src/main/java/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Authorization.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Authorization.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Cookie.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Cookie.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieHandler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieHandler.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/CookieHandler.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieHandler.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CookieManager.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/DelegatingKerberosScheme.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingKerberosScheme.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/DelegatingKerberosScheme.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingKerberosScheme.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/DelegatingSPNegoScheme.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingSPNegoScheme.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/DelegatingSPNegoScheme.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DelegatingSPNegoScheme.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Header.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/Header.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/KerberosManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/KerberosManager.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/KerberosManager.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/KerberosManager.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/RecordingController.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/RecordingController.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/RecordingController.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/RecordingController.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/StaticHost.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/StaticHost.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/StaticHost.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/StaticHost.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/RecordController.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/gui/RecordController.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/AuthPanel.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HeaderPanel.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/RegExUserParametersGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/BaseParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/BaseParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseException.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParseException.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseException.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParseException.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/LinkExtractorParseException.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LinkExtractorParseException.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/LinkExtractorParseException.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LinkExtractorParseException.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/LinkExtractorParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LinkExtractorParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/LinkExtractorParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LinkExtractorParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLCollection.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLString.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/URLString.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Daemon.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/Proxy.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ServerAliasKeyManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ServerAliasKeyManager.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/ServerAliasKeyManager.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ServerAliasKeyManager.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/AjpSampler.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPFileImpl.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseBeanInfo.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PostWriter.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/PutWriter.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/ResourcesDownloader.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/ResourcesDownloader.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/ResourcesDownloader.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/ResourcesDownloader.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LaxGZIPInputStream.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/Base64Encoder.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/Base64Encoder.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/Base64Encoder.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/Base64Encoder.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/ConversionUtils.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/DirectAccessByteArrayOutputStream.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/DirectAccessByteArrayOutputStream.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/DirectAccessByteArrayOutputStream.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/DirectAccessByteArrayOutputStream.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/EncoderCache.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/EncoderCache.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/EncoderCache.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/EncoderCache.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPArgument.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstants.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPConstants.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstants.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPConstants.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArg.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/Filter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/Filter.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/Filter.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/Filter.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/Generator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/Generator.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/Generator.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/Generator.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/NVPair.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/NVPair.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/NVPair.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/NVPair.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java rename to src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources.properties b/src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources.properties similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources.properties rename to src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources.properties diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_es.properties b/src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_es.properties similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_es.properties rename to src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_es.properties diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_fr.properties b/src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_fr.properties similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_fr.properties rename to src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_fr.properties diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_pt_BR.properties b/src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_pt_BR.properties similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_pt_BR.properties rename to src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_pt_BR.properties diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_tr.properties b/src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_tr.properties similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_tr.properties rename to src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_tr.properties diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_zh_TW.properties b/src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_zh_TW.properties similarity index 100% rename from src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_zh_TW.properties rename to src/protocol/http/src/main/resources/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_zh_TW.properties diff --git a/test/src/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy b/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy rename to src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy diff --git a/test/src/org/apache/jmeter/protocol/http/util/HTTPUtilsSpec.groovy b/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/util/HTTPUtilsSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/util/HTTPUtilsSpec.groovy rename to src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/util/HTTPUtilsSpec.groovy diff --git a/test/src/org/apache/jmeter/curl/BasicCurlParserTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java similarity index 100% rename from test/src/org/apache/jmeter/curl/BasicCurlParserTest.java rename to src/protocol/http/src/test/java/org/apache/jmeter/curl/BasicCurlParserTest.java diff --git a/test/src/org/apache/jmeter/gui/action/ParseCurlCommandActionTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/gui/action/ParseCurlCommandActionTest.java similarity index 100% rename from test/src/org/apache/jmeter/gui/action/ParseCurlCommandActionTest.java rename to src/protocol/http/src/test/java/org/apache/jmeter/gui/action/ParseCurlCommandActionTest.java diff --git a/test/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java diff --git a/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestAuthManager.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestAuthManager.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManager.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthManagerThreadIteration.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestAuthorization.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthorization.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestAuthorization.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestAuthorization.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerHC4.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerHC4.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerHC4.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerHC4.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerThreadIteration.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnection.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnection.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnection.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnection.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnectionBase.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnectionBase.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnectionBase.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerUrlConnectionBase.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCookieManagerThreadIteration.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHC4CookieManager.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java diff --git a/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java diff --git a/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java similarity index 97% rename from test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java index c781dc524bd..245f4731f78 100644 --- a/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java +++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java @@ -53,15 +53,15 @@ public void setUp() { } private void testProcessingHTMLFile(String HTMLFileName) throws Exception { - File file = new File(System.getProperty("user.dir") + "/testfiles/load_bug_list.jmx"); + File file = findTestFile("testfiles/load_bug_list.jmx"); HTTPSamplerBase config = (HTTPSamplerBase) SaveService.loadTree(file).getArray()[0]; config.setRunningVersion(true); HTTPSampleResult result = new HTTPSampleResult(); - file = new File(System.getProperty("user.dir") + "/testfiles/Load_JMeter_Page.jmx"); + file = findTestFile("testfiles/Load_JMeter_Page.jmx"); HTTPSamplerBase context = (HTTPSamplerBase) SaveService.loadTree(file).getArray()[0]; jmctx.setCurrentSampler(context); jmctx.setCurrentSampler(config); - result.setResponseData(new TextFile(System.getProperty("user.dir") + HTMLFileName).getText(), null); + result.setResponseData(new TextFile(findTestFile(HTMLFileName)).getText(), null); result.setSampleLabel(context.toString()); result.setSamplerData(context.toString()); result.setURL(new URL("http://bz.apache.org/fakepage.html")); @@ -91,17 +91,17 @@ private void testProcessingHTMLFile(String HTMLFileName) throws Exception { @Test public void testModifySampler() throws Exception { - testProcessingHTMLFile("/testfiles/jmeter_home_page.html"); + testProcessingHTMLFile("testfiles/jmeter_home_page.html"); } @Test public void testModifySamplerWithRelativeLink() throws Exception { - testProcessingHTMLFile("/testfiles/jmeter_home_page_with_relative_links.html"); + testProcessingHTMLFile("testfiles/jmeter_home_page_with_relative_links.html"); } @Test public void testModifySamplerWithBaseHRef() throws Exception { - testProcessingHTMLFile("/testfiles/jmeter_home_page_with_base_href.html"); + testProcessingHTMLFile("testfiles/jmeter_home_page_with_base_href.html"); } @Test diff --git a/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java diff --git a/test/src/org/apache/jmeter/protocol/http/parser/NotReusableParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/NotReusableParser.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/parser/NotReusableParser.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/NotReusableParser.java diff --git a/test/src/org/apache/jmeter/protocol/http/parser/ReusableParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/ReusableParser.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/parser/ReusableParser.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/ReusableParser.java diff --git a/test/src/org/apache/jmeter/protocol/http/parser/TestBaseParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBaseParser.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/parser/TestBaseParser.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBaseParser.java diff --git a/test/src/org/apache/jmeter/protocol/http/parser/TestBug60842HtmlParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBug60842HtmlParser.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/parser/TestBug60842HtmlParser.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestBug60842HtmlParser.java diff --git a/test/src/org/apache/jmeter/protocol/http/parser/TestCssParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/parser/TestCssParser.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java diff --git a/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java similarity index 94% rename from test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java index 1caacff5ad1..32047bd3d4c 100644 --- a/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java +++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java @@ -21,9 +21,12 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; +import java.io.FileNotFoundException; import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -35,6 +38,7 @@ import java.util.Vector; import java.util.stream.Collectors; +import org.apache.commons.io.IOUtils; import org.apache.jmeter.junit.JMeterTestCaseJUnit; import org.apache.jmeter.util.JMeterUtils; import org.slf4j.Logger; @@ -377,12 +381,7 @@ private static void filetest(HTMLParser p, String file, String url, String resul String parserName = p.getClass().getName().substring("org.apache.jmeter.protocol.http.parser.".length()); String fname = file.substring(file.indexOf('/')+1); log.debug("file {}", file); - File f = findTestFile(file); - byte[] buffer = new byte[(int) f.length()]; - try (InputStream is = new FileInputStream(f)){ - int len = is.read(buffer); - assertEquals(len, buffer.length); - } + byte[] buffer = IOUtils.toByteArray(getInputStream(file)); Iterator result; if (c == null) { result = p.getEmbeddedResourceURLs(userAgent, buffer, new URL(url), System.getProperty("file.encoding")); @@ -428,9 +427,25 @@ private static List getFile(String file) throws Exception { if (file == null || file.isEmpty()) { return Collections.emptyList(); } - try (FileReader fr = new FileReader(findTestFile(file)); - BufferedReader br = new BufferedReader(fr)) { + try (InputStream is = getInputStream(file); + Reader fr = new InputStreamReader(is, StandardCharsets.UTF_8); + BufferedReader br = new BufferedReader(fr)) { return br.lines().collect(Collectors.toList()); } } + + private static InputStream getInputStream(String file) { + if (file.startsWith("testfiles/HTMLParserTestFile_2")) { + // testfiles/HTMLParserTestFile_2 is shared between unit tests and batch tests, + // so the file is located in root/bin/testfiles/... + String path = "../../../bin/" + file; + System.out.println(new File(path).getAbsolutePath()); + try { + return new FileInputStream(path); + } catch (FileNotFoundException e) { + throw new IllegalArgumentException("File " + file + " is not found (" + path + ")"); + } + } + return TestHTMLParser.class.getResourceAsStream("/" + file); + } } diff --git a/test/src/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java diff --git a/test/src/org/apache/jmeter/protocol/http/proxy/NonGuiProxySample.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/NonGuiProxySample.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/proxy/NonGuiProxySample.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/NonGuiProxySample.java diff --git a/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java diff --git a/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/HTTPSampler3.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/PutWriterTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PutWriterTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/PutWriterTest.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PutWriterTest.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPHC4Impl.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/TestHttpWebdav.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHttpWebdav.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/sampler/TestHttpWebdav.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestHttpWebdav.java diff --git a/test/src/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java similarity index 90% rename from test/src/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java index 5f89b3c325a..da3f6071e23 100644 --- a/test/src/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java +++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/TestSerializedHTTPSampler.java @@ -23,13 +23,11 @@ import static org.junit.Assert.assertThat; import java.io.File; -import java.nio.file.Paths; import org.apache.jmeter.junit.JMeterTestCase; import org.apache.jmeter.protocol.http.util.HTTPFileArg; import org.apache.jmeter.samplers.SampleResult; import org.apache.jmeter.services.FileServer; -import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.test.JMeterSerialTest; import org.junit.Test; @@ -40,11 +38,12 @@ public void checkThatFilesAreReadRelativeToBaseDir() { String baseDirPath = FileServer.getFileServer().getBaseDir(); File baseDir = new File(baseDirPath); try { - FileServer.getFileServer().setBase(Paths.get(JMeterUtils.getJMeterHome(), "test", "resources").toFile()); + File file = new File(getResourceFilePath("checkThatFilesAreReadRelativeToBaseDir.txt")); + FileServer.getFileServer().setBase(file.getParentFile()); HTTPSamplerBase sampler = new HTTPSampler3(); sampler.setMethod("POST"); sampler.setPath("https://httpbin.org/post"); - sampler.setHTTPFiles(new HTTPFileArg[]{new HTTPFileArg("resourcefile.txt", "", "")}); + sampler.setHTTPFiles(new HTTPFileArg[]{new HTTPFileArg(file.getName(), "", "")}); SampleResult sample = sampler.sample(); assertThat(sample.getResponseDataAsString(), not(containsString("java.io.FileNotFoundException:"))); diff --git a/test/src/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPArgument.java diff --git a/test/src/org/apache/jmeter/protocol/http/util/TestHTTPFileArg.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArg.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/util/TestHTTPFileArg.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArg.java diff --git a/test/src/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java diff --git a/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java diff --git a/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestSessionFilter.java diff --git a/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestTCLogParser.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestTCLogParser.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/util/accesslog/TestTCLogParser.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/accesslog/TestTCLogParser.java diff --git a/test/src/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java rename to src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTPTest.java diff --git a/test/src/org/apache/jmeter/testelement/TestHeaderManager.java b/src/protocol/http/src/test/java/org/apache/jmeter/testelement/TestHeaderManager.java similarity index 100% rename from test/src/org/apache/jmeter/testelement/TestHeaderManager.java rename to src/protocol/http/src/test/java/org/apache/jmeter/testelement/TestHeaderManager.java diff --git a/src/protocol/http/src/test/resources/org/apache/jmeter/protocol/http/sampler/checkThatFilesAreReadRelativeToBaseDir.txt b/src/protocol/http/src/test/resources/org/apache/jmeter/protocol/http/sampler/checkThatFilesAreReadRelativeToBaseDir.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/bin/testfiles/HTMLParserTestCase.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase.all similarity index 100% rename from bin/testfiles/HTMLParserTestCase.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase.all diff --git a/bin/testfiles/HTMLParserTestCase.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase.html similarity index 100% rename from bin/testfiles/HTMLParserTestCase.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase.html diff --git a/bin/testfiles/HTMLParserTestCase.set b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase.set similarity index 100% rename from bin/testfiles/HTMLParserTestCase.set rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase.set diff --git a/bin/testfiles/HTMLParserTestCase2.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase2.html similarity index 100% rename from bin/testfiles/HTMLParserTestCase2.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase2.html diff --git a/bin/testfiles/HTMLParserTestCase3.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase3.html similarity index 100% rename from bin/testfiles/HTMLParserTestCase3.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCase3.html diff --git a/bin/testfiles/HTMLParserTestCaseBase.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseBase.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseBase.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseBase.all diff --git a/bin/testfiles/HTMLParserTestCaseBase.set b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseBase.set similarity index 100% rename from bin/testfiles/HTMLParserTestCaseBase.set rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseBase.set diff --git a/bin/testfiles/HTMLParserTestCaseFrames.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseFrames.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseFrames.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseFrames.all diff --git a/bin/testfiles/HTMLParserTestCaseFrames.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseFrames.html similarity index 100% rename from bin/testfiles/HTMLParserTestCaseFrames.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseFrames.html diff --git a/bin/testfiles/HTMLParserTestCaseFrames.set b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseFrames.set similarity index 100% rename from bin/testfiles/HTMLParserTestCaseFrames.set rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseFrames.set diff --git a/bin/testfiles/HTMLParserTestCaseWithBaseHRef.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithBaseHRef.html similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithBaseHRef.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithBaseHRef.html diff --git a/bin/testfiles/HTMLParserTestCaseWithBaseHRef2.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithBaseHRef2.html similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithBaseHRef2.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithBaseHRef2.html diff --git a/bin/testfiles/HTMLParserTestCaseWithComments.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithComments.html similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithComments.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithComments.html diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional1.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1.html similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional1.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1.html diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional1_FF.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1_FF.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional1_FF.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1_FF.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional1_IE6.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1_IE6.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional1_IE6.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1_IE6.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional1_IE7.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1_IE7.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional1_IE7.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1_IE7.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional1_IE8.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1_IE8.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional1_IE8.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional1_IE8.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional2.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2.html similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional2.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2.html diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional2_FF.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2_FF.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional2_FF.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2_FF.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional2_IE7.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2_IE7.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional2_IE7.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2_IE7.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional2_IE8.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2_IE8.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional2_IE8.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2_IE8.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional2_IE9.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2_IE9.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional2_IE9.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional2_IE9.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional3.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3.html similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional3.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3.html diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional3_FF.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3_FF.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional3_FF.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3_FF.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional3_IE10.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3_IE10.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional3_IE10.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3_IE10.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional3_IE55.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3_IE55.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional3_IE55.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3_IE55.all diff --git a/bin/testfiles/HTMLParserTestCaseWithConditional3_IE6.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3_IE6.all similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithConditional3_IE6.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithConditional3_IE6.all diff --git a/bin/testfiles/HTMLParserTestCaseWithMissingBaseHRef.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithMissingBaseHRef.html similarity index 100% rename from bin/testfiles/HTMLParserTestCaseWithMissingBaseHRef.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestCaseWithMissingBaseHRef.html diff --git a/bin/testfiles/HTMLParserTestFrames.all b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestFrames.all similarity index 100% rename from bin/testfiles/HTMLParserTestFrames.all rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestFrames.all diff --git a/bin/testfiles/HTMLParserTestFrames.html b/src/protocol/http/src/test/resources/testfiles/HTMLParserTestFrames.html similarity index 100% rename from bin/testfiles/HTMLParserTestFrames.html rename to src/protocol/http/src/test/resources/testfiles/HTMLParserTestFrames.html diff --git a/bin/testfiles/HTMLScript.all b/src/protocol/http/src/test/resources/testfiles/HTMLScript.all similarity index 100% rename from bin/testfiles/HTMLScript.all rename to src/protocol/http/src/test/resources/testfiles/HTMLScript.all diff --git a/bin/testfiles/HTMLScript.html b/src/protocol/http/src/test/resources/testfiles/HTMLScript.html similarity index 100% rename from bin/testfiles/HTMLScript.html rename to src/protocol/http/src/test/resources/testfiles/HTMLScript.html diff --git a/bin/testfiles/HTMLScript.set b/src/protocol/http/src/test/resources/testfiles/HTMLScript.set similarity index 100% rename from bin/testfiles/HTMLScript.set rename to src/protocol/http/src/test/resources/testfiles/HTMLScript.set diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/JavaConfig.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/JavaConfig.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerBeanInfo.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerBeanInfo.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerBeanInfo.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerBeanInfo.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/JavaTest.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java rename to src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources.properties b/src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources.properties similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources.properties rename to src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources.properties diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_fr.properties b/src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_fr.properties similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_fr.properties rename to src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_fr.properties diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_zh_CN.properties b/src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_zh_CN.properties similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_zh_CN.properties rename to src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/BSFSamplerResources_zh_CN.properties diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties b/src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties rename to src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties b/src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties rename to src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_zh_CN.properties b/src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_zh_CN.properties similarity index 100% rename from src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_zh_CN.properties rename to src/protocol/java/src/main/resources/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_zh_CN.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessor.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessor.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessor.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessor.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorBeanInfo.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorBeanInfo.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorBeanInfo.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorBeanInfo.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessor.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessor.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessor.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessor.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorBeanInfo.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorBeanInfo.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorBeanInfo.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorBeanInfo.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java rename to src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_es.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_es.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_es.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_es.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_fr.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_fr.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_fr.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_fr.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_pt_BR.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_pt_BR.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_pt_BR.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_pt_BR.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_tr.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_tr.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_tr.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_tr.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_zh_TW.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_zh_TW.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_zh_TW.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_zh_TW.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_fr.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_fr.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_fr.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_fr.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_zh_CN.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_zh_CN.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_zh_CN.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_zh_CN.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_fr.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_fr.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_fr.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_fr.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_zh_CN.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_zh_CN.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_zh_CN.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_zh_CN.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_es.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_es.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_es.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_es.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_fr.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_fr.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_fr.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_fr.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_pt_BR.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_pt_BR.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_pt_BR.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_pt_BR.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_tr.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_tr.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_tr.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_tr.properties diff --git a/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_zh_TW.properties b/src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_zh_TW.properties similarity index 100% rename from src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_zh_TW.properties rename to src/protocol/jdbc/src/main/resources/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_zh_TW.properties diff --git a/test/src/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerSpec.groovy b/src/protocol/jdbc/src/test/groovy/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerSpec.groovy similarity index 100% rename from test/src/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerSpec.groovy rename to src/protocol/jdbc/src/test/groovy/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerSpec.groovy diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ClientPool.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ClientPool.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/Publisher.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/Publisher.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSProperties.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSProperty.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSProperty.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSProperty.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSProperty.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/Receiver.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/TimeoutEnabledQueueRequestor.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRenderer.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/FileKey.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/FileKey.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/FileKey.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/FileKey.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/MapMessageRenderer.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/MapMessageRenderer.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/MapMessageRenderer.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/MapMessageRenderer.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/MessageRenderer.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/MessageRenderer.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/MessageRenderer.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/MessageRenderer.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRenderer.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRenderer.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRenderer.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRenderer.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/RendererFactory.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/RendererFactory.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/RendererFactory.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/RendererFactory.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/Renderers.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/Renderers.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/Renderers.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/Renderers.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRenderer.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRenderer.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRenderer.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRenderer.java diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/package-info.java b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/package-info.java similarity index 100% rename from src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/render/package-info.java rename to src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/sampler/render/package-info.java diff --git a/test/src/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java rename to src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/PublisherSamplerTest.java diff --git a/test/src/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java rename to src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java diff --git a/test/src/org/apache/jmeter/protocol/jms/sampler/render/MessageRendererTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/MessageRendererTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/jms/sampler/render/MessageRendererTest.java rename to src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/MessageRendererTest.java diff --git a/test/src/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java rename to src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java diff --git a/test/src/org/apache/jmeter/protocol/jms/sampler/render/Person.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/Person.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/jms/sampler/render/Person.java rename to src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/Person.java diff --git a/test/src/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRendererTest.java b/src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRendererTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRendererTest.java rename to src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/TextMessageRendererTest.java diff --git a/test/resources/org/apache/jmeter/protocol/jms/sampler/render/cp1252.txt b/src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/cp1252.txt similarity index 100% rename from test/resources/org/apache/jmeter/protocol/jms/sampler/render/cp1252.txt rename to src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/cp1252.txt diff --git a/test/resources/org/apache/jmeter/protocol/jms/sampler/render/noVar.txt b/src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/noVar.txt similarity index 100% rename from test/resources/org/apache/jmeter/protocol/jms/sampler/render/noVar.txt rename to src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/noVar.txt diff --git a/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_cp1252.xml b/src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_cp1252.xml similarity index 100% rename from test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_cp1252.xml rename to src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_cp1252.xml diff --git a/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_doe.xml b/src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_doe.xml similarity index 100% rename from test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_doe.xml rename to src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_doe.xml diff --git a/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_prolog_cp1252.xml b/src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_prolog_cp1252.xml similarity index 100% rename from test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_prolog_cp1252.xml rename to src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_prolog_cp1252.xml diff --git a/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_utf8.xml b/src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_utf8.xml similarity index 100% rename from test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_utf8.xml rename to src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_utf8.xml diff --git a/test/resources/org/apache/jmeter/protocol/jms/sampler/render/oneVar.txt b/src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/oneVar.txt similarity index 100% rename from test/resources/org/apache/jmeter/protocol/jms/sampler/render/oneVar.txt rename to src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/oneVar.txt diff --git a/test/resources/org/apache/jmeter/protocol/jms/sampler/render/utf8.txt b/src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/utf8.txt similarity index 100% rename from test/resources/org/apache/jmeter/protocol/jms/sampler/render/utf8.txt rename to src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/utf8.txt diff --git a/src/junit/test/AfterAnnotatedTest.java b/src/protocol/junit-sample/src/main/java/test/AfterAnnotatedTest.java similarity index 100% rename from src/junit/test/AfterAnnotatedTest.java rename to src/protocol/junit-sample/src/main/java/test/AfterAnnotatedTest.java diff --git a/src/junit/test/BeforeAnnotatedTest.java b/src/protocol/junit-sample/src/main/java/test/BeforeAnnotatedTest.java similarity index 100% rename from src/junit/test/BeforeAnnotatedTest.java rename to src/protocol/junit-sample/src/main/java/test/BeforeAnnotatedTest.java diff --git a/src/junit/test/DummyAnnotatedTest.java b/src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java similarity index 100% rename from src/junit/test/DummyAnnotatedTest.java rename to src/protocol/junit-sample/src/main/java/test/DummyAnnotatedTest.java diff --git a/src/junit/test/Junit4AnnotationsTest.java b/src/protocol/junit-sample/src/main/java/test/Junit4AnnotationsTest.java similarity index 100% rename from src/junit/test/Junit4AnnotationsTest.java rename to src/protocol/junit-sample/src/main/java/test/Junit4AnnotationsTest.java diff --git a/src/junit/test/RerunTest.java b/src/protocol/junit-sample/src/main/java/test/RerunTest.java similarity index 100% rename from src/junit/test/RerunTest.java rename to src/protocol/junit-sample/src/main/java/test/RerunTest.java diff --git a/src/junit/test/SetupTestError.java b/src/protocol/junit-sample/src/main/java/test/SetupTestError.java similarity index 100% rename from src/junit/test/SetupTestError.java rename to src/protocol/junit-sample/src/main/java/test/SetupTestError.java diff --git a/src/junit/test/SetupTestFail.java b/src/protocol/junit-sample/src/main/java/test/SetupTestFail.java similarity index 100% rename from src/junit/test/SetupTestFail.java rename to src/protocol/junit-sample/src/main/java/test/SetupTestFail.java diff --git a/src/junit/test/TearDownTestFail.java b/src/protocol/junit-sample/src/main/java/test/TearDownTestFail.java similarity index 100% rename from src/junit/test/TearDownTestFail.java rename to src/protocol/junit-sample/src/main/java/test/TearDownTestFail.java diff --git a/src/junit/woolfel/DummyTestCase.java b/src/protocol/junit-sample/src/main/java/woolfel/DummyTestCase.java similarity index 100% rename from src/junit/woolfel/DummyTestCase.java rename to src/protocol/junit-sample/src/main/java/woolfel/DummyTestCase.java diff --git a/src/junit/woolfel/SubDummyTest.java b/src/protocol/junit-sample/src/main/java/woolfel/SubDummyTest.java similarity index 100% rename from src/junit/woolfel/SubDummyTest.java rename to src/protocol/junit-sample/src/main/java/woolfel/SubDummyTest.java diff --git a/src/junit/woolfel/SubDummyTest2.java b/src/protocol/junit-sample/src/main/java/woolfel/SubDummyTest2.java similarity index 100% rename from src/junit/woolfel/SubDummyTest2.java rename to src/protocol/junit-sample/src/main/java/woolfel/SubDummyTest2.java diff --git a/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java similarity index 100% rename from src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java rename to src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java diff --git a/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java similarity index 100% rename from src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java rename to src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java diff --git a/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java b/src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java similarity index 100% rename from src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java rename to src/protocol/junit/src/main/java/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgument.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgument.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgument.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgument.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArguments.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArguments.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArguments.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArguments.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java b/src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java similarity index 100% rename from src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java rename to src/protocol/ldap/src/main/java/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java diff --git a/test/src/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java b/src/protocol/ldap/src/test/java/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java rename to src/protocol/ldap/src/test/java/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileMessage.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileMessage.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileMessage.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileMessage.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileStore.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/LocalTrustStoreSSLSocketFactory.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java diff --git a/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java similarity index 100% rename from src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java rename to src/protocol/mail/src/main/java/org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.java diff --git a/src/protocol/mail/META-INF/javamail.providers b/src/protocol/mail/src/main/resources/META-INF/javamail.providers similarity index 100% rename from src/protocol/mail/META-INF/javamail.providers rename to src/protocol/mail/src/main/resources/META-INF/javamail.providers diff --git a/test/src/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java b/src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java rename to src/protocol/mail/src/test/java/org/apache/jmeter/protocol/mail/sampler/TestMailReaderSampler.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java rename to src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java rename to src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java rename to src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java rename to src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/EvalResultHandler.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java rename to src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java rename to src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/mongo/MongoUtils.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java rename to src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java rename to src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSampler.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java rename to src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerBeanInfo.java diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties rename to src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties rename to src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties rename to src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties diff --git a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties b/src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties similarity index 100% rename from src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties rename to src/protocol/mongodb/src/main/resources/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties diff --git a/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java b/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java similarity index 100% rename from src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java rename to src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/SystemSampler.java diff --git a/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java b/src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java similarity index 100% rename from src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java rename to src/protocol/native/src/main/java/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/AbstractTCPClient.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/ReadException.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/ReadException.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/ReadException.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/ReadException.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecorator.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java similarity index 100% rename from src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java rename to src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java diff --git a/test/src/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImplTest.java b/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImplTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImplTest.java rename to src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImplTest.java diff --git a/test/src/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImplTest.java b/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImplTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImplTest.java rename to src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImplTest.java diff --git a/test/src/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecoratorTest.java b/src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecoratorTest.java similarity index 100% rename from test/src/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecoratorTest.java rename to src/protocol/tcp/src/test/java/org/apache/jmeter/protocol/tcp/sampler/TCPClientDecoratorTest.java diff --git a/test/src/org/apache/jmeter/junit/spock/JMeterSpec.groovy b/test/src/org/apache/jmeter/junit/spock/JMeterSpec.groovy deleted file mode 100644 index 86cbccfc524..00000000000 --- a/test/src/org/apache/jmeter/junit/spock/JMeterSpec.groovy +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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. - */ - -package org.apache.jmeter.junit.spock - -import org.apache.jmeter.util.JMeterUtils -import spock.lang.Specification - -import java.nio.charset.Charset - -/** - * Common setup for Spock test cases. - *

- * Please only use this class if you need the things set up here. - *

- * Otherwise, extend {@link Specification} - */ -abstract class JMeterSpec extends Specification { - - // Used by findTestFile - private static final String filePrefix - - /* - * If not running under AllTests.java, make sure that the properties (and - * log file) are set up correctly. - * - * N.B. This assumes the JUnit test are executed in the - * project root, bin directory or one level down, and all the JMeter jars - * (plus any others needed at run-time) need to be on the classpath. - */ - static { - if (JMeterUtils.getJMeterProperties() == null) { - String file = "jmeter.properties" - File f = new File(file) - if (!f.canRead()) { - System.out.println("Can't find " + file + " - trying bin directory") - if (!new File("bin/" + file).canRead()) { - // When running tests inside IntelliJ - System.out.println("Can't find " + file + " - trying ../bin directory") - filePrefix = "../bin/" // JMeterUtils assumes Unix-style separators - file = filePrefix + file - } else { - filePrefix = "bin/" // JMeterUtils assumes Unix-style separators - file = filePrefix + file - } - } else { - filePrefix = "" - } - // Used to be done in initializeProperties - String home = new File(System.getProperty("user.dir"), filePrefix).getParent() - System.out.println("Setting JMeterHome: " + home) - JMeterUtils.setJMeterHome(home) - System.setProperty("jmeter.home", home) // needed for scripts - JMeterUtils jmu = new JMeterUtils() - try { - jmu.initializeProperties(file) - } catch (MissingResourceException e) { - System.out.println("** Can't find resources - continuing anyway **") - } - System.out.println("JMeterVersion=" + JMeterUtils.getJMeterVersion()) - logprop("java.version") - logprop("java.vm.name") - logprop("java.vendor") - logprop("java.home") - logprop("file.encoding") - // Display actual encoding used (will differ if file.encoding is not recognised) - System.out.println("default encoding=" + Charset.defaultCharset()) - logprop("user.home") - logprop("user.dir") - logprop("user.language") - logprop("user.region") - logprop("user.country") - logprop("user.variant") - System.out.println("Locale=" + Locale.getDefault().toString()) - logprop("java.class.version") - logprop("java.awt.headless") - logprop("os.name") - logprop("os.version") - logprop("os.arch") - logprop("java.class.path") - } else { - filePrefix = "" - } - } - - private static void logprop(String prop) { - System.out.println(prop + "=" + System.getProperty(prop)) - } - - // Helper method to find a test path - protected static String findTestPath(String file) { - File f = new File(file) - if (filePrefix.length() > 0 && !f.isAbsolute()) { - return filePrefix + file// Add the offset - } - return file - } - - protected static boolean isHeadless() { - System.properties['java.awt.headless'] == 'true' - } - -} From 511ee5a2f6f79188e4ccf45e6458bd3349a46835 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Thu, 7 Mar 2019 00:21:13 +0300 Subject: [PATCH 2/7] Fix resources.PackageTest Former-commit-id: 2f5beda25c84e11ef56876ddd43c28d1a4a44b70 --- .../ResourceKeyUsageTestComponents.java | 23 ++++ .../apache/jmeter/resources/PackageTest.java | 84 +++----------- .../resources/ResourceKeyUsageTest.java | 107 ++++++++++++++++++ .../ResourceKeyUsageTestFunctions.java | 23 ++++ .../resources/ResourceKeyUsageTestFtp.java | 23 ++++ .../resources/ResourceKeyUsageTestHttp.java | 23 ++++ .../resources/ResourceKeyUsageTestJava.java | 23 ++++ .../resources/ResourceKeyUsageTestJdbc.java | 23 ++++ .../resources/ResourceKeyUsageTestJms.java | 23 ++++ .../resources/ResourceKeyUsageTestJUnit.java | 23 ++++ .../resources/ResourceKeyUsageTestLdap.java | 23 ++++ .../resources/ResourceKeyUsageTestMail.java | 23 ++++ .../ResourceKeyUsageTestMongodb.java | 23 ++++ .../resources/ResourceKeyUsageTestNative.java | 23 ++++ .../resources/ResourceKeyUsageTestTcp.java | 23 ++++ 15 files changed, 420 insertions(+), 70 deletions(-) create mode 100644 src/components/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestComponents.java create mode 100644 src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java create mode 100644 src/functions/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFunctions.java create mode 100644 src/protocol/ftp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFtp.java create mode 100644 src/protocol/http/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestHttp.java create mode 100644 src/protocol/java/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJava.java create mode 100644 src/protocol/jdbc/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJdbc.java create mode 100644 src/protocol/jms/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJms.java create mode 100644 src/protocol/junit/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJUnit.java create mode 100644 src/protocol/ldap/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestLdap.java create mode 100644 src/protocol/mail/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMail.java create mode 100644 src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java create mode 100644 src/protocol/native/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestNative.java create mode 100644 src/protocol/tcp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestTcp.java diff --git a/src/components/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestComponents.java b/src/components/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestComponents.java new file mode 100644 index 00000000000..30423934914 --- /dev/null +++ b/src/components/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestComponents.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestComponents extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java index 47ddf51a912..17cc26bd673 100644 --- a/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java +++ b/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java @@ -20,7 +20,6 @@ import java.io.BufferedReader; import java.io.File; -import java.io.FileReader; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; @@ -38,12 +37,8 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.jmeter.gui.util.JMeterMenuBar; -import org.apache.jorphan.util.JOrphanUtils; import junit.framework.Test; import junit.framework.TestCase; @@ -70,16 +65,14 @@ */ public class PackageTest extends TestCase { - private static final String basedir = new File(System.getProperty("user.dir")).getParent(); // assumes the test starts in the bin directory - - private static final File srcFiledir = new File(basedir,"src"); + // We assume the test starts in "src/core" directory (which is true for Gradle and IDEs) + private static final File srcFiledir = new File("src/main/java"); + private static final File resourceFiledir = new File("src/main/resources"); private static final String MESSAGES = "messages"; private static PropertyResourceBundle defaultPRB; // current default language properties file - private static PropertyResourceBundle messagePRB; // messages.properties - private static final CharsetEncoder ASCII_ENCODER = Charset.forName("US-ASCII").newEncoder(); // Ensure properties files don't use special characters @@ -141,9 +134,11 @@ private void readRF(String res, List l) throws Exception { } } - if (!isPureAscii(val)) { - failures.add("Message format should be pure ASCII. Actual format is " + val); - } + // We don't need to verify ASCII as build system ensures the final properties will be in ASCII + // The proper test would be to get value of a well-known resource and validate it + //if (!isPureAscii(val)) { + // failures.add("Message format should be pure ASCII. Actual format is " + val); + //} } } } @@ -187,9 +182,6 @@ private void check(String resname, boolean checkUnexpected) throws Exception { if (defaultPRB == null){ throw new IOException("Could not find required file: "+res); } - if (resourcePrefix.endsWith(MESSAGES)) { - messagePRB = defaultPRB; - } } else if (checkUnexpected) { // Check all the keys are in the default props file PropertyResourceBundle prb = getRAS(res); @@ -217,7 +209,7 @@ private void check(String resname, boolean checkUnexpected) throws Exception { fail(String.join("\n", failures)); } - private static final String[] prefixList = getResources(srcFiledir); + private static final String[] prefixList = getResources(resourceFiledir); /** * Find I18N resources in classpath @@ -225,6 +217,10 @@ private void check(String resname, boolean checkUnexpected) throws Exception { * @return list of properties files subject to I18N */ public static String[] getResources(File srcFileDir) { + if (!srcFileDir.exists() && "resources".equals(srcFileDir.getName())) { + // Allow non-existing resources directory + return new String[0]; + } Set set = new TreeSet<>(); findFile(srcFileDir, set, new FilenameFilter() { @Override @@ -250,7 +246,7 @@ public boolean accept(File dir, String name) { * filter that the files must satisfy to be included into * set */ - private static void findFile(File file, Set set, + static void findFile(File file, Set set, FilenameFilter filenameFilter) { File[] foundFiles = file.listFiles(filenameFilter); assertNotNull("Not a directory: "+file, foundFiles); @@ -291,7 +287,6 @@ public static Test suite() { // ts.addTest(new PackageTest("checkI18n", Locale.JAPANESE.toString())); // ts.addTest(new PackageTest("checkI18n", Locale.SIMPLIFIED_CHINESE.toString())); // ts.addTest(new PackageTest("checkI18n", Locale.TRADITIONAL_CHINESE.toString())); - ts.addTest(new PackageTest("checkResourceReferences", "")); return ts; } @@ -387,55 +382,4 @@ private String printLabels(Map> missingLabelsPerBund } return builder.toString(); } - - // Check that calls to getResString use a valid property key name - public void checkResourceReferences() { - final AtomicInteger errors = new AtomicInteger(0); - findFile(srcFiledir, null, new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - final File file = new File(dir, name); - // Look for calls to JMeterUtils.getResString() - final Pattern pat = Pattern.compile(".*getResString\\(\"([^\"]+)\"\\).*"); - if (name.endsWith(".java")) { - BufferedReader fileReader = null; - try { - fileReader = new BufferedReader(new FileReader(file)); - String s; - while ((s = fileReader.readLine()) != null) { - if (s.matches("\\s*//.*")) { // leading comment - continue; - } - Matcher m = pat.matcher(s); - if (m.matches()) { - final String key = m.group(1); - // Resource keys cannot contain spaces, and are forced to lower case - String resKey = key.replace(' ', '_'); // $NON-NLS-1$ // $NON-NLS-2$ - resKey = resKey.toLowerCase(java.util.Locale.ENGLISH); - if (!key.equals(resKey)) { - System.out.println(file+": non-standard message key: '"+key+"'"); - } - try { - messagePRB.getString(resKey); - } catch (MissingResourceException e) { - System.out.println(file+": missing message key: '"+key+"'"); - errors.incrementAndGet(); - } - } - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - JOrphanUtils.closeQuietly(fileReader); - } - - } - return file.isDirectory(); - } - }); - int errs = errors.get(); - if (errs > 0) { - fail("Detected "+errs+" missing message property keys"); - } - } } diff --git a/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java new file mode 100644 index 00000000000..587265d109b --- /dev/null +++ b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java @@ -0,0 +1,107 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.MissingResourceException; +import java.util.PropertyResourceBundle; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.jorphan.util.JOrphanUtils; +import org.junit.Test; + +public class ResourceKeyUsageTest { + // We assume the test starts in "module" (e.g. src/core) directory (which is true for Gradle and IDEs) + private static final File srcFiledir = new File("src/main/java"); + + // Read resource into ResourceBundle and store in List + private PropertyResourceBundle getRAS(String res) throws Exception { + InputStream ras = this.getClass().getResourceAsStream(res); + if (ras == null) { + return null; + } + return new PropertyResourceBundle(ras); + } + + // Check that calls to getResString use a valid property key name + @Test + public void checkResourceReferences() throws Exception { + String resourceName = "/org/apache/jmeter/resources/messages.properties"; + PropertyResourceBundle messagePRB = getRAS(resourceName); + assertNotNull("Resource bundle " + resourceName + " was not found", resourceName); + List failures = new ArrayList<>(); + + PackageTest.findFile(srcFiledir, null, new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + final File file = new File(dir, name); + // Look for calls to JMeterUtils.getResString() + final Pattern pat = Pattern.compile(".*getResString\\(\"([^\"]+)\"\\).*"); + if (name.endsWith(".java")) { + BufferedReader fileReader = null; + try { + fileReader = new BufferedReader(new FileReader(file)); + String s; + while ((s = fileReader.readLine()) != null) { + if (s.matches("\\s*//.*")) { // leading comment + continue; + } + Matcher m = pat.matcher(s); + if (m.matches()) { + final String key = m.group(1); + // Resource keys cannot contain spaces, and are forced to lower case + String resKey = key.replace(' ', '_'); // $NON-NLS-1$ // $NON-NLS-2$ + resKey = resKey.toLowerCase(java.util.Locale.ENGLISH); + if (!key.equals(resKey)) { + System.out.println(file+": non-standard message key: '"+key+"'"); + } + try { + messagePRB.getString(resKey); + } catch (MissingResourceException e) { + failures.add(file+": missing message key: '"+key+"'"); + } + } + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + JOrphanUtils.closeQuietly(fileReader); + } + + } + return file.isDirectory(); + } + }); + if (failures.isEmpty()) { + return; + } + fail(String.join("\n", failures)); + } +} diff --git a/src/functions/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFunctions.java b/src/functions/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFunctions.java new file mode 100644 index 00000000000..7116c9302a9 --- /dev/null +++ b/src/functions/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFunctions.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestFunctions extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/ftp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFtp.java b/src/protocol/ftp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFtp.java new file mode 100644 index 00000000000..63bb2671754 --- /dev/null +++ b/src/protocol/ftp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFtp.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestFtp extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestHttp.java b/src/protocol/http/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestHttp.java new file mode 100644 index 00000000000..7ca2d7a3462 --- /dev/null +++ b/src/protocol/http/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestHttp.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestHttp extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/java/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJava.java b/src/protocol/java/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJava.java new file mode 100644 index 00000000000..0840dc2aa93 --- /dev/null +++ b/src/protocol/java/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJava.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestJava extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/jdbc/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJdbc.java b/src/protocol/jdbc/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJdbc.java new file mode 100644 index 00000000000..43090e1a46e --- /dev/null +++ b/src/protocol/jdbc/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJdbc.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestJdbc extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/jms/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJms.java b/src/protocol/jms/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJms.java new file mode 100644 index 00000000000..4030d59f865 --- /dev/null +++ b/src/protocol/jms/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJms.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestJms extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/junit/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJUnit.java b/src/protocol/junit/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJUnit.java new file mode 100644 index 00000000000..c6231a74a2f --- /dev/null +++ b/src/protocol/junit/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJUnit.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestJUnit extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/ldap/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestLdap.java b/src/protocol/ldap/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestLdap.java new file mode 100644 index 00000000000..6865c6bf36e --- /dev/null +++ b/src/protocol/ldap/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestLdap.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestLdap extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/mail/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMail.java b/src/protocol/mail/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMail.java new file mode 100644 index 00000000000..3842f1fc0d7 --- /dev/null +++ b/src/protocol/mail/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMail.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestMail extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java b/src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java new file mode 100644 index 00000000000..ad8a6342176 --- /dev/null +++ b/src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestMongodb extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/native/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestNative.java b/src/protocol/native/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestNative.java new file mode 100644 index 00000000000..705ef0fe28c --- /dev/null +++ b/src/protocol/native/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestNative.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestNative extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/tcp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestTcp.java b/src/protocol/tcp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestTcp.java new file mode 100644 index 00000000000..2b53d41a18f --- /dev/null +++ b/src/protocol/tcp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestTcp.java @@ -0,0 +1,23 @@ +/* + * 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. + * + */ + +package org.apache.jmeter.resources; + +public class ResourceKeyUsageTestTcp extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} From f0417ec776ee9f7e52f785def1c30fd1e9694d23 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Wed, 15 May 2019 12:01:56 +0300 Subject: [PATCH 3/7] Remove java.class.path filtering from ClassFinder Former-commit-id: 42ab5641290fe8fb9f57ccd71d9a9e73e4f4bd40 --- .../apache/jorphan/reflect/ClassFinder.java | 89 ++++--------------- 1 file changed, 16 insertions(+), 73 deletions(-) diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java index 102338df268..fee4cd86bde 100644 --- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java +++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassFinder.java @@ -24,15 +24,14 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Set; -import java.util.StringTokenizer; import java.util.TreeSet; -import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -187,22 +186,19 @@ public static List findClassesThatExtend(String[] paths, Class[] supe } // For each directory in the search path, add all the jars found there - private static String[] addJarsInPath(String[] paths) { - Set fullList = new HashSet<>(); + private static Set addJarsInPath(String[] paths) { + Set fullList = new HashSet<>(); for (final String path : paths) { - fullList.add(path); // Keep the unexpanded path File dir = new File(path); + fullList.add(dir); if (dir.exists() && dir.isDirectory()) { - String[] jars = dir.list((f, name) -> { - File fileInDirectory = new File(f, name); - return fileInDirectory.isFile() && name.endsWith(DOT_JAR); - }); + File[] jars = dir.listFiles(f -> f.isFile() && f.getName().endsWith(DOT_JAR)); if (jars != null) { Collections.addAll(fullList, jars); } } } - return fullList.toArray(new String[fullList.size()]); + return fullList; } /** @@ -322,21 +318,14 @@ public static List findClasses(String[] searchPathsOrJars, ClassFilter f } // Find all jars in the search path - List strPathsOrJars = Arrays.stream(addJarsInPath(searchPathsOrJars)) - .map(ClassFinder::fixPathEntry) - .collect(Collectors.toList()); + Collection strPathsOrJars = addJarsInPath(searchPathsOrJars); - // Now eliminate any classpath entries that do not "match" the search - List listPaths = getClasspathMatches(strPathsOrJars); - if (log.isDebugEnabled()) { - for (String path : listPaths) { - log.debug("listPaths : {}", path); - } - } + // Some of the jars might be out of classpath, however java.class.path does not represent + // the actual ClassLoader in use. For instance, NewDriver builds its own classpath Set listClasses = new TreeSet<>(); // first get all the classes - for (String path : listPaths) { + for (File path : strPathsOrJars) { findClassesInOnePath(path, listClasses, filter); } @@ -350,50 +339,6 @@ public static List findClasses(String[] searchPathsOrJars, ClassFilter f return new ArrayList<>(listClasses); } - /** - * Returns the classpath entries that match the search list of jars and paths - * - * @param strPathsOrJars can contain {@code null} element but must not be {@code null} - * @return List of paths (jars or folders) that ends with one of the rows of strPathsOrJars - */ - private static List getClasspathMatches(List strPathsOrJars) { - final String javaClassPath = System.getProperty("java.class.path"); // $NON-NLS-1$ - if (log.isDebugEnabled()) { - log.debug("Classpath = {}", javaClassPath); - for (int i = 0; i < strPathsOrJars.size(); i++) { - log.debug("strPathsOrJars[{}] : {}", i, strPathsOrJars.get(i)); - } - } - - // find all jar files or paths that end with strPathOrJar - List listPaths = new ArrayList<>(); - String classpathElement; - StringTokenizer classpathElements = - new StringTokenizer(javaClassPath, File.pathSeparator); - - while (classpathElements.hasMoreTokens()) { - classpathElement = fixPathEntry(classpathElements.nextToken()); - if (classpathElement == null) { - continue; - } - boolean found = false; - for (String currentStrPathOrJar : strPathsOrJars) { - log.debug("Testing if {} ends with {}", classpathElement, currentStrPathOrJar); - if (currentStrPathOrJar != null && classpathElement.endsWith(currentStrPathOrJar)) { - found = true; - log.debug("Adding {}", classpathElement); - listPaths.add(classpathElement); - break;// no need to look further - } - } - if (!found) { - log.debug("Classpath element {} does not match any search path {}", classpathElement, - strPathsOrJars); - } - } - return listPaths; - } - /** * Fix a path: *