You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2002/08/07 20:49:38 UTC
cvs commit: jakarta-jmeter/xdocs/demos AssertionTestPlan.jmx AuthManagerTestPlan.jmx HeaderManagerTestPlan.jmx InterleaveTestPlan.jmx InterleaveTestPlan2.jmx LoopTestPlan.jmx OnceOnlyTestPlan.jmx SimpleTestPlan.jmx
mstover1 2002/08/07 11:49:38
Modified: docs/demos AssertionTestPlan.jmx AuthManagerTestPlan.jmx
HeaderManagerTestPlan.jmx InterleaveTestPlan.jmx
InterleaveTestPlan2.jmx LoopTestPlan.jmx
OnceOnlyTestPlan.jmx SimpleTestPlan.jmx
src_1/org/apache/jmeter/control/gui TestPlanGui.java
src_1/org/apache/jmeter/gui/action Load.java
src_1/org/apache/jmeter/save/old JMeterNameSpaceHandler.java
src_1/org/apache/jmeter/save/old/handlers
AssertionHandler.java JMeterHandler.java
src_1/org/apache/jmeter/save/old/xml XmlHandler.java
xdocs/demos AssertionTestPlan.jmx AuthManagerTestPlan.jmx
HeaderManagerTestPlan.jmx InterleaveTestPlan.jmx
InterleaveTestPlan2.jmx LoopTestPlan.jmx
OnceOnlyTestPlan.jmx SimpleTestPlan.jmx
Added: bin/testfiles AssertionTestPlan.jmx AuthManagerTestPlan.jmx
HeaderManagerTestPlan.jmx InterleaveTestPlan.jmx
InterleaveTestPlan2.jmx LoopTestPlan.jmx
OnceOnlyTestPlan.jmx ProxyServerTestPlan.jmx
SimpleTestPlan.jmx URLRewritingExample.jmx
Log:
Improving support for loading JMeter 1.7 .jmx files
Revision Changes Path
1.1 jakarta-jmeter/bin/testfiles/AssertionTestPlan.jmx
Index: AssertionTestPlan.jmx
===================================================================
<?xml version="1.0"?>
<TestPlan>
<threadgroups>
<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
<controllers>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
<configElements>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="HTTP Request" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="domain">jakarta.apache.org</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
<assertion name="Assertion" class="org.apache.jmeter.assertions.Assertion" testType="2" testField="sampler.RESPONSE">
<testString></html></testString>
</assertion>
</HttpTestSample>
</controllers>
</LoopController>
</controllers>
<timers>
</timers>
<listeners>
<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="assertion.dat"/>
<JMeterComponent type="org.apache.jmeter.reporters.AssertionReporter" name="Assertion Results"/>
</listeners>
</ThreadGroup>
</threadgroups>
<configElements>
</configElements>
</TestPlan>
1.1 jakarta-jmeter/bin/testfiles/AuthManagerTestPlan.jmx
Index: AuthManagerTestPlan.jmx
===================================================================
<?xml version="1.0"?>
<TestPlan>
<threadgroups>
<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
<controllers>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
<configElements>
<AuthManager name="HTTP Authorization Manager">
<ConfigElement type="org.apache.jmeter.protocol.http.control.Authorization">
<property name="password">spot</property>
<property name="url">http://localhost/secret</property>
<property name="username">kevin</property>
</ConfigElement>
</AuthManager>
<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
<property name="name">HTTP Request Defaults</property>
<property name="PROTOCOL">http</property>
<property name="domain">localhost</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="SecretPage1" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/secret/index.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="SecretPage2" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/secret/index2.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="NoSecretPage" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/index.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</LoopController>
</controllers>
<timers>
</timers>
<listeners>
<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="auth-manager.dat"/>
</listeners>
</ThreadGroup>
</threadgroups>
<configElements>
</configElements>
</TestPlan>
1.1 jakarta-jmeter/bin/testfiles/HeaderManagerTestPlan.jmx
Index: HeaderManagerTestPlan.jmx
===================================================================
<?xml version="1.0"?>
<TestPlan>
<threadgroups>
<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
<controllers>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
<configElements>
<HeaderManager name="HTTP Header Manager">
<ConfigElement type="org.apache.jmeter.protocol.http.control.Header">
<property name="name">User-Agent</property>
<property name="value">Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)</property>
</ConfigElement>
</HeaderManager>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="HTTP Request" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="domain">jakarta.apache.org</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</LoopController>
</controllers>
<timers>
</timers>
<listeners>
<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="header-manager.dat"/>
</listeners>
</ThreadGroup>
</threadgroups>
<configElements>
</configElements>
</TestPlan>
1.1 jakarta-jmeter/bin/testfiles/InterleaveTestPlan.jmx
Index: InterleaveTestPlan.jmx
===================================================================
<?xml version="1.0"?>
<TestPlan>
<threadgroups>
<ThreadGroup name="Jakarta Users" numThreads="2" rampUp="0">
<controllers>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="5">
<configElements>
</configElements>
<controllers>
<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
<configElements>
<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
<property name="name">Defaults</property>
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="method">GET</property>
</ConfigElement>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="News Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="domain"></property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/site/news.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="FAQ Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/site/faqs.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Gump Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/gump</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</Controller>
</controllers>
</LoopController>
</controllers>
<timers>
</timers>
<listeners>
<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="interleave-test.dat"/>
</listeners>
</ThreadGroup>
</threadgroups>
<configElements>
</configElements>
</TestPlan>
1.1 jakarta-jmeter/bin/testfiles/InterleaveTestPlan2.jmx
Index: InterleaveTestPlan2.jmx
===================================================================
<?xml version="1.0"?>
<TestPlan>
<threadgroups>
<ThreadGroup name="Jakarta Users" numThreads="1" rampUp="0">
<controllers>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="8">
<configElements>
</configElements>
<controllers>
<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
<configElements>
<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
<property name="name">Defaults</property>
<property name="PROTOCOL">http</property>
<property name="domain">jakarta.apache.org</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement>
</configElements>
<controllers>
<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
<configElements>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="CVS Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/site/cvsindex.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</Controller>
<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
<configElements>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Bug Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/site/bugs.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="FAQ Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/site/faqs.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</Controller>
</controllers>
</Controller>
</controllers>
</LoopController>
</controllers>
<timers>
</timers>
<listeners>
<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="interleave-test2.dat"/>
</listeners>
</ThreadGroup>
</threadgroups>
<configElements>
</configElements>
</TestPlan>
1.1 jakarta-jmeter/bin/testfiles/LoopTestPlan.jmx
Index: LoopTestPlan.jmx
===================================================================
<?xml version="1.0"?>
<TestPlan>
<threadgroups>
<ThreadGroup name="Jakarta Users" numThreads="1" rampUp="0">
<controllers>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
<configElements>
<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
<property name="name">Defaults</property>
<property name="PROTOCOL">http</property>
<property name="domain">jakarta.apache.org</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="5">
<configElements>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="News Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/site/news.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</LoopController>
</controllers>
</LoopController>
</controllers>
<timers>
</timers>
<listeners>
<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="loop-test.dat"/>
</listeners>
</ThreadGroup>
</threadgroups>
<configElements>
</configElements>
</TestPlan>
1.1 jakarta-jmeter/bin/testfiles/OnceOnlyTestPlan.jmx
Index: OnceOnlyTestPlan.jmx
===================================================================
<?xml version="1.0"?>
<TestPlan>
<threadgroups>
<ThreadGroup name="Jakarta Users" numThreads="2" rampUp="0">
<controllers>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="3">
<configElements>
<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
<property name="name">Defaults</property>
<property name="PROTOCOL">http</property>
<property name="domain">jakarta.apache.org</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement>
</configElements>
<controllers>
<Controller type="org.apache.jmeter.control.OnceOnlyController" name="Once Only Controller">
<configElements>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</Controller>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Bug Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/site/bugs.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</LoopController>
</controllers>
<timers>
</timers>
<listeners>
<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="once-only-test.dat"/>
</listeners>
</ThreadGroup>
</threadgroups>
<configElements>
</configElements>
</TestPlan>
1.1 jakarta-jmeter/bin/testfiles/ProxyServerTestPlan.jmx
Index: ProxyServerTestPlan.jmx
===================================================================
<?xml version="1.0"?>
<TestPlan>
<threadgroups>
<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
<controllers>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
<configElements>
<ProxyControl type="org.apache.jmeter.protocol.http.proxy.ProxyControl">
<property name="port">8080</property>
<property name="name">HTTP Proxy Server</property>
<property name="includes"><Arguments>
</Arguments>
</property>
<property name="excludes"><Arguments>
</Arguments>
</property>
</ProxyControl>
</configElements>
<controllers>
</controllers>
</LoopController>
</controllers>
<timers>
</timers>
<listeners>
</listeners>
</ThreadGroup>
</threadgroups>
<configElements>
</configElements>
</TestPlan>
1.1 jakarta-jmeter/bin/testfiles/SimpleTestPlan.jmx
Index: SimpleTestPlan.jmx
===================================================================
<?xml version="1.0"?>
<TestPlan>
<threadgroups>
<ThreadGroup name="Jakarta Users" numThreads="1" rampUp="0">
<controllers>
<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
<configElements>
<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
<property name="name">Defaults</property>
<property name="PROTOCOL">http</property>
<property name="domain">jakarta.apache.org</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/</property>
<property name="method">GET</property>
</ConfigElement>
</configElements>
<controllers>
<Controller type="org.apache.jmeter.control.LogicController" name="Ant Pages">
<configElements>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/ant/index.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="News Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/ant/antnews.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</Controller>
<Controller type="org.apache.jmeter.control.LogicController" name="Log4J Pages">
<configElements>
</configElements>
<controllers>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/log4j/index.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="History Page" getImages="false">
<defaultUrl>
<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
<property name="PROTOCOL">http</property>
<property name="arguments"><Arguments>
</Arguments>
</property>
<property name="path">/log4j/docs/history.html</property>
<property name="method">GET</property>
</ConfigElement></defaultUrl>
<configElements>
</configElements>
<controllers>
</controllers>
</HttpTestSample>
</controllers>
</Controller>
</controllers>
</LoopController>
</controllers>
<timers>
</timers>
<listeners>
<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="simple-test.dat"/>
</listeners>
</ThreadGroup>
</threadgroups>
<configElements>
</configElements>
</TestPlan>
1.1 jakarta-jmeter/bin/testfiles/URLRewritingExample.jmx
Index: URLRewritingExample.jmx
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<node>
<testelement class="org.apache.jmeter.threads.ThreadGroup">
<property name="TestElement.name">URL Re-writing Example</property>
<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
<property name="TestElement.name">Loop Controller</property>
<property name="LoopController.continue_forever">false</property>
<property name="LoopController.loops">-1</property>
<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
</testelement>
<property name="ThreadGroup.num_threads">1</property>
<property name="ThreadGroup.ramp_time">0</property>
<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
</testelement>
<node>
<testelement class="org.apache.jmeter.control.GenericController">
<property name="TestElement.test_class">org.apache.jmeter.control.GenericController</property>
<property name="TestElement.name">Simple Controller</property>
<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</property>
</testelement>
<node>
<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
<property name="TestElement.name">Login</property>
<property name="HTTPSampler.method">POST</property>
<property name="HTTPSampler.port">80</property>
<property name="HTTPSampler.mimetype"> </property>
<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
<property name="TestElement.name"> </property>
<collection name="Arguments.arguments" class="java.util.ArrayList">
<testelement class="org.apache.jmeter.config.Argument">
<property name="Argument.name">username</property>
<property name="Argument.value">user</property>
</testelement>
<testelement class="org.apache.jmeter.config.Argument">
<property name="Argument.name">password</property>
<property name="Argument.value">password</property>
</testelement>
</collection>
<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
</testelement>
<property name="HTTPSampler.follow_redirects">true</property>
<property name="HTTPSampler.protocol">http</property>
<property name="HTTPSampler.FILE_FIELD"> </property>
<property name="HTTPSampler.path">/main.jsp</property>
<property name="HTTPSampler.use_keepalive">true</property>
<property name="HTTPSampler.domain">my.server.com</property>
<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
<property name="HTTPSampler.FILE_NAME"> </property>
</testelement>
</node>
<node>
<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
<property name="TestElement.name">Do Something interesting</property>
<property name="HTTPSampler.method">GET</property>
<property name="HTTPSampler.mimetype"> </property>
<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
<property name="TestElement.name"> </property>
<collection name="Arguments.arguments" class="java.util.ArrayList"/>
<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
</testelement>
<property name="HTTPSampler.follow_redirects">true</property>
<property name="HTTPSampler.protocol">http</property>
<property name="HTTPSampler.FILE_FIELD"> </property>
<property name="HTTPSampler.path">/something_interesting.jsp</property>
<property name="HTTPSampler.use_keepalive">true</property>
<property name="HTTPSampler.domain">my.server.com</property>
<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
<property name="HTTPSampler.FILE_NAME"> </property>
</testelement>
</node>
<node>
<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
<property name="TestElement.name">Another Interesting Request</property>
<property name="HTTPSampler.method">POST</property>
<property name="HTTPSampler.mimetype"> </property>
<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
<property name="TestElement.name"> </property>
<collection name="Arguments.arguments" class="java.util.ArrayList"/>
<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
</testelement>
<property name="HTTPSampler.follow_redirects">true</property>
<property name="HTTPSampler.protocol">http</property>
<property name="HTTPSampler.FILE_FIELD"> </property>
<property name="HTTPSampler.path">/another.jsp</property>
<property name="HTTPSampler.use_keepalive">true</property>
<property name="HTTPSampler.domain">my.server.com</property>
<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
<property name="HTTPSampler.FILE_NAME"> </property>
</testelement>
</node>
<node>
<testelement class="org.apache.jmeter.protocol.http.modifier.URLRewritingModifier">
<property name="TestElement.test_class">org.apache.jmeter.protocol.http.modifier.URLRewritingModifier</property>
<property name="TestElement.name">HTTP URL-Rewriting Modifier</property>
<property name="argument_name">SESSION_ID</property>
<property name="path_extension">false</property>
<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.modifier.gui.URLRewritingModifierGui</property>
</testelement>
</node>
</node>
</node>
1.3 +83 -45 jakarta-jmeter/docs/demos/AssertionTestPlan.jmx
Index: AssertionTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/demos/AssertionTestPlan.jmx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AssertionTestPlan.jmx 23 Jul 2002 18:06:27 -0000 1.2
+++ AssertionTestPlan.jmx 7 Aug 2002 18:49:37 -0000 1.3
@@ -1,45 +1,83 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="HTTP Request" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-<assertion name="Assertion" class="org.apache.jmeter.assertions.Assertion" testType="2" testField="sampler.RESPONSE">
-<testString></html></testString>
-</assertion>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="assertion.dat"/>
-<JMeterComponent type="org.apache.jmeter.reporters.AssertionReporter" name="Assertion Results"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Thread Group</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">HTTP Request</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.assertions.Assertion">
+<property name="TestElement.test_class">org.apache.jmeter.assertions.Assertion</property>
+<property name="TestElement.name">Assertion</property>
+<property name="Assertion.test_type">2</property>
+<property name="Assertion.test_field">Assertion.response_data</property>
+<collection name="Asserion.test_strings" class="java.util.ArrayList">
+<string></html></string>
+</collection>
+<property name="TestElement.gui_class">org.apache.jmeter.assertions.gui.AssertionGui</property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">assertion.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">Assertion Results</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.AssertionVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.3 +146 -90 jakarta-jmeter/docs/demos/AuthManagerTestPlan.jmx
Index: AuthManagerTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/demos/AuthManagerTestPlan.jmx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AuthManagerTestPlan.jmx 23 Nov 2001 14:22:54 -0000 1.2
+++ AuthManagerTestPlan.jmx 7 Aug 2002 18:49:37 -0000 1.3
@@ -1,90 +1,146 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-<AuthManager name="HTTP Authorization Manager">
-<ConfigElement type="org.apache.jmeter.protocol.http.control.Authorization">
-<property name="password">spot</property>
-<property name="url">http://localhost/secret</property>
-<property name="username">kevin</property>
-</ConfigElement>
-</AuthManager>
-
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">HTTP Request Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">localhost</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="SecretPage1" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/secret/index.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="SecretPage2" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/secret/index2.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="NoSecretPage" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/index.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="auth-manager.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Thread Group</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.control.AuthManager">
+<property name="TestElement.name">HTTP Authorization Manager</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.control.AuthManager</property>
+<collection name="AuthManager.auth_list" class="java.util.ArrayList">
+<testelement class="org.apache.jmeter.protocol.http.control.Authorization">
+<property name="Authorization.username">kevin</property>
+<property name="Authorization.url">http://localhost/secret</property>
+<property name="Authorization.password">spot</property>
+</testelement>
+</collection>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.AuthPanel</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">HTTP Request Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">localhost</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">SecretPage1</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/secret/index.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">SecretPage2</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/secret/index2.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">NoSecretPage</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/index.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">auth-manager.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +77 -48 jakarta-jmeter/docs/demos/HeaderManagerTestPlan.jmx
Index: HeaderManagerTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/demos/HeaderManagerTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeaderManagerTestPlan.jmx 23 Nov 2001 15:16:16 -0000 1.1
+++ HeaderManagerTestPlan.jmx 7 Aug 2002 18:49:37 -0000 1.2
@@ -1,48 +1,77 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-<HeaderManager name="HTTP Header Manager">
-<ConfigElement type="org.apache.jmeter.protocol.http.control.Header">
-<property name="name">User-Agent</property>
-<property name="value">Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)</property>
-</ConfigElement>
-</HeaderManager>
-
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="HTTP Request" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="header-manager.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Thread Group</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.control.HeaderManager">
+<property name="TestElement.name">HTTP Header Manager</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.control.HeaderManager</property>
+<collection name="HeaderManager.headers" class="java.util.ArrayList">
+<testelement class="org.apache.jmeter.protocol.http.control.Header">
+<property name="TestElement.name">User-Agent</property>
+<property name="Header.value">Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)</property>
+</testelement>
+</collection>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HeaderPanel</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">HTTP Request</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">header-manager.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +124 -87 jakarta-jmeter/docs/demos/InterleaveTestPlan.jmx
Index: InterleaveTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/demos/InterleaveTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InterleaveTestPlan.jmx 19 Nov 2001 22:34:08 -0000 1.1
+++ InterleaveTestPlan.jmx 7 Aug 2002 18:49:37 -0000 1.2
@@ -1,87 +1,124 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="2" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="5">
-<configElements>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="News Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="domain"></property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/news.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="FAQ Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/faqs.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Gump Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/gump</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="interleave-test.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList">
+<testelement class="org.apache.jmeter.config.Argument">
+<property name="Argument.name">server</property>
+<property name="Argument.value">jakarta.apache.org</property>
+</testelement>
+</collection>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">5</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">2</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.control.InterleaveControl">
+<property name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
+<property name="TestElement.name">Interleave Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">News Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/news.html</property>
+<property name="HTTPSampler.domain">${server}</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">FAQ Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/faqs.html</property>
+<property name="HTTPSampler.domain">${server}</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Gump Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/gump</property>
+<property name="HTTPSampler.domain">${server}</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">interleave-test.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +184 -116 jakarta-jmeter/docs/demos/InterleaveTestPlan2.jmx
Index: InterleaveTestPlan2.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/demos/InterleaveTestPlan2.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InterleaveTestPlan2.jmx 19 Nov 2001 22:34:08 -0000 1.1
+++ InterleaveTestPlan2.jmx 7 Aug 2002 18:49:37 -0000 1.2
@@ -1,116 +1,184 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="8">
-<configElements>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="CVS Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/cvsindex.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Bug Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/bugs.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="FAQ Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/faqs.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-</controllers>
-</Controller>
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="interleave-test2.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">8</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.control.InterleaveControl">
+<property name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
+<property name="TestElement.name">Interleave Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.InterleaveControl">
+<property name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
+<property name="TestElement.name">Interleave Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">CVS Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/cvsindex.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.InterleaveControl">
+<property name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
+<property name="TestElement.name">Interleave Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Bug Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/bugs.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">FAQ Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/faqs.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">interleave-test2.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">View Results Tree</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.ViewResultsFullVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +117 -72 jakarta-jmeter/docs/demos/LoopTestPlan.jmx
Index: LoopTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/demos/LoopTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoopTestPlan.jmx 20 Nov 2001 14:02:24 -0000 1.1
+++ LoopTestPlan.jmx 7 Aug 2002 18:49:37 -0000 1.2
@@ -1,72 +1,117 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="5">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="News Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/news.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="loop-test.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">true</property>
+<property name="LoopController.loops">5</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">News Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/news.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">loop-test.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +115 -72 jakarta-jmeter/docs/demos/OnceOnlyTestPlan.jmx
Index: OnceOnlyTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/demos/OnceOnlyTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OnceOnlyTestPlan.jmx 22 Nov 2001 13:18:59 -0000 1.1
+++ OnceOnlyTestPlan.jmx 7 Aug 2002 18:49:37 -0000 1.2
@@ -1,72 +1,115 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="2" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="3">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.OnceOnlyController" name="Once Only Controller">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Bug Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/bugs.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="once-only-test.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">3</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">2</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.OnceOnlyController">
+<property name="TestElement.test_class">org.apache.jmeter.control.OnceOnlyController</property>
+<property name="TestElement.name">Once Only Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.OnceOnlyControllerGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Bug Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/bugs.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">once-only-test.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +170 -110 jakarta-jmeter/docs/demos/SimpleTestPlan.jmx
Index: SimpleTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/demos/SimpleTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleTestPlan.jmx 22 Nov 2001 13:18:59 -0000 1.1
+++ SimpleTestPlan.jmx 7 Aug 2002 18:49:37 -0000 1.2
@@ -1,110 +1,170 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.LogicController" name="Ant Pages">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/ant/index.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="News Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/ant/antnews.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-<Controller type="org.apache.jmeter.control.LogicController" name="Log4J Pages">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/log4j/index.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="History Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/log4j/docs/history.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="simple-test.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.GenericController">
+<property name="TestElement.test_class">org.apache.jmeter.control.GenericController</property>
+<property name="TestElement.name">Ant Pages</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/ant/index.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">News Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/ant/antnews.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.GenericController">
+<property name="TestElement.test_class">org.apache.jmeter.control.GenericController</property>
+<property name="TestElement.name">Log4J Pages</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/log4j/index.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">History Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/log4j/docs/history.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">simple-test.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.7 +5 -2 jakarta-jmeter/src_1/org/apache/jmeter/control/gui/TestPlanGui.java
Index: TestPlanGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/gui/TestPlanGui.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestPlanGui.java 18 Jul 2002 03:44:21 -0000 1.6
+++ TestPlanGui.java 7 Aug 2002 18:49:37 -0000 1.7
@@ -107,7 +107,10 @@
{
super.configure(el);
functionalMode.setSelected(((AbstractTestElement)el).getPropertyAsBoolean(TestPlan.FUNCTIONAL_MODE));
- argsPanel.configure((Arguments)el.getProperty(TestPlan.USER_DEFINED_VARIABLES));
+ if(el.getProperty(TestPlan.USER_DEFINED_VARIABLES) != null)
+ {
+ argsPanel.configure((Arguments)el.getProperty(TestPlan.USER_DEFINED_VARIABLES));
+ }
}
/****************************************
1.16 +160 -2 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Load.java 6 Aug 2002 16:04:42 -0000 1.15
+++ Load.java 7 Aug 2002 18:49:37 -0000 1.16
@@ -64,7 +64,10 @@
import java.util.Set;
import javax.swing.JFileChooser;
+import junit.framework.TestCase;
+
import org.apache.jmeter.control.GenericController;
+import org.apache.jmeter.control.gui.LogicControllerGui;
import org.apache.jmeter.control.gui.WorkBenchGui;
import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
@@ -141,7 +144,6 @@
}
catch(Throwable ex)
{
- ex.printStackTrace();
try
{
legacyLoad(f);
@@ -250,4 +252,160 @@
}
}
}
+
+ /************************************************************
+ * !ToDo (Class description)
+ *
+ *@author $Author$
+ *@created $Date$
+ *@version $Revision$
+ ***********************************************************/
+ public static class Test extends TestCase {
+ File testFile1, testFile2, testFile3,testFile4,testFile5,testFile6,testFile7,
+ testFile8,testFile9,testFile10,testFile11,testFile12,testFile13;
+ static Load loader = new Load();
+
+ public Test(String name) {
+ super(name);
+ }
+
+ /************************************************************
+ * !ToDo
+ ***********************************************************/
+ public void setUp() {
+ testFile1 =
+ new File(System.getProperty("user.dir") + "/testfiles", "Test Plan.jmx");
+ testFile2 =
+ new File(
+ System.getProperty("user.dir") + "/testfiles",
+ "Modification Manager.jmx");
+ testFile3 =
+ new File(System.getProperty("user.dir") + "/testfiles", "proxy.jmx");
+ testFile4 =
+ new File(System.getProperty("user.dir") + "/testfiles", "assertionTestPlan.jmx");
+ testFile5 =
+ new File(System.getProperty("user.dir") + "/testfiles", "AuthManagerTestPlan.jmx");
+ testFile6 =
+ new File(System.getProperty("user.dir") + "/testfiles", "HeaderManagerTestPlan.jmx");
+ testFile7 =
+ new File(System.getProperty("user.dir") + "/testfiles", "InterleaveTestPlan.jmx");
+ testFile8 =
+ new File(System.getProperty("user.dir") + "/testfiles", "InterleaveTestPlan2.jmx");
+ testFile9 =
+ new File(System.getProperty("user.dir") + "/testfiles", "LoopTestPlan.jmx");
+ testFile10 =
+ new File(System.getProperty("user.dir") + "/testfiles", "OnceOnlyTestPlan.jmx");
+ testFile11 =
+ new File(System.getProperty("user.dir") + "/testfiles", "ProxyServerTestPlan.jmx");
+ testFile12 =
+ new File(System.getProperty("user.dir") + "/testfiles", "SimpleTestPlan.jmx");
+ testFile13 =
+ new File(System.getProperty("user.dir") + "/testfiles", "URLRewritingExample.jmx");
+ }
+
+ /************************************************************
+ * !ToDo
+ *
+ *@exception Exception !ToDo (Exception description)
+ ***********************************************************/
+ public void testUpdateTree() throws Exception {
+ ListedHashTree tree = getTree(testFile2);
+ loader.updateTree(tree);
+ assertTrue(tree.list(tree.list().get(0)).get(0) instanceof GenericController);
+ loader.convertTree(tree);
+ assertEquals(new LogicControllerGui().getStaticLabel(),
+ ((JMeterGUIComponent)tree.list(tree.list().get(0)).get(0)).getStaticLabel());
+ }
+
+ public void testFile3() throws Exception {
+ ListedHashTree tree = getTree(testFile3);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.threads.ThreadGroup);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.threads.gui.ThreadGroupGui);
+ }
+
+ public void testFile4() throws Exception {
+ ListedHashTree tree = getTree(testFile4);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.control.gui.TestPlanGui);
+ }
+
+ public void testFile5() throws Exception {
+ ListedHashTree tree = getTree(testFile5);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.control.gui.TestPlanGui);
+ }
+
+ public void testFile6() throws Exception {
+ ListedHashTree tree = getTree(testFile6);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.control.gui.TestPlanGui);
+ }
+
+ public void testFile7() throws Exception {
+ ListedHashTree tree = getTree(testFile7);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.control.gui.TestPlanGui);
+ }
+
+ public void testFile8() throws Exception {
+ ListedHashTree tree = getTree(testFile8);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.control.gui.TestPlanGui);
+ }
+
+ public void testFile9() throws Exception {
+ ListedHashTree tree = getTree(testFile9);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.control.gui.TestPlanGui);
+ }
+
+ public void testFile10() throws Exception {
+ ListedHashTree tree = getTree(testFile10);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.control.gui.TestPlanGui);
+ }
+
+ public void testFile11() throws Exception {
+ ListedHashTree tree = getTree(testFile11);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.control.gui.TestPlanGui);
+ }
+
+ public void testFile12() throws Exception {
+ ListedHashTree tree = getTree(testFile12);
+ //loader.updateTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
+ loader.convertTree(tree);
+ assertTrue(tree.list().get(0) instanceof org.apache.jmeter.control.gui.TestPlanGui);
+ }
+
+ private ListedHashTree getTree(File f) throws Exception {
+ FileInputStream reader = new FileInputStream(f);
+ XmlHandler handler = new XmlHandler(new JMeterNameSpaceHandler());
+ XMLReader parser = JMeterUtils.getXMLParser();
+ parser.setContentHandler(handler);
+ parser.setErrorHandler(handler);
+ parser.parse(new InputSource(reader));
+ ListedHashTree tree = handler.getDataTree();
+ return tree;
+ }
+ }
}
1.4 +5 -101 jakarta-jmeter/src_1/org/apache/jmeter/save/old/JMeterNameSpaceHandler.java
Index: JMeterNameSpaceHandler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/JMeterNameSpaceHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMeterNameSpaceHandler.java 5 Aug 2002 19:09:00 -0000 1.3
+++ JMeterNameSpaceHandler.java 7 Aug 2002 18:49:37 -0000 1.4
@@ -121,109 +121,13 @@
handler.setTagName(handler.getPrimaryTagName());
handler.setAtts(atts);
return handler;
- } catch (Exception ex) {
- //ex.printStackTrace();
+ } catch(NullPointerException e)
+ {
+ return null;
+ }catch (Exception ex) {
+ ex.printStackTrace();
return null;
}
- }
-
- /************************************************************
- * !ToDo (Class description)
- *
- *@author $Author$
- *@created $Date$
- *@version $Revision$
- ***********************************************************/
- public static class Test extends TestCase {
- File testFile1, testFile2, testFile3,testFile4;
- static Load loader = new Load();
-
- public Test(String name) {
- super(name);
- }
-
- private void updateTree(ListedHashTree tree) {
- List items = new LinkedList(tree.list());
- Iterator iter = items.iterator();
-
- while (iter.hasNext()) {
- Object item = iter.next();
- if (item instanceof HTTPSampler) {
- List subItems = new LinkedList(tree.list(item));
- boolean replaced = false;
- Iterator iter2 = subItems.iterator();
- while (iter2.hasNext()) {
- TestElement config = (TestElement)iter2.next();
- if (config.getPropertyAsString(TestElement.TEST_CLASS).equals(
- "org.apache.jmeter.protocol.http.config.UrlConfig")) {
- replaced = true;
- HTTPSampler newControl = new HTTPSampler();
- newControl.addTestElement( config);
- tree.get(item).replace(config, newControl);
- }
- }
-
- if (replaced) {
- ((TestElement)item).setProperty(TestElement.GUI_CLASS,UrlConfigGui.class.getName());
- GenericController newControl = new GenericController();
- tree.replace(item, newControl);
- tree.add(newControl, item);
- }
- } else {
- updateTree(tree.get(item));
- }
- }
- }
-
- /************************************************************
- * !ToDo
- ***********************************************************/
- public void setUp() {
- testFile1 =
- new File(System.getProperty("user.dir") + "/testfiles", "Test Plan.jmx");
- testFile2 =
- new File(
- System.getProperty("user.dir") + "/testfiles",
- "Modification Manager.jmx");
- testFile3 =
- new File(System.getProperty("user.dir") + "/testfiles", "proxy.jmx");
- testFile4 =
- new File(System.getProperty("user.dir") + "/../docs/demos", "assertionTestPlan.jmx");
- }
-
- /************************************************************
- * !ToDo
- *
- *@exception Exception !ToDo (Exception description)
- ***********************************************************/
- public void testUpdateTree() throws Exception {
- ListedHashTree tree = getTree(testFile2);
- updateTree(tree);
- assertTrue(tree.list(tree.list().get(0)).get(0) instanceof GenericController);
- }
-
- public void testFile3() throws Exception {
- ListedHashTree tree = getTree(testFile3);
- //loader.updateTree(tree);
- assertTrue(tree.list().get(0) instanceof org.apache.jmeter.threads.ThreadGroup);
- }
-
- public void testFile4() throws Exception {
- ListedHashTree tree = getTree(testFile4);
- //loader.updateTree(tree);
- assertTrue(tree.list().get(0) instanceof org.apache.jmeter.testelement.TestPlan);
- }
-
- private ListedHashTree getTree(File f) throws Exception {
- FileInputStream reader = new FileInputStream(f);
- XmlHandler handler = new XmlHandler(new JMeterNameSpaceHandler());
- XMLReader parser = JMeterUtils.getXMLParser();
- parser.setContentHandler(handler);
- parser.setErrorHandler(handler);
- parser.parse(new InputSource(reader));
- ListedHashTree tree = handler.getDataTree();
- return tree;
- }
}
}
1.4 +9 -5 jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/AssertionHandler.java
Index: AssertionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/AssertionHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AssertionHandler.java 23 Jul 2002 18:06:31 -0000 1.3
+++ AssertionHandler.java 7 Aug 2002 18:49:37 -0000 1.4
@@ -58,11 +58,15 @@
public void setAtts(Attributes atts) throws ClassNotFoundException,IllegalAccessException,InstantiationException
{
- model = (Assertion)Class.forName(atts.getValue("class")).newInstance();
- model.setName(atts.getValue("name"));
- model.setTestType(Integer.parseInt(atts.getValue(JMeterHandler.convertProperty("testType"))));
- model.setTestField(atts.getValue(JMeterHandler.convertProperty("testField")));
- model.setProperty(TestElement.GUI_CLASS,JMeterHandler.getGuiClass(atts.getValue("type")));
+ try {
+ model = (Assertion)Class.forName(atts.getValue("class")).newInstance();
+ model.setName(atts.getValue("name"));
+ model.setTestType(Integer.parseInt(atts.getValue("testType")));
+ model.setTestField(JMeterHandler.convertProperty(atts.getValue("testField")));
+ model.setProperty(TestElement.GUI_CLASS,JMeterHandler.getGuiClass(atts.getValue("class")));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
public void testString(String data)
1.6 +3 -3 jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JMeterHandler.java
Index: JMeterHandler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JMeterHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMeterHandler.java 23 Jul 2002 18:06:31 -0000 1.5
+++ JMeterHandler.java 7 Aug 2002 18:49:37 -0000 1.6
@@ -85,7 +85,7 @@
static
{
- guiClassMap.put("org.apache.jmeter.protocol.http.config.UrlConfig","org.apache.jmeter.protocol.http.config.gui.MultipartUrlConfigGui");
+ guiClassMap.put("org.apache.jmeter.protocol.http.config.UrlConfig","org.apache.jmeter.protocol.http.config.gui.UrlConfigGui");
guiClassMap.put("org.apache.jmeter.control.ModifyController","org.apache.jmeter.control.gui.LogicControllerGui");
guiClassMap.put("org.apache.jmeter.control.LogicController",
"org.apache.jmeter.control.gui.LogicControllerGui");
@@ -127,8 +127,8 @@
propertyConversion.put("method",HTTPSampler.METHOD);
propertyConversion.put("domain",HTTPSampler.DOMAIN);
propertyConversion.put("path",HTTPSampler.PATH);
- propertyConversion.put("testType",Assertion.TEST_TYPE);
- propertyConversion.put("testField",Assertion.TEST_FIELD);
+ propertyConversion.put("sampler.RESPONSE",Assertion.RESPONSE_DATA);
+ propertyConversion.put("sampler.LABEL",Assertion.SAMPLE_LABEL);
propertyConversion.put("name",TestElement.NAME);
1.2 +2 -3 jakarta-jmeter/src_1/org/apache/jmeter/save/old/xml/XmlHandler.java
Index: XmlHandler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/xml/XmlHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XmlHandler.java 1 Jun 2002 13:21:28 -0000 1.1
+++ XmlHandler.java 7 Aug 2002 18:49:38 -0000 1.2
@@ -327,8 +327,7 @@
while (iter.hasNext())
{
TagHandler item = (TagHandler)iter.next();
- tree.set(item.getModel(), tree.get(item));
- tree.remove(item);
+ tree.replace(item,item.getModel());
replaceWithModels(tree.get(item.getModel()));
}
}
1.2 +83 -45 jakarta-jmeter/xdocs/demos/AssertionTestPlan.jmx
Index: AssertionTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/demos/AssertionTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AssertionTestPlan.jmx 25 Nov 2001 16:09:19 -0000 1.1
+++ AssertionTestPlan.jmx 7 Aug 2002 18:49:38 -0000 1.2
@@ -1,45 +1,83 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="HTTP Request" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-<assertion name="Assertion" class="org.apache.jmeter.assertions.Assertion" testType="2" testField="sampler.RESPONSE">
-<testString></html></testString>
-</assertion>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="assertion.dat"/>
-<JMeterComponent type="org.apache.jmeter.reporters.AssertionReporter" name="Assertion Results"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Thread Group</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">HTTP Request</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.assertions.Assertion">
+<property name="TestElement.test_class">org.apache.jmeter.assertions.Assertion</property>
+<property name="TestElement.name">Assertion</property>
+<property name="Assertion.test_type">2</property>
+<property name="Assertion.test_field">Assertion.response_data</property>
+<collection name="Asserion.test_strings" class="java.util.ArrayList">
+<string></html></string>
+</collection>
+<property name="TestElement.gui_class">org.apache.jmeter.assertions.gui.AssertionGui</property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">assertion.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">Assertion Results</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.AssertionVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.3 +146 -90 jakarta-jmeter/xdocs/demos/AuthManagerTestPlan.jmx
Index: AuthManagerTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/demos/AuthManagerTestPlan.jmx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AuthManagerTestPlan.jmx 23 Nov 2001 14:23:06 -0000 1.2
+++ AuthManagerTestPlan.jmx 7 Aug 2002 18:49:38 -0000 1.3
@@ -1,90 +1,146 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-<AuthManager name="HTTP Authorization Manager">
-<ConfigElement type="org.apache.jmeter.protocol.http.control.Authorization">
-<property name="password">spot</property>
-<property name="url">http://localhost/secret</property>
-<property name="username">kevin</property>
-</ConfigElement>
-</AuthManager>
-
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">HTTP Request Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">localhost</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="SecretPage1" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/secret/index.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="SecretPage2" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/secret/index2.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="NoSecretPage" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/index.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="auth-manager.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Thread Group</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.control.AuthManager">
+<property name="TestElement.name">HTTP Authorization Manager</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.control.AuthManager</property>
+<collection name="AuthManager.auth_list" class="java.util.ArrayList">
+<testelement class="org.apache.jmeter.protocol.http.control.Authorization">
+<property name="Authorization.username">kevin</property>
+<property name="Authorization.url">http://localhost/secret</property>
+<property name="Authorization.password">spot</property>
+</testelement>
+</collection>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.AuthPanel</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">HTTP Request Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">localhost</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">SecretPage1</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/secret/index.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">SecretPage2</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/secret/index2.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">NoSecretPage</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/index.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">auth-manager.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +77 -48 jakarta-jmeter/xdocs/demos/HeaderManagerTestPlan.jmx
Index: HeaderManagerTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/demos/HeaderManagerTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeaderManagerTestPlan.jmx 23 Nov 2001 15:16:27 -0000 1.1
+++ HeaderManagerTestPlan.jmx 7 Aug 2002 18:49:38 -0000 1.2
@@ -1,48 +1,77 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-<HeaderManager name="HTTP Header Manager">
-<ConfigElement type="org.apache.jmeter.protocol.http.control.Header">
-<property name="name">User-Agent</property>
-<property name="value">Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)</property>
-</ConfigElement>
-</HeaderManager>
-
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="HTTP Request" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="header-manager.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Thread Group</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.control.HeaderManager">
+<property name="TestElement.name">HTTP Header Manager</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.control.HeaderManager</property>
+<collection name="HeaderManager.headers" class="java.util.ArrayList">
+<testelement class="org.apache.jmeter.protocol.http.control.Header">
+<property name="TestElement.name">User-Agent</property>
+<property name="Header.value">Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)</property>
+</testelement>
+</collection>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HeaderPanel</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">HTTP Request</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">header-manager.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +124 -87 jakarta-jmeter/xdocs/demos/InterleaveTestPlan.jmx
Index: InterleaveTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/demos/InterleaveTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InterleaveTestPlan.jmx 19 Nov 2001 22:33:35 -0000 1.1
+++ InterleaveTestPlan.jmx 7 Aug 2002 18:49:38 -0000 1.2
@@ -1,87 +1,124 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="2" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="5">
-<configElements>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="News Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="domain"></property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/news.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="FAQ Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/faqs.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Gump Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/gump</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="interleave-test.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList">
+<testelement class="org.apache.jmeter.config.Argument">
+<property name="Argument.name">server</property>
+<property name="Argument.value">jakarta.apache.org</property>
+</testelement>
+</collection>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">5</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">2</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.control.InterleaveControl">
+<property name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
+<property name="TestElement.name">Interleave Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">News Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/news.html</property>
+<property name="HTTPSampler.domain">${server}</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">FAQ Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/faqs.html</property>
+<property name="HTTPSampler.domain">${server}</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Gump Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/gump</property>
+<property name="HTTPSampler.domain">${server}</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">interleave-test.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +184 -116 jakarta-jmeter/xdocs/demos/InterleaveTestPlan2.jmx
Index: InterleaveTestPlan2.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/demos/InterleaveTestPlan2.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InterleaveTestPlan2.jmx 19 Nov 2001 22:33:35 -0000 1.1
+++ InterleaveTestPlan2.jmx 7 Aug 2002 18:49:38 -0000 1.2
@@ -1,116 +1,184 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="8">
-<configElements>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="CVS Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/cvsindex.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-<Controller type="org.apache.jmeter.control.InterleaveControl" name="Interleave Controller">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Bug Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/bugs.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="FAQ Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/faqs.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-</controllers>
-</Controller>
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="interleave-test2.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">8</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.control.InterleaveControl">
+<property name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
+<property name="TestElement.name">Interleave Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.InterleaveControl">
+<property name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
+<property name="TestElement.name">Interleave Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">CVS Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/cvsindex.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.InterleaveControl">
+<property name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
+<property name="TestElement.name">Interleave Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Bug Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/bugs.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">FAQ Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/faqs.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">interleave-test2.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">View Results Tree</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.ViewResultsFullVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +117 -72 jakarta-jmeter/xdocs/demos/LoopTestPlan.jmx
Index: LoopTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/demos/LoopTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoopTestPlan.jmx 20 Nov 2001 14:02:05 -0000 1.1
+++ LoopTestPlan.jmx 7 Aug 2002 18:49:38 -0000 1.2
@@ -1,72 +1,117 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="5">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="News Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/news.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="loop-test.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">true</property>
+<property name="LoopController.loops">5</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">News Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/news.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">loop-test.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +115 -72 jakarta-jmeter/xdocs/demos/OnceOnlyTestPlan.jmx
Index: OnceOnlyTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/demos/OnceOnlyTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OnceOnlyTestPlan.jmx 22 Nov 2001 13:19:12 -0000 1.1
+++ OnceOnlyTestPlan.jmx 7 Aug 2002 18:49:38 -0000 1.2
@@ -1,72 +1,115 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="2" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="3">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.OnceOnlyController" name="Once Only Controller">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Bug Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/site/bugs.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="once-only-test.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">3</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">2</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.OnceOnlyController">
+<property name="TestElement.test_class">org.apache.jmeter.control.OnceOnlyController</property>
+<property name="TestElement.name">Once Only Controller</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.OnceOnlyControllerGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Bug Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/site/bugs.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">once-only-test.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
1.2 +170 -110 jakarta-jmeter/xdocs/demos/SimpleTestPlan.jmx
Index: SimpleTestPlan.jmx
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/demos/SimpleTestPlan.jmx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleTestPlan.jmx 22 Nov 2001 13:19:12 -0000 1.1
+++ SimpleTestPlan.jmx 7 Aug 2002 18:49:38 -0000 1.2
@@ -1,110 +1,170 @@
-<?xml version="1.0"?>
-
-<TestPlan>
-<threadgroups>
-<ThreadGroup name="Jakarta Users" numThreads="1" rampUp="0">
-<controllers>
-<LoopController type="org.apache.jmeter.control.LoopController" name="Loop Controller" iterations="1">
-<configElements>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.UrlConfig">
-<property name="name">Defaults</property>
-<property name="PROTOCOL">http</property>
-<property name="domain">jakarta.apache.org</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/</property>
-<property name="method">GET</property>
-</ConfigElement>
-</configElements>
-<controllers>
-<Controller type="org.apache.jmeter.control.LogicController" name="Ant Pages">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/ant/index.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="News Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/ant/antnews.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-<Controller type="org.apache.jmeter.control.LogicController" name="Log4J Pages">
-<configElements>
-</configElements>
-<controllers>
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="Home Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/log4j/index.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-<HttpTestSample type="org.apache.jmeter.protocol.http.control.HttpTestSample" name="History Page" getImages="false">
-<defaultUrl>
-<ConfigElement type="org.apache.jmeter.protocol.http.config.MultipartUrlConfig">
-<property name="PROTOCOL">http</property>
-<property name="arguments"><Arguments>
-</Arguments>
-</property>
-<property name="path">/log4j/docs/history.html</property>
-<property name="method">GET</property>
-</ConfigElement></defaultUrl>
-<configElements>
-</configElements>
-<controllers>
-</controllers>
-</HttpTestSample>
-
-</controllers>
-</Controller>
-</controllers>
-</LoopController>
-</controllers>
-<timers>
-</timers>
-<listeners>
-<Filer type="org.apache.jmeter.reporters.Filer" name="File Reporter" verbose="true" append="false" autoFlush="false" viewSubmitData="true" file="simple-test.dat"/>
-</listeners>
-</ThreadGroup>
-
-</threadgroups>
-<configElements>
-</configElements>
-</TestPlan>
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+<testelement class="org.apache.jmeter.testelement.TestPlan">
+<property name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</property>
+<property name="TestElement.name">Test Plan</property>
+<property name="TestPlan.functional_mode">false</property>
+<collection name="TestPlan.thread_groups" class="java.util.LinkedList"/>
+<testelement name="TestPlan.user_defined_variables" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name">Argument List</property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.threads.ThreadGroup">
+<property name="TestElement.name">Jakarta Users</property>
+<property name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</property>
+<testelement name="ThreadGroup.main_controller" class="org.apache.jmeter.control.LoopController">
+<property name="TestElement.test_class">org.apache.jmeter.control.LoopController</property>
+<property name="TestElement.name">Loop Controller</property>
+<property name="LoopController.continue_forever">false</property>
+<property name="LoopController.loops">1</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</property>
+</testelement>
+<property name="ThreadGroup.num_threads">1</property>
+<property name="ThreadGroup.ramp_time">0</property>
+<property name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.config.ConfigTestElement">
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.port"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</property>
+<property name="TestElement.name">Defaults</property>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.name"> </property>
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<collection name="Arguments.arguments" class="java.util.LinkedList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">false</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.path">/</property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="HTTPSampler.domain">jakarta.apache.org</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.UrlConfigGui</property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.GenericController">
+<property name="TestElement.test_class">org.apache.jmeter.control.GenericController</property>
+<property name="TestElement.name">Ant Pages</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/ant/index.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">News Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/ant/antnews.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.control.GenericController">
+<property name="TestElement.test_class">org.apache.jmeter.control.GenericController</property>
+<property name="TestElement.name">Log4J Pages</property>
+<property name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</property>
+</testelement>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">Home Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/log4j/index.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+<node>
+<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
+<property name="TestElement.name">History Page</property>
+<property name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
+<property name="HTTPSampler.port"> </property>
+<property name="HTTPSampler.method">GET</property>
+<property name="HTTPSampler.mimetype"> </property>
+<collection name="AbstractSampler.assertions" class="java.util.ArrayList"/>
+<testelement name="HTTPsampler.Arguments" class="org.apache.jmeter.config.Arguments">
+<property name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
+<property name="TestElement.name"> </property>
+<collection name="Arguments.arguments" class="java.util.ArrayList"/>
+<property name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</property>
+</testelement>
+<property name="HTTPSampler.follow_redirects">true</property>
+<property name="HTTPSampler.protocol">http</property>
+<property name="HTTPSampler.FILE_FIELD"> </property>
+<property name="HTTPSampler.path">/log4j/docs/history.html</property>
+<property name="HTTPSampler.domain"> </property>
+<property name="HTTPSampler.use_keepalive">false</property>
+<property name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
+<property name="HTTPSampler.FILE_NAME"> </property>
+</testelement>
+</node>
+</node>
+<node>
+<testelement class="org.apache.jmeter.reporters.ResultCollector">
+<property name="TestElement.name">File Reporter</property>
+<property name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</property>
+<property name="filename">simple-test.dat</property>
+<property name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</property>
+</testelement>
+</node>
+</node>
+</node>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>