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 wo...@apache.org on 2004/10/12 18:52:56 UTC

cvs commit: jakarta-jmeter/xdocs/usermanual build-monitor-test-plan.xml boss.xml glossary.xml best-practices.xml index.xml functions.xml component_reference.xml remote-test.xml

woolfel     2004/10/12 09:52:56

  Modified:    xdocs/usermanual Tag: rel-2_0 build-monitor-test-plan.xml
                        boss.xml glossary.xml best-practices.xml index.xml
                        functions.xml component_reference.xml
                        remote-test.xml
  Log:
  Reverting the docs to the older version with sebastian's fix for the bad link. since many of
  the enhancements in HEAD shouldn't be included in 2.0.2 release, it's going in the 2.1
  release.
  
  peter
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.2   +1 -1      jakarta-jmeter/xdocs/usermanual/build-monitor-test-plan.xml
  
  Index: build-monitor-test-plan.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/build-monitor-test-plan.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  
  
  
  1.11.2.2  +18 -18    jakarta-jmeter/xdocs/usermanual/boss.xml
  
  Index: boss.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/boss.xml,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- boss.xml	11 Oct 2004 18:35:52 -0000	1.11.2.1
  +++ boss.xml	12 Oct 2004 16:52:55 -0000	1.11.2.2
  @@ -25,14 +25,14 @@
   
   <body>
   
  -<section name="15. Help! My boss wants me to load test our web app!" anchor="boss">
  +<section name="14. Help! My boss wants me to load test our web app!" anchor="boss">
   <p>This is a fairly open-ended proposition. There are a number of questions to
   be asked first, and additionally a number of resources that will be needed. You
   will need some hardware to run the benchmarks/load-tests from. A number of
   tools will prove useful. There are a number of products to consider.  And finally,
   why is Java a good choice to implement a load-testing/Benchmarking product.
   </p>
  -<subsection name="15.1 Questions to ask">
  +<subsection name="14.1 Questions to ask">
   <p>What is our anticipated average number of users (normal load) ?
   </p>
   <p>What is our anticipated peak number of users ?
  @@ -44,13 +44,13 @@
   (cookies, session-rewriting, or some other method) ?
   </p>
   </subsection>
  -<subsection name="15.2 Resources">
  +<subsection name="14.2 Resources">
   <p>The following resources will prove very helpful. Bear in mind that if you
   cannot locate these resources, <b>you</b> will become these resources. As you
   already have your work cut out for you, it is worth knowing who the following
   people are, so that you can ask them for help if you need it.
   </p>
  -	<subsection name="15.2.1 Network">
  +	<subsection name="14.2.1 Network">
   	<p>Who knows our network topology ? If you run into any firewall or
   	proxy issues, this will become very important. As well, a private
   	testing network (which will therefore have very low network latency)
  @@ -60,7 +60,7 @@
   	hardware ?
   	</p>
   	</subsection>
  -	<subsection name="15.2.2 Application">
  +	<subsection name="14.2.2 Application">
   	<p>Who knows how our application functions ? The normal sequence is
   	<ul>
   		<li>test (low-volume - can we benchmark our application?)</li>
  @@ -77,7 +77,7 @@
   	</p>
   	</subsection>
   </subsection>
  -<subsection name="15.3 What platform should I use to run the benchmarks/load-tests ?">
  +<subsection name="14.3 What platform should I use to run the benchmarks/load-tests ?">
   <p>This should be a widely-used piece of hardware, with a standard
   (i.e. vanilla) software installation. Remember, if you publish your results,
   the first thing your clients will do is hire a graduate student to verify them.
  @@ -108,20 +108,20 @@
   The batch log file can then be loaded into JMeter on a workstation for analysis, or you can
   use CSV output and import the data into a spreadsheet.</p>
   </subsection>
  -<subsection name="15.4 Tools">
  +<subsection name="14.4 Tools">
   <p>The following tools will all prove useful. It is definitely worthwhile to
   become familiar with them. This should include trying them out, and reading the
   appropriate documentation (man-pages, info-files, application --help messages,
   and any supplied documentation).
   </p>
  -	<subsection name="15.4.1 ping">
  +	<subsection name="14.4.1 ping">
   	<p>
   	This can be used to establish whether or not you can reach your
   	target site. Options can be specified so that 'ping' provides the
   	same type of route reporting as 'traceroute'.
   	</p>
   	</subsection>
  -	<subsection name="15.4.2 nslookup/dig">
  +	<subsection name="14.4.2 nslookup/dig">
   	<p>
   	While the <u>user</u> will normally use a human-readable internet
   	address, <u>you</u> may wish to avoid the overhead of DNS lookups when
  @@ -129,7 +129,7 @@
   	the unique address (dotted quad) of your target site.
   	</p>
   	</subsection>
  -	<subsection name="15.4.3 traceroute">
  +	<subsection name="14.4.3 traceroute">
   	<p>
   	If you cannot "ping" your target site, this may be used to determine 
   	the problem (possibly a firewall or a proxy). It can also be used
  @@ -140,7 +140,7 @@
   	</p>
   	</subsection>
   </subsection>
  -<subsection name="15.5 What other products are there ?">
  +<subsection name="14.5 What other products are there ?">
   <p>There are a number of commercial products, which generally have fairly
   hefty pricetags. If you can justify it, these are probably the way to go.
   If, however, these products do not do exactly what you want, or you are on a
  @@ -148,7 +148,7 @@
   start by trying the Apache <b>ab</b> tool, as it may very well do the job
   if your requirements are not particularly complicated.
   </p>
  -	<subsection name="15.5.1 Apache 'ab' tool">
  +	<subsection name="14.5.1 Apache 'ab' tool">
   	<p>
   	You should definitely start with this one. It handles HTTP 'get' requests
   	very well, and can be made to handle HTTP 'post' requests with a little
  @@ -156,7 +156,7 @@
   	performance reporting.
   	</p>
   	</subsection>
  -	<subsection name="15.5.2 HttpUnit">
  +	<subsection name="14.5.2 HttpUnit">
   	<p>
   	This is worth a look. It is a library (and therefore of more interest to
   	developers) that can be used to perform HTTP tests/benchmarks. It is
  @@ -164,14 +164,14 @@
   	conjunction with <b>JUnit</b>.
   	</p>
   	</subsection>
  -	<subsection name="15.5.3 Microsoft WAS">
  +	<subsection name="14.5.3 Microsoft WAS">
   	<p>
   	This is definitely worth a look. It has an excellent user interface
   	but it may not do exactly what you want. If this is the case, be aware
   	that the functionality of this product is not likely to change.
   	</p>
   	</subsection>
  -	<subsection name="15.5.4 JMeter">
  +	<subsection name="14.5.4 JMeter">
   	<p>
   	If you have non-standard requirements, then this solution offers an
   	open-source community to provide them (of course, if you are reading
  @@ -180,7 +180,7 @@
   	</p>
   	</subsection>
   </subsection>
  -<subsection name="15.6 Why Java ?">
  +<subsection name="14.6 Why Java ?">
   <p>Why not Perl or C ?
   </p>
   <p>Well, Perl might be a very good choice except that the Benchmark package
  
  
  
  1.8.2.2   +3 -3      jakarta-jmeter/xdocs/usermanual/glossary.xml
  
  Index: glossary.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/glossary.xml,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- glossary.xml	11 Oct 2004 18:35:52 -0000	1.8.2.1
  +++ glossary.xml	12 Oct 2004 16:52:55 -0000	1.8.2.2
  @@ -23,7 +23,7 @@
   
   <body>
   
  -<section name="18. Glossary" anchor="glossary">
  +<section name="17. Glossary" anchor="glossary">
   </section>
   
   </body>
  
  
  
  1.10.2.2  +7 -7      jakarta-jmeter/xdocs/usermanual/best-practices.xml
  
  Index: best-practices.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/best-practices.xml,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- best-practices.xml	11 Oct 2004 18:35:52 -0000	1.10.2.1
  +++ best-practices.xml	12 Oct 2004 16:52:55 -0000	1.10.2.2
  @@ -25,10 +25,10 @@
   
   <body>
   
  -<section name="14. Best Practices" anchor="best_practices">
  +<section name="13. Best Practices" anchor="best_practices">
   </section>
   
  -<section name="14.1 Limit the Number of Threads" anchor="limit_threads">
  +<section name="13.1 Limit the Number of Threads" anchor="limit_threads">
   <p>Your hardware's capabilities will limit the number of threads you can effectively
   run with JMeter.  It will also depend on how fast your server is (a faster server
   gives makes JMeter work harder since it returns request quicker).  The more
  @@ -38,17 +38,17 @@
   <a href="remote-test.html">running JMeter remotely</a> across multiple machines.</p>
   </section>
   
  -<section name="14.2 Where to Put the Cookie Manager" anchor="put_cookie_manager">
  +<section name="13.2 Where to Put the Cookie Manager" anchor="put_cookie_manager">
   <p>See <a href="build-web-test-plan.html#adding_cookie_support">Building a Web Test</a>
   for information.</p>
   </section>
   
  -<section name="14.3 Where to Put the Authorization Manager" anchor="put_auth_manager">
  +<section name="13.3 Where to Put the Authorization Manager" anchor="put_auth_manager">
   <p>See <a href="build-adv-web-test-plan.html#header_manager">Building an Advanced
   Web Test</a> for information.</p>
   </section>
   
  -<section name="14.4 Using the Proxy Server" anchor="proxy_server">
  +<section name="13.4 Using the Proxy Server" anchor="proxy_server">
   <p>Refer to <complink name="HTTP Proxy Server"/> for details on setting up the proxy
   server. The most important thing to do is filter out all requests you aren't
   interested in.  For instance, there's no point in recording image requests (JMeter can
  
  
  
  1.32.2.4  +19 -21    jakarta-jmeter/xdocs/usermanual/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/index.xml,v
  retrieving revision 1.32.2.3
  retrieving revision 1.32.2.4
  diff -u -r1.32.2.3 -r1.32.2.4
  --- index.xml	11 Oct 2004 18:35:52 -0000	1.32.2.3
  +++ index.xml	12 Oct 2004 16:52:55 -0000	1.32.2.4
  @@ -40,13 +40,12 @@
     <li><a href="#build-ldapext-test-plan">+</a>...<a href="build-ldapext-test-plan.html">9b. Building an Extended LDAP Test Plan</a></li>
     <li><a href="#build-ws-test-plan">+</a>...<a href="build-ws-test-plan.html">10. Building a Webservice Test Plan</a></li>
     <li><a href="#build-monitor-test-plan">+</a>...<a href="build-monitor-test-plan.html">11. Building a Monitor Test Plan</a></li>
  -  <li><a href="#listeners">+</a>...<a href="listeners.html">12. Listeners</a></li>
  -  <li><a href="#remote-test">+</a>...<a href="remote-test.html">13. Remote Testing</a></li>
  -  <li><a href="#best-practices">+</a>...<a href="best-practices.html">14. Best Practices</a></li>
  -  <li><a href="#boss">+</a>...<a href="boss.html">15. Help! My boss wants me to load test our web app!</a></li>
  -  <li><a href="#component_reference">+</a>...<a href="component_reference.html">16. Component Reference</a></li>
  -  <li><a href="#functions">+</a>...<a href="functions.html">17. Functions</a></li>
  -  <li><a href="#glossary">+</a>...<a href="glossary.html">18. Glossary</a></li>
  +  <li><a href="#remote-test">+</a>...<a href="remote-test.html">12. Remote Testing</a></li>
  +  <li><a href="#best-practices">+</a>...<a href="best-practices.html">13. Best Practices</a></li>
  +  <li><a href="#boss">+</a>...<a href="boss.html">14. Help! My boss wants me to load test our web app!</a></li>
  +  <li><a href="#component_reference">+</a>...<a href="component_reference.html">15. Component Reference</a></li>
  +  <li><a href="#functions">+</a>...<a href="functions.html">16. Functions</a></li>
  +  <li><a href="#glossary">+</a>...<a href="glossary.html">17. Glossary</a></li>
   </ul>
   </subsection>
   <subsection name="Detailed Section List">
  @@ -155,20 +154,19 @@
     </ul>
    <li><a name="build-ws-test-plan"/><a href="build-ws-test-plan.html">10. Building a Webservice Test Plan</a></li>
    <li><a name="build-monitor-test-plan"/><a href="build-monitor-test-plan.html">11. Building a Monitor Test Plan</a></li>
  - <li><a name="listeners"/><a href="listeners.html">12. Listeners</a></li>
  - <li><a name="remote-test"/><a href="remote-test.html">13. Remote Testing</a></li>
  - <li><a name="best-practices"/><a href="best-practices.html">14. Best Practices</a></li>
  -  <ul>
  -	 <li><a href="best-practices.html#limit_threads">14.1 [ALL] Limit the Number of Threads</a></li>
  -	 <li><a href="best-practices.html#put_cookie_manager">14.2 [HTTP] Where to Put the Cookie Manager</a></li>
  -	 <li><a href="best-practices.html#put_auth_manager">14.3 [HTTP] Where to Put the Authorization Manager</a></li>
  -	 <li><a href="best-practices.html#proxy_server">14.4 Using the Proxy Server to record test scripts</a></li>
  + <li><a name="remote-test"/><a href="remote-test.html">12. Remote Testing</a></li>
  + <li><a name="best-practices"/><a href="best-practices.html">13. Best Practices</a></li>
  +  <ul>
  +	 <li><a href="best-practices.html#limit_threads">13.1 [ALL] Limit the Number of Threads</a></li>
  +	 <li><a href="best-practices.html#put_cookie_manager">13.2 [HTTP] Where to Put the Cookie Manager</a></li>
  +	 <li><a href="best-practices.html#put_auth_manager">13.3 [HTTP] Where to Put the Authorization Manager</a></li>
  +	 <li><a href="best-practices.html#proxy_server">13.4 Using the Proxy Server to record test scripts</a></li>
     </ul>
  - <li><a name="boss"/><a href="boss.html">15. Help! My boss wants me to load test our web app!</a></li>
  + <li><a name="boss"/><a href="boss.html">14. Help! My boss wants me to load test our web app!</a></li>
   
  - <li><a name="component_reference"/><a href="component_reference.html">16. Component Reference</a></li>
  - <li><a name="functions"/><a href="functions.html">17. Functions</a></li>
  - <li><a name="glossary"/><a href="glossary.html">18. Glossary</a></li>
  + <li><a name="component_reference"/><a href="component_reference.html">15. Component Reference</a></li>
  + <li><a name="functions"/><a href="functions.html">16. Functions</a></li>
  + <li><a name="glossary"/><a href="glossary.html">17. Glossary</a></li>
   </ul>
   </subsection>
   
  
  
  
  1.14.2.12 +21 -21    jakarta-jmeter/xdocs/usermanual/functions.xml
  
  Index: functions.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/functions.xml,v
  retrieving revision 1.14.2.11
  retrieving revision 1.14.2.12
  diff -u -r1.14.2.11 -r1.14.2.12
  --- functions.xml	11 Oct 2004 18:56:26 -0000	1.14.2.11
  +++ functions.xml	12 Oct 2004 16:52:55 -0000	1.14.2.12
  @@ -22,7 +22,7 @@
   
   <body>
   
  -<section name="17. Functions" anchor="functions">
  +<section name="16. Functions" anchor="functions">
   <p>
   JMeter functions are special values that can populate fields of any Sampler or other configuration
   element in a test tree.  A function looks like this:</p>
  @@ -52,7 +52,7 @@
           <li><a href="#__split">split - Split a string into variables</a></li>
   </ul>
   
  -<subsection name="17.1 What can functions do" anchor="what_can_do">
  +<subsection name="16.1 What can functions do" anchor="what_can_do">
   <p>There are two kinds of functions: user-defined static values, and built-in functions.<br/>
   User-defined static values allow the user to define variables to be replaced with their static value when
   a test tree is compiled and submitted to be run.  This replacement happens once at the beginning of the test
  @@ -68,7 +68,7 @@
   request throughout the course of the test. </p>
   </subsection>
   
  -<subsection name="17.2 Where can functions be used?" anchor="where">
  +<subsection name="16.2 Where can functions be used?" anchor="where">
   <p>A user-defined function can be written into any field of any test component.  Some fields do not allow random strings 
   because they are expecting numbers, and thus will not accept a function.  However, most fields will allow
   functions.</p>
  @@ -76,7 +76,7 @@
   Samplers, Timers, Listeners, Modifiers, Assertions, Pre-Processors, Post-Processors and Config Elements.</p>
   </subsection>
   
  -<subsection name="17.3 Writing the function string" anchor="how">
  +<subsection name="16.3 Writing the function string" anchor="how">
   <p>User-defined functions take the form: <code>${varName}</code>.  In the TestPlan tree element, a two-column table
   of user-defined values is kept, matching up variable names with static values.  Referencing the
   variable in a test element is done by bracketing the variable name with '${' and '}'.</p>
  @@ -90,7 +90,7 @@
   variable will override the built-in function.</note>
   </subsection>
   
  -<subsection name="17.4 The Function Helper Dialog" anchor="function_helper">
  +<subsection name="16.4 The Function Helper Dialog" anchor="function_helper">
   <p>The Function Helper dialog is available from JMeter's Tools menu.</p>
   <figure image="function_helper_dialog.png">Function Helper Dialog</figure>
   <p>Using the Function Helper, you can select a function from the pull down, and assign
  @@ -101,9 +101,9 @@
   for you to copy-paste into your test plan wherever you like.</p>
   </subsection>
   
  -<subsection name="17.5 Functions" anchor="functions">
  +<subsection name="16.5 Functions" anchor="functions">
   
  -<component index="17.5.1" name="__regexFunction">
  +<component index="16.5.1" name="__regexFunction">
   <description><p>The Regex Function is used to parse the previous response using any regular
   expression (provided by user).  The function returns the template string with variable values filled
   in.</p>
  @@ -152,7 +152,7 @@
   </properties>
   </component>
   
  -<component index="17.5.2" name="__counter">
  +<component index="16.5.2" name="__counter">
   <description><p>The counter generates a new number each time it is called, starting with 1
   and incrementing by +1 each time.  The counter can be configured to keep each simulated user's values
   separate, or to use the same counter for all user.  If each user's values is incremented separately,
  @@ -169,7 +169,7 @@
   </properties>
   </component>
   
  -<component index="17.5.3" name="__threadNum">
  +<component index="16.5.3" name="__threadNum">
   <description><p>The thread number function simply returns the number of the thread currently
   being executed.  These numbers are independent of ThreadGroup, meaning thread #1 in one threadgroup
   is indistinguishable from thread #1 in another threadgroup, from the point of view of this function.</p>
  @@ -178,7 +178,7 @@
   </description>
   </component>
   
  -<component index="17.5.4" name="__intSum">
  +<component index="16.5.4" name="__intSum">
   <description><p>The intsum function can be used to compute the sum of two or more integer values.
   </p></description>
   
  @@ -193,7 +193,7 @@
   
   <!-- Alternate spelling -->
   <a name="__StringFromFile"/>
  -<component index="17.5.5" name="_StringFromFile">
  +<component index="16.5.5" name="_StringFromFile">
   
   <description>
   	<p>
  @@ -265,7 +265,7 @@
   	</p>
   </component>
   
  -<component index="17.5.6" name="__machineName">
  +<component index="16.5.6" name="__machineName">
   <description><p>The machineName function returns the local host name</p></description>
   
   <properties>
  @@ -274,7 +274,7 @@
   </properties>
   </component>
   
  -<component index="17.5.7" name="__javaScript">
  +<component index="16.5.7" name="__javaScript">
   <description><p>The javaScript function executes a piece of JavaScript (not Java!) code and returns its value</p>
   	</description>
   
  @@ -293,7 +293,7 @@
   </properties>
   </component>
   
  -<component index="17.5.8" name="__Random">
  +<component index="16.5.8" name="__Random">
   <description><p>The random function returns a random number that lies between the given min and max values.</p></description>
   
   <properties>
  @@ -304,7 +304,7 @@
   </properties>
   </component>
   
  -<component index="17.5.8" name="__CSVRead">
  +<component index="16.5.8" name="__CSVRead">
   <description><p>The CSVFile function returns a string from a CSV file (c.f. <a href="#_StringFromFile">StringFromFile</a>)</p>
   	<p>NOTE: versions up to 1.9.1 only supported a single file. 
   		JMeter versions since 1.9.1 support multiple file names.
  @@ -341,7 +341,7 @@
   </properties>
   </component>
   
  -<component index="17.5.9" name="__property">
  +<component index="16.5.9" name="__property">
   <description><p>The property function returns the value of a JMeter property. 
   	If the property value cannot be found, and no default has been supplied, it returns the property name.
   	When supplying a default value, there is no need to provide a function name - the parameter can be set to null, and it will be ignored.
  @@ -363,7 +363,7 @@
   </properties>
   </component>
   
  -<component index="17.5.10" name="__P">
  +<component index="16.5.10" name="__P">
   <description><p>This is a simplified property function which is
   	intended for use with properties defined on the command line.
   	Unlike the __property function, there is no option to save the value in a variable,
  @@ -399,7 +399,7 @@
   </properties>
   </component>
   
  -<component index="17.5.11" name="__log">
  +<component index="16.5.11" name="__log">
   <description>
   	<p>
   	The log function logs a message, and returns its input string
  @@ -416,7 +416,7 @@
   </p>
   </component>
   
  -<component index="17.5.12" name="__logn">
  +<component index="16.5.12" name="__logn">
   <description>
   	<p>
   	The logn function logs a message, and returns the empty string
  @@ -433,7 +433,7 @@
   </p>
   </component>
   
  -<component index="17.5.13" name="__BeanShell">
  +<component index="16.5.13" name="__BeanShell">
   <description>
   	<p>
   	The BeanShell function evaluates the script passed to it, and returns the result.
  @@ -482,7 +482,7 @@
   </p>
   </component>
   
  -<component index="17.5.14" name="__split">
  +<component index="16.5.14" name="__split">
   <description>
   	<p>
   	The split function splits the string passed to it according to the delimiter,
  
  
  
  1.87.2.14 +95 -97    jakarta-jmeter/xdocs/usermanual/component_reference.xml
  
  Index: component_reference.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/component_reference.xml,v
  retrieving revision 1.87.2.13
  retrieving revision 1.87.2.14
  diff -u -r1.87.2.13 -r1.87.2.14
  --- component_reference.xml	11 Oct 2004 18:35:52 -0000	1.87.2.13
  +++ component_reference.xml	12 Oct 2004 16:52:55 -0000	1.87.2.14
  @@ -15,7 +15,7 @@
    * limitations under the License.
    * 
    -->
  -<document index="yes" index-level-2="yes" colbreak="16.4"
  +<document index="yes" index-level-2="yes" colbreak="15.4"
     prev="boss.html" next="functions.html" date="$Date$">
   
   <properties>
  @@ -34,11 +34,11 @@
   
    -->
   
  -<section name="16.1 Samplers" anchor="samplers">
  +<section name="15.1 Samplers" anchor="samplers">
   <description>
   	<br></br>
   </description>
  -<component name="FTP Request" index="16.1.1" screenshot="gen-controller/ftp-request.gif">
  +<component name="FTP Request" index="15.1.1" screenshot="gen-controller/ftp-request.gif">
   <description>This controller lets you send an FTP "retrieve file" request to an FTP server.
   If you are going to send multiple requests to the same FTP server, consider
   using a <complink name="FTP Request Defaults"/> Configuration
  @@ -60,7 +60,7 @@
   
   </component>
   
  -<component name="HTTP Request" index="16.1.2" screenshot="gen-controller/http-request.png">
  +<component name="HTTP Request" index="15.1.2" screenshot="gen-controller/http-request.png">
   
   <description>
           <p>This sampler lets you send an HTTP/HTTPS request to a web server.  It
  @@ -136,7 +136,7 @@
   
   </component>
   
  -<component name="JDBC Request" index="16.1.3" screenshot="gen-controller/jdbc-request.gif">
  +<component name="JDBC Request" index="15.1.3" screenshot="gen-controller/jdbc-request.gif">
   
   <description><p>This sampler lets you send an JDBC Request (an SQL query) to a database.</p>
   <p>If you are going to send multiple requests to the same database, consider
  @@ -174,7 +174,7 @@
   
   </component>
   
  -<component name="Java Request" index="16.1.4" screenshot="java_request.gif">
  +<component name="Java Request" index="15.1.4" screenshot="java_request.gif">
   
   <description><p>This sampler lets you control a java class that implements the
   JavaSamplerClient interface.  By writing your own implementation of this interface,
  @@ -197,7 +197,7 @@
   
   </component>
   
  -<component name="SOAP/XML-RPC Request" index="16.1.5" screenshot="soap_sampler.png">
  +<component name="SOAP/XML-RPC Request" index="15.1.5" screenshot="soap_sampler.png">
   
   <description><p>This sampler lets you send a SOAP request to a webservice.  It can also be
   used to send XML-RPC over HTTP.  It creates an HTTP POST request, with the specified XML as the
  @@ -217,7 +217,7 @@
   
   </component>
   
  -<component name="LDAP Request" index="16.1.6" screenshot="ldap_request.png">
  +<component name="LDAP Request" index="15.1.6" screenshot="ldap_request.png">
     <description>This Sampler lets you send a different Ldap request(Add, Modify, Delete and Search) to a LDAP server.
       <p>If you are going to send multiple requests to the same LDAP server, consider
         using an <complink name="LDAP Request Defaults"/>
  @@ -297,7 +297,7 @@
                                         </links>
   
   </component>
  -<component name="LDAP Extended Request (ALPHA)" index="16.1.6b" screenshot="ldapext_request.png">
  +<component name="LDAP Extended Request" index="15.1.6b" screenshot="ldapext_request.png">
     <description>This Sampler can send all 8 different LDAP request to a LDAP server. It is an extended version of the LDAP sampler,
     therefore it is harder to configure, but can be made much closer resembling a real LDAP session.
       <p>If you are going to send multiple requests to the same LDAP server, consider
  @@ -420,13 +420,13 @@
          
       <links>
         <link href="build-ldapext-test-plan.html">Building a Ldap Test Plan</link>
  -      <complink name="LDAP Extended Request Defaults (ALPHA)"/>
  +      <complink name="LDAP Extended Request Defaults"/>
       </links>
   
   </component>
   
   
  -<component name="WebService(SOAP) Request (Beta Code)" index="16.1.7" screenshot="webservice_sampler.png">
  +<component name="WebService(SOAP) Request (Beta Code)" index="15.1.7" screenshot="webservice_sampler.png">
   
   <description><p>This sampler has been tested with IIS Webservice running .NET 1.0. It
    hasn't been tested with SUN or IBM webservices providers, but it should work.
  @@ -473,7 +473,7 @@
   
   </component>
   
  -<component name="Access Log Sampler" index="16.1.8" screenshot="">
  +<component name="Access Log Sampler" index="15.1.8" screenshot="">
   <center><h2>(Alpha Code)</h2></center>
   <description><p>AccessLogSampler was designed to read access logs and generate http requests.
   For those not familiar with the access log, it is the log the webserver maintains of every
  @@ -526,7 +526,7 @@
   
   </component>
   
  -<component name="BeanShell Sampler" index="16.1.9" screenshot="">
  +<component name="BeanShell Sampler" index="15.1.9" screenshot="">
   <center><h2>(Beta Code)</h2></center>
   	<description><p>This sampler allows you to write a sampler using the BeanShell scripting language.		
   </p><p>
  @@ -592,7 +592,7 @@
   </component>
   
   
  -<component name="BSF Sampler" index="16.1.10" screenshot="">
  +<component name="BSF Sampler" index="15.1.10" screenshot="">
   <center><h2>(ALPHA Code)</h2></center>
   	<description><p>This sampler allows you to write a sampler using a BSF scripting language.<br></br>
   		
  @@ -611,7 +611,7 @@
   TBC
   </component>
   
  -<component name="TCP Sampler" index="16.1.11" screenshot="">
  +<component name="TCP Sampler" index="15.1.11" screenshot="">
   <description>TBA
   </description>
   <properties>
  @@ -619,7 +619,7 @@
   </properties>
   </component>
   
  -<component name="Test Action" index="16.1.12" screenshot="test_action.png">
  +<component name="Test Action" index="15.1.12" screenshot="test_action.png">
   <description>TBA
   </description>
   <properties>
  @@ -629,12 +629,12 @@
   
   </section>
   
  -<section name="16.2 Logic Controllers" anchor="logic_controllers">
  +<section name="15.2 Logic Controllers" anchor="logic_controllers">
   <description>
   	<br></br>
   </description>
   
  -<component index="16.2.1" name="Interleave Controller" screenshot="logic-controller/interleave-controller.png">
  +<component index="15.2.1" name="Interleave Controller" screenshot="logic-controller/interleave-controller.png">
   <description><p>If you add Generative or Logic Controllers to an Interleave Controller, JMeter will alternate among each of the
   other controllers for each loop iteration. </p>
   </description>
  @@ -706,7 +706,7 @@
   </example>
   </component>
   
  -<component index="16.2.2" name="Loop Controller" anchor="loop" screenshot="logic-controller/loop-controller.gif">
  +<component index="15.2.2" name="Loop Controller" anchor="loop" screenshot="logic-controller/loop-controller.gif">
   <description><p>If you add Generative or Logic Controllers to a Loop Controller, JMeter will
   loop through them a certain number of times, in addition to the loop value you
   specified for the Thread Group.  For example, if you add one HTTP Request to a
  @@ -745,7 +745,7 @@
   
   </component>
   
  -<component index="16.2.3" name="Once Only Controller" anchor="once_only_controller"
  +<component index="15.2.3" name="Once Only Controller" anchor="once_only_controller"
   screenshot="logic-controller/once-only-controller.gif">
   <description>
   <p>The Once Only Logic Controller tells JMeter to process the controller(s) inside it only once, and pass over any requests under it
  @@ -773,7 +773,7 @@
   </example>
   </component>
   
  -<component index="16.2.4" name="Simple Controller" anchor="simple_controller" screenshot="logic-controller/simple-controller.gif">
  +<component index="15.2.4" name="Simple Controller" anchor="simple_controller" screenshot="logic-controller/simple-controller.gif">
   <description>
   <p>The Simple Logic Controller lets  you organize your Samplers and other
   Logic Controllers.  Unlike other Logic Controllers, this controller provides no functionality beyond that of a
  @@ -797,7 +797,7 @@
   </example>
   </component>
   
  -<component index="16.2.5" name="Random Controller" screenshot="logic-controller/random-controller.gif">
  +<component index="15.2.5" name="Random Controller" screenshot="logic-controller/random-controller.gif">
   <description>
   <p>The Random Logic Controller acts similarly to the Interleave Controller, except that
   instead of going in order through its sub-controllers and samplers, it picks one
  @@ -812,7 +812,7 @@
   
   </component>
   
  -<component index="16.2.6" name="Recording Controller" screenshot="logic-controller/recording-controller.gif">
  +<component index="15.2.6" name="Recording Controller" screenshot="logic-controller/recording-controller.gif">
   <description>
   <p>The Recording Controller is a place holder indicating where the proxy server should
   record samples to.  During test run, it has no effect, similar to the Simple Controller.  But during
  @@ -826,7 +826,7 @@
   
   </component>
   
  -<component index="16.2.7" name="Module Controller" screenshot="module_controller.png">
  +<component index="15.2.7" name="Module Controller" screenshot="module_controller.png">
   <description>
   <p>The Module Controller provides a mechanism for substituting test plan fragments into the current test plan at run-time.  To use this
   module effectively, one might have a number of Controllers under the <complink name="WorkBench"/>, each with a different series of
  @@ -843,7 +843,7 @@
   
   </component>
   
  -<component index="16.2.8" name="Throughput Controller" screenshot="throughput_controller.png">
  +<component index="15.2.8" name="Throughput Controller" screenshot="throughput_controller.png">
   <description>
   <p>The Throughput Controller allows the user to control how often it is executed.  There are two modes - percent execution and total executions.  Percent executions causes the controller to execute a certain percentage of the iterations through the test plan.  Total
   executions causes the controller to stop executing after a certain number of executions have occurred.  Like the Once Only Controller, this
  @@ -859,7 +859,7 @@
   </properties>
   
   </component>
  -<component name="If Controller" index="16.2.9" screenshot="">
  +<component name="If Controller" index="15.2.9" screenshot="">
   	<description>
   		<p>The If Controller allows the user to control whether the test elements below it (its children) are run or not.</p>
   	</description>
  @@ -869,7 +869,7 @@
   </properties>
   </component>
   
  -<component name="Random Order Controller" index="16.2.10" screenshot="">
  +<component name="Random Order Controller" index="15.2.10" screenshot="">
   	<description>
   		<p>The Random Order Controller is much like a Simple Controller in that it will execute each child
   		 element at most once, but the order of execution of the nodes will be random.</p>
  @@ -879,7 +879,7 @@
   </properties>
   </component>
   
  -<component name="ForEach Controller" index="16.2.11" anchor="loop" screenshot="logic-controller/foreach-controller.png">
  +<component name="ForEach Controller" index="15.2.11" anchor="loop" screenshot="logic-controller/foreach-controller.png">
   <description><p>A ForEach controller loops through the values of a set of related variables. 
   When you add samplers (or controllers) to a ForEach controller, every sample sample (or controller)
   is executed one or more times, where during every loop the variable has a new value.
  @@ -931,7 +931,7 @@
   
   </component>
   
  -<component name="Transaction Controller" index="16.2.12" screenshot="">
  +<component name="Transaction Controller" index="15.2.12" screenshot="">
   	<description>
   		<p>The Transaction Controller times how long it takes for all its children to run.
   			It then adds a "sample" entry to the test output with the total elapsed time.
  @@ -943,7 +943,7 @@
   </properties>
   </component>
   
  -<component name="Runtime Controller" index="16.2.12" screenshot="">
  +<component name="Runtime Controller" index="15.2.12" screenshot="">
   	<description>
   		<p>The Runtime Controller controls how long its children are allowed to run.
   		</p>
  @@ -956,7 +956,7 @@
   
   </section>
   
  -<section name="16.3 Listeners" anchor="listeners">
  +<section name="15.3 Listeners" anchor="listeners">
   <description>
   	<br></br>
   Most of the listeners perform several roles in addition to "listening"
  @@ -1049,7 +1049,7 @@
   	<br></br>
   
   </description>
  -<component index="16.3.1" name="Mailer Visualizer" screenshot="mailer_vis.png">
  +<component index="15.3.1" name="Mailer Visualizer" screenshot="mailer_vis.png">
   <description><p>The mailer visualizer can be set up to send email if a test run receives too many
   failed responses from the server.</p></description>
   
  @@ -1072,11 +1072,11 @@
   </properties>
   </component>
   
  -<component index="16.3.2" name="Graph Full Results" screenshot="">
  +<component index="15.3.2" name="Graph Full Results" screenshot="">
   <description>No Description</description>
   </component>
   
  -<component index="16.3.3" name="Graph Results" screenshot="graph_results.png">
  +<component index="15.3.3" name="Graph Results" screenshot="graph_results.png">
   <description><p>The Graph Results listener generates a simple graph that plots all sample times.  Along
   the bottom of the graph, the current sample (black), the current average of all samples(blue), the
   current standard deviation (red), and the current throughput rate (green) are displayed in milliseconds.</p>
  @@ -1089,14 +1089,14 @@
   number.</p></description>
   </component>
   
  -<component index="16.3.4" name="Spline Visualizer" screenshot="spline_visualizer.png">
  +<component index="15.3.4" name="Spline Visualizer" screenshot="spline_visualizer.png">
   <description><p>The Spline Visualizer provides a view of all sample times from the start
   of the test till the end, regardless of how many samples have been taken.  The spline
   has 10 points, each representing 10% of the samples, and connected using spline
   logic to show a single continuous line.</p></description>
   </component>
   
  -<component index="16.3.5" name="Assertion Results" screenshot="assertion_results.png">
  +<component index="15.3.5" name="Assertion Results" screenshot="assertion_results.png">
   <description><p>The Assertion Results visualizer shows the URL of each sample taken (no time information
   is shown).  It also reports failures of any <a href="test_plan.html#assertions">Assertions</a> that
   are part of the test plan.</p></description>
  @@ -1106,7 +1106,7 @@
   </links>
   </component>
   
  -<component index="16.3.6" name="View Results Tree" screenshot="view_results_tree.png">
  +<component index="15.3.6" name="View Results Tree" screenshot="view_results_tree.png">
   <description>The View Results Tree shows a tree of all sample responses, allowing you to view the
   response for any sample.  In addition to showing the response, you can see the time it took to get
   this response, and some response codes.
  @@ -1120,27 +1120,25 @@
   </description>
   </component>
   
  -<component index="16.3.7" name="Aggregate Report" screenshot="aggregate_report.png">
  -<description>The aggregate report creates a table row for each differently named request in your
  -test.  For each request, it totals the response information and provides request count, min, max,
  -average, error rate, approximate throughput (request/second) and Kilobytes per second throughput.
  -Once the test is done, the throughput is the actual through for the duration of the entire test.</description>
  +<component index="15.3.7" name="Aggregate Report" screenshot="aggregate_report.png">
  +<description>The aggregate report creates a table row for each differently named request in your test.  For each
  +request, it totals the response information and provides request count, min, max, average, error rate, and 
  +estimated throughput calculation. Once the test is complete, the throughput is the real rate.</description>
   </component>
   
  -<component index="16.3.8" name="View Results in Table" screenshot="table_results.png">
  +<component index="15.3.8" name="View Results in Table" screenshot="table_results.png">
   <description>This visualizer creates a row for every sample result.  Each sample result's URL,
   time in milliseconds, success/failure is displayed.  Like the <complink name="View Results Tree"/>,
  -this visualizer uses a lot of memory. The last column shows the number of bytes for the
  -response from the server.</description>
  +this visualizer uses a lot of memory.</description>
   </component>
   
  -<component index="16.3.9" name="Simple Data Writer" screenshot="">
  +<component index="15.3.9" name="Simple Data Writer" screenshot="">
   <description>This listener can record results to a file
   but not to the UI.  It is meant to provide an efficient means of
   recording data by eliminating GUI overhead.</description>
   </component>
   
  -<component index="16.3.10" name="Monitor Results" screenshot="monitor_screencap.png">
  +<component index="15.3.10" name="Monitor Results" screenshot="monitor_screencap.png">
   <description>
   <p>Monitor Results is a new Visualizer for displaying server
   status. It is designed for Tomcat 5, but any servlet container
  @@ -1163,7 +1161,7 @@
   </description>
   </component>
   
  -<component index="16.3.11" name="Distribution Graph (alpha)" screenshot="distribution_graph.png">
  +<component index="15.3.11" name="Distribution Graph (alpha)" screenshot="distribution_graph.png">
   <description>
   <p>The distribution graph will display a bar for every unique response time. Since the
   granularity of System.currentTimeMillis() is 10 milliseconds, the 90% threshold should be
  @@ -1184,7 +1182,7 @@
   
   </section>
   
  -<section name="16.4 Configuration Elements" anchor="config_elements">
  +<section name="15.4 Configuration Elements" anchor="config_elements">
   <description>
   	<br></br>
   	Configuration elements can be used to set up defaults and variables for later use by samplers.
  @@ -1192,7 +1190,7 @@
   	i.e. before any samplers in the same scope.
   	<br></br>
   </description>
  -<component index="16.4.1" name="HTTP Authorization Manager" screenshot="http-config/http-auth-manager.gif">
  +<component index="15.4.1" name="HTTP Authorization Manager" screenshot="http-config/http-auth-manager.gif">
   
   <description>
   <p>The Authorization Manager lets you specify one or more user logins for web pages that are
  @@ -1251,7 +1249,7 @@
   
   </component>
   
  -<component index="16.4.2" name="HTTP Cookie Manager" screenshot="http-config/http-cookie-manager.gif">
  +<component index="15.4.2" name="HTTP Cookie Manager" screenshot="http-config/http-cookie-manager.gif">
   
   <description><p>The Cookie Manager element has two functions:<br></br>
   First, it stores and sends cookies just like a web browser. If you have an HTTP Request and
  @@ -1277,7 +1275,7 @@
   
   </component>
   
  -<component index="16.4.3" name="HTTP Proxy Server" screenshot="proxy_control.png">
  +<component index="15.4.3" name="HTTP Proxy Server" screenshot="proxy_control.png">
   
   <description><p>The Proxy Server allows JMeter to watch and record your actions while you browse your web application
   with your normal browser (such as Internet Explorer).  JMeter will create test sample objects and store them
  @@ -1373,7 +1371,7 @@
   
   </component>
   
  -<component index="16.4.4" name="HTTP Request Defaults"
  +<component index="15.4.4" name="HTTP Request Defaults"
           screenshot="http-config/http-request-defaults.png">
   <description><p>This element lets you set default values that your HTTP Request controllers use.  For example, if you are
   creating a Test Plan with 25 HTTP Request controllers and all of the requests are being sent to the same server,
  @@ -1401,19 +1399,19 @@
   </properties>
   </component>
   
  -<component index="16.4.5" name="FTP Request Defaults"
  +<component index="15.4.5" name="FTP Request Defaults"
                   screenshot="ftp-config/ftp-request-defaults.gif">
   <description></description>
   </component>
   
  -<component index="16.4.6" name="JDBC Connection Configuration"
  +<component index="15.4.6" name="JDBC Connection Configuration"
                   screenshot="jdbc-config/jdbc-conn-config.png">
   	<description>Defines the JDBC Connection settings to be used by 
   		the <complink name="JDBC Request"/>Sampler.
   	</description>
   </component>
   
  -<component index="16.4.7" name="JDBC SQL Query Defaults"
  +<component index="15.4.7" name="JDBC SQL Query Defaults"
   	screenshot="jdbc-config/jdbc-sql-query.png">
   <description>Defines a default query for the <complink name="JDBC Request"/>Sampler.
   	<br></br>
  @@ -1421,13 +1419,13 @@
   	</description>
   </component>
   
  -<component index="16.4.8" name="Mail Reader Sampler">
  +<component index="15.4.8" name="Mail Reader Sampler">
   <description>TBA</description>
   </component>
   
   
   
  -<component index="16.4.9" name="HTTP Header Manager" screenshot="http-config/http-header-manager.gif">
  +<component index="15.4.9" name="HTTP Header Manager" screenshot="http-config/http-header-manager.gif">
   <description><p>The Header Manager lets you add or override HTTP request headers.</p>
   </description>
   
  @@ -1456,7 +1454,7 @@
   
   </component>
   
  -<component index="16.4.10" name="Login Config Element" screenshot="login-config.png">
  +<component index="15.4.10" name="Login Config Element" screenshot="login-config.png">
   <description><p>The Login Config Element lets you add or override username and password settings in samplers that use username and password as part of their setup.</p>
   </description>
   
  @@ -1468,7 +1466,7 @@
   
   </component>
   
  -<component index="16.4.11" name="Simple Config Element" screenshot="simple_config_element.png">
  +<component index="15.4.11" name="Simple Config Element" screenshot="simple_config_element.png">
   <description><p>The Simple Config Element lets you add or override arbitrary values in samplers.  You can choose the name of the value
   and the value itself.  Although some adventurous users might find a use for this element, it's here primarily for developers as a basic
   GUI that they can use while developing new JMeter components.</p>
  @@ -1483,26 +1481,26 @@
   
   </component>
   
  -<component index="16.4.12" name="LDAP Request Defaults" screenshot="ldap_defaults.png">
  +<component index="15.4.12" name="LDAP Request Defaults" screenshot="ldap_defaults.png">
   <description><p>The LDAP Request Defaults component lets you set default values for LDAP testing.  See the <complink name="LDAP Request"/>.</p>
   </description>
   
   </component>
   
  -<component index="16.4.12b" name="LDAP Extended Request Defaults (ALPHA)" screenshot="ldapext_defaults.png">
  -<description><p>The LDAP Extended Request Defaults component lets you set default values for extended LDAP testing.  See the <complink name="LDAP Extended Request (ALPHA)"/>.</p>
  +<component index="15.4.12b" name="LDAP Extended Request Defaults" screenshot="ldapext_defaults.png">
  +<description><p>The LDAP Extended Request Defaults component lets you set default values for extended LDAP testing.  See the <complink name="LDAP Extended Request"/>.</p>
   </description>
   
   </component>
   
   
  -<component index="16.4.13" name="Java Request Defaults" screenshot="java_defaults.png">
  +<component index="15.4.13" name="Java Request Defaults" screenshot="java_defaults.png">
   <description><p>The Java Request Defaults component lets you set default values for Java testing.  See the <complink name="Java Request"/>.</p>
   </description>
   
   </component>
   
  -<component index="16.4.14" name="User Defined Variables" screenshot="user_defined_variables.png">
  +<component index="15.4.14" name="User Defined Variables" screenshot="user_defined_variables.png">
   <description><p>The User Defined Variables lets you define variables for use in other test elements, just as in the <complink name="Test Plan"/>.
   The variables in User Defined Variables components will take precedence over those defined closer to the tree root -- including those defined in the Test Plan.</p>
   </description>
  @@ -1514,7 +1512,7 @@
   </properties>
   </component>
   
  -<component index="16.4.15" name="TCP Sampler Config" screenshot="">
  +<component index="15.4.15" name="TCP Sampler Config" screenshot="">
   <description>ALPHA Code
   </description>
   <properties>
  @@ -1524,14 +1522,14 @@
   
   </section>
   
  -<section name="16.5 Assertions" anchor="assertions">
  +<section name="15.5 Assertions" anchor="assertions">
   <description>
   	<br></br>
   	Assertions are used to perform additional checks on samplers, and are processed after <b>each sampler</b>
   	in the same scope.
   	<br></br>
   </description>
  -<component index="16.5.1" name="Response Assertion" anchor="basic_assertion" screenshot="assertion/assertion.gif">
  +<component index="15.5.1" name="Response Assertion" anchor="basic_assertion" screenshot="assertion/assertion.gif">
   
   <description><p>The response assertion control panel lets you add pattern strings to be compared against various
   	fields of the response.
  @@ -1586,7 +1584,7 @@
   
   </component>
   
  -<component index="16.5.2" name="Duration Assertion" screenshot="duration_assertion.png">
  +<component index="15.5.2" name="Duration Assertion" screenshot="duration_assertion.png">
   <description><p>The Duration Assertion tests that each response was received within a given amount
   of time.  Any response that takes longer than the given number of milliseconds (specified by the
   user) is marked as a failed response.</p></description>
  @@ -1599,7 +1597,7 @@
   </properties>
   </component>
   
  -<component index="16.5.3" name="Size Assertion" screenshot="size_assertion.png">
  +<component index="15.5.3" name="Size Assertion" screenshot="size_assertion.png">
   <description><p>The Size Assertion tests that each response contains the right number of bytes in it.  You can specify that
   the size be equal to, greater than, less than, or not equal to a given number of bytes.</p></description>
   
  @@ -1612,7 +1610,7 @@
   </properties>
   </component>
   
  -<component index="16.5.4" name="XML Assertion" screenshot="xml_assertion.png">
  +<component index="15.5.4" name="XML Assertion" screenshot="xml_assertion.png">
   <description><p>The XML Assertion tests that the response data consists of a formally correct XML document.  It does not
   validate the XML based on a DTD or schema or do any further validation.</p></description>
   
  @@ -1622,7 +1620,7 @@
   </properties>
   </component>
   
  -<component index="16.5.5" name="BeanShell Assertion" screenshot="bsh_assertion.png">
  +<component index="15.5.5" name="BeanShell Assertion" screenshot="bsh_assertion.png">
   <description><p>The BeanShell Assertion allows the user to perform assertion checking using a BeanShell script.</p></description>
   
   <properties>
  @@ -1652,7 +1650,7 @@
   </p>
   </component>
   
  -<component index="16.5.6" name="MD5Hex Assertion">
  +<component index="15.5.6" name="MD5Hex Assertion">
   <description><p>The MD5Hex Assertion allows the user to check the MD5 hash of the response data.</p></description>
   
   <properties>
  @@ -1662,7 +1660,7 @@
   </properties>
   </component>
   
  -<component index="16.5.7" name="HTML Assertion" screenshot="assertion/HTMLAssertion.png">
  +<component index="15.5.7" name="HTML Assertion" screenshot="assertion/HTMLAssertion.png">
   <description><p>The HTML Assertion allows the user to check the HTML syntax of the response data using JTidy.</p></description>
   
   <properties>
  @@ -1679,7 +1677,7 @@
   
   </section>
   
  -<section name="16.6 Timers" anchor="timers">
  +<section name="15.6 Timers" anchor="timers">
   <description>
   	<br></br>
   	Note that timers are processed at the start of the scope in which they are found;
  @@ -1690,7 +1688,7 @@
   	child of a simple logic controller immediately after the sampler.
   	<br></br>
   </description>
  -<component index="16.6.1" name="Constant Timer" anchor="constant" screenshot="timers/constant_timer.gif">
  +<component index="15.6.1" name="Constant Timer" anchor="constant" screenshot="timers/constant_timer.gif">
   <description>
   <p>If you want to have each thread pause for the same amount of time between
   requests, use this timer.</p></description>
  @@ -1701,7 +1699,7 @@
   </properties>
   </component>
   
  -<component index="16.6.2" name="Gaussian Random Timer" screenshot="timers/gauss_random_timer.gif">
  +<component index="15.6.2" name="Gaussian Random Timer" screenshot="timers/gauss_random_timer.gif">
   
   <description><p>This timer pauses each thread request for a random amount of time, with most
   of the time intervals ocurring near a particular value.  The total delay is the
  @@ -1718,7 +1716,7 @@
   
   </component>
   
  -<component index="16.6.3" name="Uniform Random Timer" screenshot="timers/uniform_random_timer.gif">
  +<component index="15.6.3" name="Uniform Random Timer" screenshot="timers/uniform_random_timer.gif">
   
   <description><p>This timer pauses each thread request for a random amount of time, with
   each time interval having the same probability of occurring. The total delay
  @@ -1734,7 +1732,7 @@
   
   </component>
   
  -<component index="16.6.4" name="Constant Throughput Timer" screenshot="timers/constant_throughput_timer.gif">
  +<component index="15.6.4" name="Constant Throughput Timer" screenshot="timers/constant_throughput_timer.gif">
   
   <description><p>This timer introduces variable pauses, calculated to keep the total throughput (in terms of samples per minute) as close as possible to a give figure. Of course the throughput will be lower if the server is not capable of handling it, or if other timers or time-consuming test elements prevent it.</p>
   
  @@ -1748,13 +1746,13 @@
   </component>
   </section>
   
  -<section name="16.7 Pre Processors" anchor="preprocessors">
  +<section name="15.7 Pre Processors" anchor="preprocessors">
   	<description>
   	<br></br>
   		Preprocessors are used to modify the Samplers in their scope.
   	<br></br>
   	</description>
  -<component index="16.7.1" name="HTML Link Parser" anchor="html_link_parser">
  +<component index="15.7.1" name="HTML Link Parser" anchor="html_link_parser">
   <description>
   <p>This modifier parses HTML response from the server and extracts
   links and forms.  A URL test sample that passes through this modifier will be examined to
  @@ -1804,7 +1802,7 @@
   
   </component>
   
  -<component index="16.7.2" name="HTTP URL Re-writing Modifier" screenshot="url_rewriter.png">
  +<component index="15.7.2" name="HTTP URL Re-writing Modifier" screenshot="url_rewriter.png">
   <description><p>This modifier works similarly to the HTML Link Parser, except it has a specific purpose for which
   it is easier to use than the HTML Link Parser, and more efficient.  For web applications that
   use URL Re-writing to store session ids instead of cookies, this element can be attached at the
  @@ -1828,7 +1826,7 @@
   </properties>
   </component>
   
  -<component index="16.7.3" name="HTML Parameter Mask" useinstead="Counter" screenshot="parameter_mask.png">
  +<component index="15.7.3" name="HTML Parameter Mask" useinstead="Counter" screenshot="parameter_mask.png">
   <description><p>The HTML Parameter Mask is used to generate unique values for HTML arguments.  By
   specifying the name of the parameter, a value prefix and suffix, and counter parameters, this
   modifier will generate values of the form "<code>name=prefixcountersuffix</code>".  Any HTTP
  @@ -1856,7 +1854,7 @@
   </properties>
   </component>
   
  -<component index="16.7.4" name="HTTP User Parameter Modifier" useinstead="User Parameters" screenshot="user_param_modifier.gif">
  +<component index="15.7.4" name="HTTP User Parameter Modifier" useinstead="User Parameters" screenshot="user_param_modifier.gif">
   <description><p>The User Parameter Modifier uses an XML file get values for HTTP arguments.  Any
   HTTP Request that this modifier modifies will be checked for the existence of the specified
   arguments.  If found, the values for those arguments will be replaced by the values found in the
  @@ -1875,7 +1873,7 @@
   </properties>
   </component>
   
  -<component index="16.7.5" name="User Parameters" screenshot="user_params.png">
  +<component index="15.7.5" name="User Parameters" screenshot="user_params.png">
   <description><p>Allows the user to specify values for User Variables specific to individual threads.</p>
   <p>User Variables can also be specified in the Test Plan but not specific to individual threads. This panel allows
   you to specify a series of values for any User Variable. For each thread, the variable will be assigned one of the values from the series
  @@ -1899,7 +1897,7 @@
   </properties>
   </component>
   
  -<component index="16.7.6" name="Counter" screenshot="counter.png">
  +<component index="15.7.6" name="Counter" screenshot="counter.png">
   <description><p>Allows the user to create a counter that can be referenced anywhere
   in the Thread Group.  The counter config lets the user configure a starting point, a maximum,
   and the increment.  The counter will loop from the start to the max, and then start over
  @@ -1921,7 +1919,7 @@
   
   </section>
   
  -<section name="16.8 Post-Processors" anchor="postprocessors">
  +<section name="15.8 Post-Processors" anchor="postprocessors">
   	<description>
   	<br></br>
   		As the name suggests, Post-Processors are applied after samplers. Note that they are
  @@ -1929,7 +1927,7 @@
   		is applied only to a particular sampler, add it as a child of the sampler.
   	<br></br>
   	</description>
  -<component index="16.8.1" name="Regular Expression Extractor" screenshot="regex_extractor.png">
  +<component index="15.8.1" name="Regular Expression Extractor" screenshot="regex_extractor.png">
   <description><p>Allows the user to extract values from a server response using a Perl-type regular expression.  As a post-processor,
   this element will execute after each Sample request in its <scope/>, applying the regular expression, extracting the requested values,
   generate the template string, and store the result into the given variable name.</p></description>
  @@ -1964,7 +1962,7 @@
   </p>
   </component>
   
  -<component index="16.8.2" name="Result Status Action Handler" screenshot="resultstatusactionhandler.png">
  +<component index="15.8.2" name="Result Status Action Handler" screenshot="resultstatusactionhandler.png">
      <description>This test element allows the user to stop the thread or the whole test if the relevant sampler failed.
      </description>
      <properties>
  @@ -1972,7 +1970,7 @@
      </properties>
   </component>
   
  -<component index="16.8.3" name="Save Responses to a file" screenshot="savetofile.png">
  +<component index="15.8.3" name="Save Responses to a file" screenshot="savetofile.png">
   	<description>This test element can be placed anywhere in the test plan.
   		For each sample in its scope, it will create a file of the response Data.
   		The primary use for this is in creating functional tests.
  @@ -1985,7 +1983,7 @@
    </properties>
   </component>
   
  -<component index="16.8.4" name="Generate Summary Results" screenshot="summary.png">
  +<component index="15.8.4" name="Generate Summary Results" screenshot="summary.png">
   	<description>This test element can be placed anywhere in the test plan.
   Generates a summary of the test run so far to the log file and/or 
   standard output. Both running and differential totals are shown.
  @@ -2002,15 +2000,15 @@
   
   </section>
   
  -<section name="16.9 Miscellaneous Features" anchor="Miscellaneous_Features">
  +<section name="15.9 Miscellaneous Features" anchor="Miscellaneous_Features">
   <description>
   		<br></br>
   </description>
  -<component index="16.9.1" name="Test Plan" screenshot="testplan.png">
  +<component index="15.9.1" name="Test Plan" screenshot="testplan.png">
   <description><p>At the Test Plan level, static variables can be defined that allow users to abstract values that are repeated throughout their tests, such as server names.  Here, one can instruct JMeter to save the maximum sample information to file by selecting "functional testing".  Also, an option exists here to instruct JMeter to run the <complink name="Thread Group"/> serially rather than in parallel.</p></description>
   </component>
   
  -<component index="16.9.2" name="Thread Group" screenshot="threadgroup.png">
  +<component index="15.9.2" name="Thread Group" screenshot="threadgroup.png">
   <description><p>A Thread Group defines a pool of users that will execute a particular test case against your server.  In the Thread Group GUI, you can control the number of users simulated (num of threads), the ramp up time (how long it takes to start all the threads), the number of times to perform the test, and optionally, a start and stop time for the test.</p></description>
   
   <properties>
  @@ -2035,11 +2033,11 @@
   </properties>
   </component>
   
  -<component index="16.9.3" name="WorkBench" screenshot="workbench.png">
  +<component index="15.9.3" name="WorkBench" screenshot="workbench.png">
   <description><p>The WorkBench simply provides a place to temporarily store test elements while not in use, for copy/paste purposes, or any other purpose you desire.  When you save your test plan, WorkBench items are not saved with it.  Your WorkBench can be saved independently, if you like (right-click on WorkBench and choose Save).</p></description>
   </component>
   
  -<component index="16.9.4" name="SSL Manager" screenshot="">
  +<component index="15.9.4" name="SSL Manager" screenshot="">
   <p>
     The SSL Manager is a way to select a client certificate so that you can test
     applications that use Public Key Infrastructure (PKI).  In order to use it,
  
  
  
  1.16.2.3  +4 -4      jakarta-jmeter/xdocs/usermanual/remote-test.xml
  
  Index: remote-test.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/remote-test.xml,v
  retrieving revision 1.16.2.2
  retrieving revision 1.16.2.3
  diff -u -r1.16.2.2 -r1.16.2.3
  --- remote-test.xml	11 Oct 2004 18:35:52 -0000	1.16.2.2
  +++ remote-test.xml	12 Oct 2004 16:52:55 -0000	1.16.2.3
  @@ -23,7 +23,7 @@
   
   <body>
   
  -<section name="13. Remote Testing">
  +<section name="12. Remote Testing">
   
   <p>In the event that your JMeter client machine is unable, performance-wise, to simulate 
   enough users to stress your server, an option exists to control multiple, remote JMeter
  @@ -67,7 +67,7 @@
   normal JMeter start and stop menu items.</p>
   <p><img src="../images/screenshots/remote/run-menu00.gif" width="232" height="156"></img>
   <br>Figure 1 - Run Menu</br></p>
  -<subsection name="13.1 Doing it Manually" anchor="detail_instructions">
  +<subsection name="12.1 Doing it Manually" anchor="detail_instructions">
   <p>In some cases, the jmeter-server script may not work for you (if you are using an OS platform not anticipated by the JMeter developers).  Here is how to start the JMeter servers (step 1 above) with a more manual process:</p>
   <p><b>Step 1a: Start the RMI Registry</b></p>
   <p>JMeter uses Remote Method Invocation (RMI) as the remote communication mechanism.  Therefore, you need
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org