Modified: jakarta/jmeter/branches/rel-2-1/bin/testfiles/SimpleTestPlan.jmx URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/testfiles/SimpleTestPlan.jmx?rev=332829&r1=332828&r2=332829&view=diff ============================================================================== --- jakarta/jmeter/branches/rel-2-1/bin/testfiles/SimpleTestPlan.jmx (original) +++ jakarta/jmeter/branches/rel-2-1/bin/testfiles/SimpleTestPlan.jmx Sat Nov 12 11:43:23 2005 @@ -1,194 +1,125 @@ -<jmeterTestPlan version="1.1" properties="1.7"> +<jmeterTestPlan version="1.2" properties="1.8"> <hashTree> - <TestPlan> - <collectionProp name="TestPlan.thread_groups"/> - <elementProp name="TestPlan.user_defined_variables" elementType="org.apache.jmeter.config.Arguments"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp> + <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="TestPlan" enabled="true"> + <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> <collectionProp name="Arguments.arguments"/> - <stringProp name="TestElement.name">User Defined Variables</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> </elementProp> - <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</stringProp> + <collectionProp name="TestPlan.thread_groups"/> <boolProp name="TestPlan.serialize_threadgroups">false</boolProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp> - <stringProp name="TestElement.name">TestPlan</stringProp> <boolProp name="TestPlan.functional_mode">false</boolProp> - <boolProp name="TestElement.enabled">true</boolProp> <stringProp name="TestPlan.comments"></stringProp> </TestPlan> <hashTree> - <ThreadGroup> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Jakarta Users" enabled="true"> <longProp name="ThreadGroup.start_time">0</longProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> <stringProp name="ThreadGroup.num_threads">1</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> - <stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp> - <elementProp name="ThreadGroup.main_controller" elementType="org.apache.jmeter.control.LoopController"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="LoopController" enabled="true"> <stringProp name="LoopController.loops">1</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.control.LoopController</stringProp> - <stringProp name="TestElement.name">LoopController</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> - <stringProp name="TestElement.name">Jakarta Users</stringProp> <longProp name="ThreadGroup.end_time">0</longProp> <stringProp name="ThreadGroup.on_sample_error">continue</stringProp> <stringProp name="ThreadGroup.ramp_time">0</stringProp> </ThreadGroup> <hashTree> - <ConfigTestElement> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui</stringProp> + <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="Defaults" enabled="true"> <stringProp name="HTTPSampler.path">/</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</stringProp> - <stringProp name="TestElement.name">Defaults</stringProp> <stringProp name="HTTPSampler.domain">jakarta.apache.org</stringProp> <stringProp name="HTTPSampler.protocol"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> - <stringProp name="HTTPSampler.port"></stringProp> - <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> <collectionProp name="Arguments.arguments"/> - <stringProp name="TestElement.name"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> </elementProp> + <stringProp name="HTTPSampler.port"></stringProp> </ConfigTestElement> <hashTree/> - <GenericController> - <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.control.GenericController</stringProp> - <stringProp name="TestElement.name">Ant Pages</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> - </GenericController> + <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Ant Pages" enabled="true"/> <hashTree> - <HTTPSampler> + <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Home Page" enabled="true"> <stringProp name="HTTPSampler.path">/ant/index.html</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp> <stringProp name="HTTPSampler.method">GET</stringProp> <boolProp name="HTTPSampler.use_keepalive">false</boolProp> <stringProp name="HTTPSampler.protocol">http</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> <boolProp name="HTTPSampler.image_parser">false</boolProp> <boolProp name="HTTPSampler.follow_redirects">false</boolProp> - <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> <collectionProp name="Arguments.arguments"/> - <stringProp name="TestElement.name"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> </elementProp> <stringProp name="HTTPSampler.port"></stringProp> <stringProp name="HTTPSampler.mimetype"></stringProp> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp> <stringProp name="HTTPSampler.FILE_FIELD"></stringProp> - <stringProp name="TestElement.name">Home Page</stringProp> - <stringProp name="HTTPSampler.monitor">false</stringProp> <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.monitor">false</stringProp> <stringProp name="HTTPSampler.FILE_NAME"></stringProp> <boolProp name="HTTPSampler.auto_redirects">false</boolProp> </HTTPSampler> <hashTree/> - <HTTPSampler> + <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="News Page" enabled="true"> <stringProp name="HTTPSampler.path">/ant/antnews.html</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp> <stringProp name="HTTPSampler.method">GET</stringProp> <boolProp name="HTTPSampler.use_keepalive">false</boolProp> <stringProp name="HTTPSampler.protocol">http</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> <boolProp name="HTTPSampler.image_parser">false</boolProp> <boolProp name="HTTPSampler.follow_redirects">false</boolProp> - <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> <collectionProp name="Arguments.arguments"/> - <stringProp name="TestElement.name"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> </elementProp> <stringProp name="HTTPSampler.port"></stringProp> <stringProp name="HTTPSampler.mimetype"></stringProp> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp> <stringProp name="HTTPSampler.FILE_FIELD"></stringProp> - <stringProp name="TestElement.name">News Page</stringProp> - <stringProp name="HTTPSampler.monitor">false</stringProp> <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.monitor">false</stringProp> <stringProp name="HTTPSampler.FILE_NAME"></stringProp> <boolProp name="HTTPSampler.auto_redirects">false</boolProp> </HTTPSampler> <hashTree/> </hashTree> - <GenericController> - <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.control.GenericController</stringProp> - <stringProp name="TestElement.name">Log4J Pages</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> - </GenericController> + <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Log4J Pages" enabled="true"/> <hashTree> - <HTTPSampler> + <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Home Page" enabled="true"> <stringProp name="HTTPSampler.path">/log4j/index.html</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp> <stringProp name="HTTPSampler.method">GET</stringProp> <boolProp name="HTTPSampler.use_keepalive">false</boolProp> <stringProp name="HTTPSampler.protocol">http</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> <boolProp name="HTTPSampler.image_parser">false</boolProp> <boolProp name="HTTPSampler.follow_redirects">false</boolProp> - <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> <collectionProp name="Arguments.arguments"/> - <stringProp name="TestElement.name"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> </elementProp> <stringProp name="HTTPSampler.port"></stringProp> <stringProp name="HTTPSampler.mimetype"></stringProp> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp> <stringProp name="HTTPSampler.FILE_FIELD"></stringProp> - <stringProp name="TestElement.name">Home Page</stringProp> - <stringProp name="HTTPSampler.monitor">false</stringProp> <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.monitor">false</stringProp> <stringProp name="HTTPSampler.FILE_NAME"></stringProp> <boolProp name="HTTPSampler.auto_redirects">false</boolProp> </HTTPSampler> <hashTree/> - <HTTPSampler> + <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="History Page" enabled="true"> <stringProp name="HTTPSampler.path">/log4j/docs/history.html</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp> <stringProp name="HTTPSampler.method">GET</stringProp> <boolProp name="HTTPSampler.use_keepalive">false</boolProp> <stringProp name="HTTPSampler.protocol">http</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> <boolProp name="HTTPSampler.image_parser">false</boolProp> <boolProp name="HTTPSampler.follow_redirects">false</boolProp> - <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> <collectionProp name="Arguments.arguments"/> - <stringProp name="TestElement.name"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> </elementProp> <stringProp name="HTTPSampler.port"></stringProp> <stringProp name="HTTPSampler.mimetype"></stringProp> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp> <stringProp name="HTTPSampler.FILE_FIELD"></stringProp> - <stringProp name="TestElement.name">History Page</stringProp> - <stringProp name="HTTPSampler.monitor">false</stringProp> <stringProp name="HTTPSampler.domain"></stringProp> + <stringProp name="HTTPSampler.monitor">false</stringProp> <stringProp name="HTTPSampler.FILE_NAME"></stringProp> <boolProp name="HTTPSampler.auto_redirects">false</boolProp> </HTTPSampler> <hashTree/> </hashTree> - <ResultCollector> - <stringProp name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</stringProp> - <stringProp name="TestElement.name">File Reporter</stringProp> + <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="File Reporter" enabled="true"> <objProp> - <value class="org.apache.jmeter.samplers.SampleSaveConfiguration"> + <value class="SampleSaveConfiguration"> <time>true</time> <latency>true</latency> <timestamp>true</timestamp> @@ -214,7 +145,6 @@ </value> <name>saveConfig</name> </objProp> - <boolProp name="TestElement.enabled">true</boolProp> <stringProp name="filename">simple-test.dat</stringProp> <boolProp name="ResultCollector.error_logging">false</boolProp> </ResultCollector>
Propchange: jakarta/jmeter/branches/rel-2-1/bin/testfiles/SimpleTestPlan.jmx ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Sat Nov 12 11:43:23 2005 @@ -1 +1 @@ -native +LF Modified: jakarta/jmeter/branches/rel-2-1/bin/testfiles/proxy.jmx URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/testfiles/proxy.jmx?rev=332829&r1=332828&r2=332829&view=diff ============================================================================== --- jakarta/jmeter/branches/rel-2-1/bin/testfiles/proxy.jmx (original) +++ jakarta/jmeter/branches/rel-2-1/bin/testfiles/proxy.jmx Sat Nov 12 11:43:23 2005 @@ -1,69 +1,40 @@ -<jmeterTestPlan version="1.1" properties="1.7"> +<jmeterTestPlan version="1.2" properties="1.8"> <hashTree> - <TestPlan> - <collectionProp name="TestPlan.thread_groups"/> - <elementProp name="TestPlan.user_defined_variables" elementType="org.apache.jmeter.config.Arguments"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp> + <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true"> + <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> <collectionProp name="Arguments.arguments"/> - <stringProp name="TestElement.name">User Defined Variables</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> </elementProp> - <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</stringProp> + <collectionProp name="TestPlan.thread_groups"/> <boolProp name="TestPlan.serialize_threadgroups">false</boolProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp> - <stringProp name="TestElement.name">Test Plan</stringProp> <boolProp name="TestPlan.functional_mode">false</boolProp> - <boolProp name="TestElement.enabled">true</boolProp> <stringProp name="TestPlan.comments"></stringProp> </TestPlan> <hashTree> - <ThreadGroup> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true"> <longProp name="ThreadGroup.start_time">0</longProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> <stringProp name="ThreadGroup.num_threads">1</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> - <stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp> - <elementProp name="ThreadGroup.main_controller" elementType="org.apache.jmeter.control.LoopController"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> <intProp name="LoopController.loops">-1</intProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.control.LoopController</stringProp> - <stringProp name="TestElement.name">Loop Controller</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> - <stringProp name="TestElement.name">Thread Group</stringProp> <longProp name="ThreadGroup.end_time">0</longProp> <stringProp name="ThreadGroup.on_sample_error">continue</stringProp> <stringProp name="ThreadGroup.ramp_time">0</stringProp> </ThreadGroup> <hashTree> - <GenericController> - <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.control.GenericController</stringProp> - <stringProp name="TestElement.name">Simple Controller</stringProp> - <boolProp name="TestElement.enabled">true</boolProp> - </GenericController> + <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/> <hashTree> - <ConfigTestElement> + <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true"> <stringProp name="HTTPSampler.path"></stringProp> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</stringProp> - <stringProp name="TestElement.name">HTTP Request Defaults</stringProp> <stringProp name="HTTPSampler.domain">jakarta.apache.org</stringProp> <stringProp name="HTTPSampler.protocol"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> - <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments"> - <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp> - <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp> + <stringProp name="HTTPSampler.port"></stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true"> <collectionProp name="Arguments.arguments"/> - <stringProp name="TestElement.name"></stringProp> - <boolProp name="TestElement.enabled">true</boolProp> </elementProp> - <stringProp name="HTTPSampler.port"></stringProp> </ConfigTestElement> <hashTree/> </hashTree> Propchange: jakarta/jmeter/branches/rel-2-1/bin/testfiles/proxy.jmx ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Sat Nov 12 11:43:23 2005 @@ -1 +1 @@ -native +LF --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
