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 2003/06/13 16:51:52 UTC

cvs commit: jakarta-jmeter/xdocs/usermanual build-adv-web-test-plan.xml build-db-test-plan.xml build-ftp-test-plan.xml build-ldap-test-plan.xml build-test-plan.xml build-web-test-plan.xml component_reference.xml functions.xml test_plan.xml

mstover1    2003/06/13 07:51:52

  Modified:    .        build.xml
               docs     running.html
               docs/images/screenshots function_helper_dialog.png
               docs/usermanual component_reference.html functions.html
               src/core/org/apache/jmeter/gui/action Help.java
               src/core/org/apache/jmeter/util JMeterUtils.java
               src/core/org/apache/jmeter/visualizers/gui
                        AbstractVisualizer.java
               xdocs/stylesheets site.vsl site_printable.vsl
               xdocs/usermanual build-adv-web-test-plan.xml
                        build-db-test-plan.xml build-ftp-test-plan.xml
                        build-ldap-test-plan.xml build-test-plan.xml
                        build-web-test-plan.xml component_reference.xml
                        functions.xml test_plan.xml
  Log:
  Doc updates
  using the printable_docs directory for integrated help
  including printable docs in distribution
  
  Revision  Changes    Path
  1.101     +1 -6      jakarta-jmeter/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/build.xml,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- build.xml	11 Jun 2003 14:20:41 -0000	1.100
  +++ build.xml	13 Jun 2003 14:51:50 -0000	1.101
  @@ -355,6 +355,7 @@
       <include name="${lib.dir}/"/>
       <include name="${jar.dest}/"/> <!-- redundant but future-proof -->
       <include name="${docs.dest}/"/>
  +    <include name="${printable_docs.dest}/**"/>
         <exclude name="${docs.api.dest}/"/>
       <exclude name="**/mail.jar"/>
       <exclude name="**/activation.jar"/>
  @@ -446,12 +447,6 @@
     <target name="printable-docs" depends="init-docs" if="AnakiaTask.present" description="Generate printable HTML documentation.">
       <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"/>
       <anakia basedir="${docs.src}" destdir="${printable_docs.dest}/" extension=".html" style="${eclipse.anakia}/xdocs/stylesheets/site_printable.vsl" projectFile="./stylesheets/project.xml" excludes="**/stylesheets/**" includes="**/*.xml" lastModifiedCheck="true" velocityPropertiesFile="${docs.src}/velocity.properties"/>
  -    <copy todir="${printable_docs.dest}">
  -      <fileset dir="${docs.dest}">
  -        <include name="images/**"/>
  -        <include name="demos/**"/>
  -      </fileset>
  -    </copy>
     </target>
   
     <target name="all-docs" depends="docs,printable-docs,api-docs" description="Generate documentation."/>
  
  
  
  1.67      +0 -0      jakarta-jmeter/docs/running.html
  
  Index: running.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/running.html,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  
  
  
  1.4       +42 -22    jakarta-jmeter/docs/images/screenshots/function_helper_dialog.png
  
  	<<Binary file>>
  
  
  1.48      +55 -26    jakarta-jmeter/docs/usermanual/component_reference.html
  
  Index: component_reference.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/component_reference.html,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- component_reference.html	12 Jun 2003 13:39:41 -0000	1.47
  +++ component_reference.html	13 Jun 2003 14:51:50 -0000	1.48
  @@ -1750,19 +1750,32 @@
   The saving and reading of test results is generic.  The various
   listeners generally have a panel whereby one can specify the file to
   which the results will be written (or read).  By default,
  -the results are stored as XML
  -files, typically with a ".jtl" extension.
  +the results are stored as CSV
  +files, typically with a ".jtl" extension.  Storing as CSV is the most efficient option, but is less detailed than XML (the other available option).
  +						</p>
  +									
  +
  +												<p	>
  +								To change the format, in jmeter.properties, find the following line:
  +						</p>
  +									
  +
  +												<p	>
  +								jmeter.save.saveservice.output_format=csv
  +						</p>
  +									
  +
  +												<p	>
  +								Change "csv" to "xml" for greater detail.
   						</p>
   									
   
   												<p	>
   								
  -The information to be saved is configurable.  If one specifies the
  -"Functional Test Mode" on the Test Plan element, one gets the largest
  -amount of information.  If this box is not checked, the default saved
  +The information to be saved is configurable.  For maximum information, choose "xml" as the format and specify "Functional Test Mode" on the Test Plan element.  If this box is not checked, the default saved
   data includes a time stamp (the number of milliseconds since midnight,
   January 1, 1970 UTC), the data type, the thread name, the label, the
  -response time, message, and code, and a success indicator.
  +response time, message, and code, and a success indicator.  If checked, all information, including the full response data will be logged.
   						</p>
   									
   
  @@ -1875,14 +1888,6 @@
   
   												<p	>
   								
  -Note that reading of comma-separated values is also not
  -supported.  This format is provided for use with external viewing
  -and data manipulation tools like spreadsheets or databases.
  -						</p>
  -									
  -
  -												<p	>
  -								
   The internal viewing capabilities are described in the following subsections.
   						</p>
   									
  @@ -2008,7 +2013,9 @@
   		</td></tr>
   				<tr><td>
   		  															No Description
  -														  		</td></tr>
  +														<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/"></div>
  +											  		</td></tr>
   		<tr><td><br></td></tr>
   	 </table>
   	<hr>
  @@ -2160,7 +2167,9 @@
   		  															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.
  -														  		</td></tr>
  +														<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/"></div>
  +											  		</td></tr>
   		<tr><td><br></td></tr>
   	 </table>
   	<hr>
  @@ -3438,7 +3447,9 @@
   						</p>
   									
   
  -														  									 				<a name="spider_example"/>
  +														<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  									 				<a name="spider_example"/>
   	<p><b>Spidering Example</b></p>
   							
   
  @@ -4264,7 +4275,9 @@
   									
   
   						</p>
  -															  									 			 <p>
  +															<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  									 			 <p>
   	<b>Parameters</b>
   	<table border="1" cellspacing="0" cellpadding="2">
   	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4377,7 +4390,9 @@
   that is like counting the number of iterations through the test plan.  A global counter is like
   counting how many times that request was run.
   						</p>
  -															  									 			 <p>
  +															<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  									 			 <p>
   	<b>Parameters</b>
   	<table border="1" cellspacing="0" cellpadding="2">
   	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4429,7 +4444,9 @@
   						</p>
   									
   
  -														  		</td></tr>
  +														<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  		</td></tr>
   		<tr><td><br></td></tr>
   	 </table>
   	<hr>
  @@ -4444,7 +4461,9 @@
   								The intsum function can be used to compute the sum of two or more integer values.
   
   						</p>
  -															  									 			 <p>
  +															<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  									 			 <p>
   	<b>Parameters</b>
   	<table border="1" cellspacing="0" cellpadding="2">
   	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4521,7 +4540,9 @@
   						</p>
   									
   
  -														  									 			 <p>
  +														<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  									 			 <p>
   	<b>Parameters</b>
   	<table border="1" cellspacing="0" cellpadding="2">
   	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4567,7 +4588,9 @@
   		  																			<p	>
   								The machineName function returns the local host name
   						</p>
  -															  									 			 <p>
  +															<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  									 			 <p>
   	<b>Parameters</b>
   	<table border="1" cellspacing="0" cellpadding="2">
   	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4598,7 +4621,9 @@
   						</p>
   									
   	
  -														  									 			 <p>
  +														<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  									 			 <p>
   	<b>Parameters</b>
   	<table border="1" cellspacing="0" cellpadding="2">
   	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4635,7 +4660,9 @@
   		  																			<p	>
   								The random function returns a random number that lies between the given min and max values.
   						</p>
  -															  									 			 <p>
  +															<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  									 			 <p>
   	<b>Parameters</b>
   	<table border="1" cellspacing="0" cellpadding="2">
   	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4689,7 +4716,9 @@
   												<p	>
   								NOTE: A single instance of the file is opened and used for all threads.
   						</p>
  -															  									 			 <p>
  +															<p><b>Control Panel</b></p>
  +						<div align="center"><img src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  +											  									 			 <p>
   	<b>Parameters</b>
   	<table border="1" cellspacing="0" cellpadding="2">
   	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  
  
  
  1.18      +2 -3      jakarta-jmeter/docs/usermanual/functions.html
  
  Index: functions.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/functions.html,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- functions.html	12 Jun 2003 13:39:42 -0000	1.17
  +++ functions.html	13 Jun 2003 14:51:50 -0000	1.18
  @@ -193,9 +193,8 @@
   									.  Some functions take arguments to
   configure them, and these go in parentheses, comma-delimited.  If the function takes no arguments, the parentheses can
   be left out.  A further complication for argument values that themselves contain commas is that the value
  -should be encoded the way HTTP parameters are encoded.  JMeter provides a tool to help you construct
  -function calls for various built-in functions, which you can then copy-paste.  If your argument values
  -do not contain commas, encoding is not required.
  +should be escaped as necessary.  Thus, if you need to include a comma in your parameter value, escape it like so: '\,'.  JMeter provides a tool to help you construct
  +function calls for various built-in functions, which you can then copy-paste.  It will not automatically escape values for you, since functions can be parameters to other functions, and you should only escape values you intend as literal.
   						</p>
   							  									 				<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
   		<tr><td>										<sup	>
  
  
  
  1.11      +1 -1      jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Help.java
  
  Index: Help.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Help.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Help.java	25 Apr 2003 20:50:55 -0000	1.10
  +++ Help.java	13 Jun 2003 14:51:50 -0000	1.11
  @@ -29,7 +29,7 @@
   	private static String helpPage =
   		"file:///"
   			+ JMeterUtils.getJMeterHome()
  -			+ "/docs/usermanual/component_reference.html";
  +			+ "/printable_docs/usermanual/component_reference.html";
   	private static JDialog helpWindow;
   	private static HtmlPane helpDoc;
   	private static JScrollPane scroller;
  
  
  
  1.32      +3 -2      jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
  
  Index: JMeterUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- JMeterUtils.java	12 Jun 2003 13:39:42 -0000	1.31
  +++ JMeterUtils.java	13 Jun 2003 14:51:50 -0000	1.32
  @@ -96,7 +96,7 @@
    */
   public class JMeterUtils implements UnitTestManager
   {
  -        private static final String VERSION="1.9.RC20030612";
  +        private static final String VERSION="1.9.RC20030613";
           private static PatternCacheLRU patternCache = new PatternCacheLRU(1000,new Perl5Compiler());
   
   	transient private static Logger log = LoggingManager.getLoggerForClass();
  @@ -974,6 +974,7 @@
   		return VERSION;
   	}
   }
  +
   
   
   
  
  
  
  1.17      +3 -4      jakarta-jmeter/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
  
  Index: AbstractVisualizer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AbstractVisualizer.java	6 Jun 2003 14:02:08 -0000	1.16
  +++ AbstractVisualizer.java	13 Jun 2003 14:51:51 -0000	1.17
  @@ -56,9 +56,8 @@
               new JCheckBox(JMeterUtils.getResString("log_errors_only"));
   
           filePanel = new FilePanel(
  -                this,
  -                JMeterUtils.getResString("file_visualizer_output_file"));
  -
  +                JMeterUtils.getResString("file_visualizer_output_file"),".jtl");
  +        filePanel.addChangeListener(this);
           filePanel.add(errorLogging);
                   
       }
  
  
  
  1.16      +4 -2      jakarta-jmeter/xdocs/stylesheets/site.vsl
  
  Index: site.vsl
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/stylesheets/site.vsl,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- site.vsl	11 Jun 2003 15:38:33 -0000	1.15
  +++ site.vsl	13 Jun 2003 14:51:51 -0000	1.16
  @@ -17,6 +17,8 @@
   	 #set ($space = $space.charAt(0))
   	 #set ($udsc = "_")
   	 #set ($udsc = $udsc.charAt(0))
  +	 #set ($imgdir = "$relativePath/images")
  +	 #set ($sshotdir = "$imgdir/screenshots" )
   
   <!-- start the processing -->
   #document()
  @@ -169,7 +171,7 @@
   #end
   
   #macro (figure $figure)
  -	<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="$figure.getAttributeValue("image")"><br>
  +	<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="$sshotdir/$figure.getAttributeValue("image")"><br>
   	<font size="-1">#runloop($figure)</font></td></tr></table></p>
   #end
   
  @@ -247,7 +249,7 @@
   
   #macro ( component $component)
   	#set ($screenshot = "")
  -	#set ($screenshot = $component.getAttributeValue("screenshot") )
  +	#set ($screenshot = "$sshotdir/$component.getAttributeValue('screenshot')" )
   	<table border="0" cellspacing="0" cellpadding="2">
   		<tr><td>
   		  <font face="arial,helvetica,sanserif">
  
  
  
  1.7       +5 -3      jakarta-jmeter/xdocs/stylesheets/site_printable.vsl
  
  Index: site_printable.vsl
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/stylesheets/site_printable.vsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- site_printable.vsl	12 Jun 2003 13:39:42 -0000	1.6
  +++ site_printable.vsl	13 Jun 2003 14:51:51 -0000	1.7
  @@ -16,7 +16,9 @@
   	 #set ($space = " ")
   	 #set ($space = $space.charAt(0))
   	 #set ($udsc = "_")
  -	 #set ($udsc = $udsc.charAt(0))
  +	 #set ($udsc = $udsc.charAt(0))	 
  +	 #set ($imgdir = "$relativePath/../docs/images")
  +	 #set ($sshotdir = "$imgdir/screenshots")
   
   <!-- start the processing -->
   #document()
  @@ -169,7 +171,7 @@
   #end
   
   #macro (figure $figure)
  -	<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="$figure.getAttributeValue("image")"><br/>
  +	<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="$sshotdir/$figure.getAttributeValue("image")"><br/>
   	<font size="-1">#runloop($figure)</font></td></tr></table></p>
   #end
   
  @@ -241,7 +243,7 @@
   
   #macro ( component $component)
   	#set ($screenshot = "")
  -	#set ($screenshot = $component.getAttributeValue("screenshot") )
  +	#set ($screenshot = "$sshotdir/$component.getAttributeValue('screenshot')" )
   	<table border="0" cellspacing="0" cellpadding="2">
   		<tr><td>
   		  <font face="arial,helvetica,sanserif">
  
  
  
  1.7       +3 -3      jakarta-jmeter/xdocs/usermanual/build-adv-web-test-plan.xml
  
  Index: build-adv-web-test-plan.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/build-adv-web-test-plan.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build-adv-web-test-plan.xml	11 Jun 2003 15:49:30 -0000	1.6
  +++ build-adv-web-test-plan.xml	13 Jun 2003 14:51:51 -0000	1.7
  @@ -26,11 +26,11 @@
   <p>Download <a href="../demos/URLRewritingExample.jmx">this example</a>. In Figure 1 is shown a 
   test plan using URL rewriting.  Note that the URL Re-writing modifier is attached to the ThreadGroup,
   thus assuring that it will affect every request in that ThreadGroup.</p>
  -<figure image="../images/screenshots/url_rewrite_example_a.png">Figure 1 - Test Tree</figure>
  +<figure image="url_rewrite_example_a.png">Figure 1 - Test Tree</figure>
   <p>In Figure 2, we see the URL Re-writing modifier GUI, which just has a field for the user to specify
   the name of the session ID parameter.  There is also a checkbox for indicating that the session ID should
   be part of the path (separated by a ";"), rather than a request parameter</p>
  -<figure image="../images/screenshots/url_rewrite_example_b.gif">Figure 2 - Request parameters</figure>
  +<figure image="url_rewrite_example_b.gif">Figure 2 - Request parameters</figure>
   </example>
   </section>
   
  
  
  
  1.7       +7 -7      jakarta-jmeter/xdocs/usermanual/build-db-test-plan.xml
  
  Index: build-db-test-plan.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/build-db-test-plan.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build-db-test-plan.xml	12 Jun 2003 13:39:42 -0000	1.6
  +++ build-db-test-plan.xml	13 Jun 2003 14:51:51 -0000	1.7
  @@ -45,7 +45,7 @@
   Group Control Panel in the right section of the JMeter window (see Figure 7.1
   below)</p>
   
  -<figure image="../images/screenshots/webtest/threadgroup.png">
  +<figure image="webtest/threadgroup.png">
   Figure 7.1. Thread Group with Default Values</figure>
   
   <p>Start by providing a more descriptive name for our Thread Group. In the name
  @@ -79,7 +79,7 @@
   
   <p>See Figure 7.2 for the completed JDBC Users Thread Group.</p>
   
  -<figure image="../images/screenshots/jdbctest/threadgroup2.png">
  +<figure image="jdbctest/threadgroup2.png">
   Figure 7.2. JDBC Users Thread Group</figure>
   
   </section>
  @@ -98,7 +98,7 @@
   to get the Add menu, and then select Add --&gt; Sampler --&gt; JDBC Request.
   Then, select this new element to view its Control Panel (see Figure 7.3).</p>
   
  -<figure image="../images/screenshots/jdbctest/JDBCRequest.png">
  +<figure image="jdbctest/JDBCRequest.png">
   Figure 7.3. JDBC Request</figure>
   
   <p>In our Test Plan, we will make two JDBC requests. The first one is for
  @@ -121,7 +121,7 @@
   </ol>
   </p>
   
  -<figure image="../images/screenshots/jdbctest/JDBCRequest2.png">
  +<figure image="jdbctest/JDBCRequest2.png">
   Figure 7.4. JDBC Request for Eastman Kodak stock</figure>
   
   <p>Next, add the second JDBC Request and edit the following properties (see
  @@ -138,7 +138,7 @@
   </ol>
   </p>
   
  -<figure image="../images/screenshots/jdbctest/JDBCRequest3.png">
  +<figure image="jdbctest/JDBCRequest3.png">
   Figure 7.6. JDBC Request for Pfizer stock</figure>
   
   </section>
  @@ -152,7 +152,7 @@
   <p>Select the JDBC Users element and add a <complink name="Graph Results"/>
   listener (Add --&gt; Listener --&gt; Graph Results).</p>
   
  -<figure image="../images/screenshots/jdbctest/graph-results.png">
  +<figure image="jdbctest/graph-results.png">
   Figure 7.6. Graph results Listener</figure>
   
   </section>
  
  
  
  1.8       +8 -8      jakarta-jmeter/xdocs/usermanual/build-ftp-test-plan.xml
  
  Index: build-ftp-test-plan.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/build-ftp-test-plan.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build-ftp-test-plan.xml	12 Jun 2003 13:39:42 -0000	1.7
  +++ build-ftp-test-plan.xml	13 Jun 2003 14:51:51 -0000	1.8
  @@ -45,7 +45,7 @@
   Group Control Panel in the right section of the JMeter window (see Figure 8.1
   below)</p>
   
  -<figure image="../images/screenshots/webtest/threadgroup.png">
  +<figure image="webtest/threadgroup.png">
   Figure 8.1. Thread Group with Default Values</figure>
   
   <p>Start by providing a more descriptive name for our Thread Group. In the name
  @@ -75,7 +75,7 @@
   
   <p>See Figure 8.2 for the completed O'Reilly Users Thread Group.</p>
   
  -<figure image="../images/screenshots/ftptest/threadgroup2.png">
  +<figure image="ftptest/threadgroup2.png">
   Figure 8.2. O'Reilly Users Thread Group</figure>
   
   </section>
  @@ -91,7 +91,7 @@
   Defaults. Then, select this new element to view its Control Panel (see Figure 8.3).
   </p>
   
  -<figure image="../images/screenshots/ftptest/ftp-defaults.png">
  +<figure image="ftptest/ftp-defaults.png">
   Figure 8.3. FTP Request Defaults</figure>
   
   <p>
  @@ -111,7 +111,7 @@
   
   <p>See Figure 8.4 for the completed FTP Request Defaults element</p>
   
  -<figure image="../images/screenshots/ftptest/ftp-defaults2.png">
  +<figure image="ftptest/ftp-defaults2.png">
   Figure 8.4. FTP Defaults for our Test Plan</figure>
   
   </section>
  @@ -139,7 +139,7 @@
   <note>You do not have to set the Server Name field because you already specified
   this value in the FTP Request Defaults element.</note>
   
  -<figure image="../images/screenshots/ftptest/ftp-request.png">
  +<figure image="ftptest/ftp-request.png">
   Figure 8.5. FTP Request for O'Reilly mSQL Java README file</figure>
   
   <p>Next, add the second FTP Request and edit the following properties (see
  @@ -152,7 +152,7 @@
   </ol>
   </p>
   
  -<figure image="../images/screenshots/ftptest/ftp-request2.png">
  +<figure image="ftptest/ftp-request2.png">
   Figure 8.6. FTP Request for O'Reilly mSQL Java tutorial file</figure>
   
   </section>
  @@ -166,7 +166,7 @@
   <p>Select the O'Reilly Users element and add a <complink name="Spline Visualizer"/>
   listener (Add --&gt; Listener --&gt; Spline Visualizer).</p>
   
  -<figure image="../images/screenshots/ftptest/spline-results.png">
  +<figure image="ftptest/spline-results.png">
   Figure 8.7. Spline Visualizer Listener</figure>
   
   </section>
  
  
  
  1.4       +9 -9      jakarta-jmeter/xdocs/usermanual/build-ldap-test-plan.xml
  
  Index: build-ldap-test-plan.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/build-ldap-test-plan.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build-ldap-test-plan.xml	12 Jun 2003 12:17:17 -0000	1.3
  +++ build-ldap-test-plan.xml	13 Jun 2003 14:51:51 -0000	1.4
  @@ -28,7 +28,7 @@
   right mouse button to get the Add menu, and then select Add-->ThreadGroup. You should now see the
   Thread Group element under Test Plan. If you do not see the element, then "expand" the Test Plan tree by
   clicking on the Test Plan element.
  -<figure image="../images/screenshots/ldaptest/threadgroup.png">
  +<figure image="ldaptest/threadgroup.png">
   Figure 9.1. Thread Group with Default Values</figure>
   
   </p>
  @@ -40,7 +40,7 @@
   		<p>Like most JMeter elements, the Login  Config Element  Control Panel has a name
   field that you can modify. In this example, leave this field with the default value.</p>
   
  -<figure image="../images/screenshots/ldaptest/login-config-element.png">
  +<figure image="ldaptest/login-config-element.png">
     Figure 9.2 Login Config Element for our Test Plan</figure>
   
   		<note><p>Enter Username field to "your Server Username",<br/>
  @@ -57,7 +57,7 @@
   field that you can modify. In this example, leave this field with the default value.</p>
   
   
  -<figure image="../images/screenshots/ldaptest/requestdefaults.png">
  +<figure image="ldaptest/requestdefaults.png">
     Figure 9.3 LDAP Defaults for our Test Plan</figure>
   
   		<note>Enter DN field to "your Server Root Dn".<br/>
  @@ -83,7 +83,7 @@
   			<li>Change the Name to "Inbuilt-Add Test".</li>
   			<li>Select the Add test Radio button</li>
   		</ol>
  -                <figure image="../images/screenshots/ldaptest/add.png">
  +                <figure image="ldaptest/add.png">
                     Figure 9.4.1 LDAP Request for Inbuilt Add test</figure>
   
   
  @@ -97,7 +97,7 @@
   			<li>Select the Modify test Radio button</li>
   		</ol>
   		Next, add the Third LDAP Request and edit the following properties
  -                <figure image="../images/screenshots/ldaptest/modify.png">
  +                <figure image="ldaptest/modify.png">
                     Figure 9.4.2 LDAP Request for Inbuilt Modify test</figure>
   
   		<ol>
  @@ -106,14 +106,14 @@
   		</ol>
   		Next, add the fourth LDAP Request and edit the following properties
                   
  -                <figure image="../images/screenshots/ldaptest/delete.png">
  +                <figure image="ldaptest/delete.png">
                     Figure 9.4.3 LDAP Request for Inbuilt Delete test</figure>
   
                   <ol>
   			<li>Change the Name to "Inbuilt-Search Test".</li>
   			<li>Select the Search test Radio button</li>
   		</ol>
  -                <figure image="../images/screenshots/ldaptest/search.png">
  +                <figure image="ldaptest/search.png">
                     Figure 9.4.4 LDAP Request for Inbuilt Search test</figure>
   
   </section>
  @@ -122,7 +122,7 @@
    This element is responsible for storing all of the results of your LDAP
   requests in a file  and presenting a visual model of the data.Select the Siptech
   Users element and add a View Results in Table (Add --> Listener -->View Results in Table)</p>
  -<figure image="../images/screenshots/ldaptest/viewtable.png">
  +<figure image="ldaptest/viewtable.png">
     Figure 9.5 View result in Table Listener</figure>
   
   </section>
  
  
  
  1.10      +4 -4      jakarta-jmeter/xdocs/usermanual/build-test-plan.xml
  
  Index: build-test-plan.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/build-test-plan.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build-test-plan.xml	12 Jun 2003 13:39:42 -0000	1.9
  +++ build-test-plan.xml	13 Jun 2003 14:51:51 -0000	1.10
  @@ -55,14 +55,14 @@
   <section name="3.5 Scoping Rules" anchor="scoping_rules">
   <p>
   The JMeter test tree contains elements that are both hierarchical and ordered.  Some elements in the test trees are strictly hierarchical (Listeners, Config Elements, Post-Procesors, Pre-Processors, Assertions, Timers), and some are primarily ordered (controllers, samplers).  When you create your test plan, you will create an ordered list of sample request (via Samplers) that represent a set of steps to be executed.  These requests are often organized within controllers that are also ordered.  Given the following test tree:</p>
  -<figure image="../images/screenshots/scoping1.png">Example test tree</figure>
  +<figure image="scoping1.png">Example test tree</figure>
   <p>The order of requests will be, One, Two, Three, Four.</p>
   <p>Some controllers affect the order of their subelements, and you can read about these specific controllers in <a href="component_reference.html">the component reference</a>.</p>
   <p>Other elements are hierarchical.  An Assertion, for instance, is hierarchical in the test tree.  This means it is applied to all requests that occur at it's level and below.  In the following test tree:</p>
  -<figure image="../images/screenshots/scoping2.png">Hierarchy example</figure>
  +<figure image="scoping2.png">Hierarchy example</figure>
   <p>Assertion #1 is applied only to Request One, while Assertion #2 is applied to Requests Two and Three.</p>
   <p>Another example, this time using Timers:</p>
  -<figure image="../images/screenshots/scoping3.png">complex example</figure>
  +<figure image="scoping3.png">complex example</figure>
   <p>In this example, the requests or named to reflect the order in which they will be executed.  Timer #1 will apply to Requests Two, Three, and Four (notice how order is irrelevant for hierarchical elements).  Assertion #1 will apply only to Request Three.  Timer #2 will affect all the requests.</p>
   <p>Hopefully these examples make it clear how configuration (hierarchical) elements are applied.  If you imagine each Request being passed up the tree branches, to its parent, then to its parent's parent, etc, and each time collecting all the configuration elements of that parent, then you will see how it works.  </p>
   </section>
  
  
  
  1.17      +8 -8      jakarta-jmeter/xdocs/usermanual/build-web-test-plan.xml
  
  Index: build-web-test-plan.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/build-web-test-plan.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build-web-test-plan.xml	12 Jun 2003 13:39:42 -0000	1.16
  +++ build-web-test-plan.xml	13 Jun 2003 14:51:51 -0000	1.17
  @@ -48,7 +48,7 @@
   Group Control Panel in the right section of the JMeter window (see Figure 5.1
   below)</p>
   
  -<figure image="../images/screenshots/webtest/threadgroup.png">
  +<figure image="webtest/threadgroup.png">
   Figure 5.1. Thread Group with Default Values</figure>
   
   <p>Start by providing a more descriptive name for our Thread Group. In the name
  @@ -78,7 +78,7 @@
   
   <p>See Figure 5.2 for the completed Jakarta Users Thread Group.</p>
   
  -<figure image="../images/screenshots/webtest/threadgroup2.png">
  +<figure image="webtest/threadgroup2.png">
   Figure 5.2. Jakarta Users Thread Group</figure>
   
   </section>
  @@ -94,7 +94,7 @@
   Defaults. Then, select this new element to view its Control Panel (see Figure 5.3).
   </p>
   
  -<figure image="../images/screenshots/webtest/http-defaults1.png">
  +<figure image="webtest/http-defaults1.png">
   Figure 5.3. HTTP Request Defaults</figure>
   
   <p>
  @@ -114,7 +114,7 @@
   
   <p>See Figure 5.4 for the completed HTTP Request Defaults element</p>
   
  -<figure image="../images/screenshots/webtest/http-defaults2.png">
  +<figure image="webtest/http-defaults2.png">
   Figure 5.4. HTTP Defaults for our Test Plan</figure>
   
   </section>
  @@ -153,7 +153,7 @@
   </ol>
   </p>
   
  -<figure image="../images/screenshots/webtest/http-request1.png">
  +<figure image="webtest/http-request1.png">
   Figure 5.5. HTTP Request for Jakarta Home Page</figure>
   
   <p>Next, add the second HTTP Request and edit the following properties (see
  @@ -164,7 +164,7 @@
   </ol>
   </p>
   
  -<figure image="../images/screenshots/webtest/http-request2.png">
  +<figure image="webtest/http-request2.png">
   Figure 5.6. HTTP Request for Jakarta Project Guidelines Page</figure>
   
   </section>
  @@ -180,7 +180,7 @@
   output file.  You can either type it into the filename field, or select the
   Browse button and browse to a directory and then enter a filename.</p>
   
  -<figure image="../images/screenshots/graph_results.png">
  +<figure image="graph_results.png">
   Figure 5.7. Graph Results Listener</figure>
   
   </section>
  
  
  
  1.46      +74 -77    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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- component_reference.xml	12 Jun 2003 13:39:42 -0000	1.45
  +++ component_reference.xml	13 Jun 2003 14:51:51 -0000	1.46
  @@ -10,7 +10,7 @@
   
   <section name="13.1 Samplers" anchor="samplers">
   
  -<component index="13.1.1" name="FTP Request" screenshot="../images/screenshots/gen-controller/ftp-request.gif">
  +<component index="13.1.1" name="FTP Request" 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
  @@ -32,7 +32,7 @@
   
   </component>
   
  -<component name="HTTP Request" index="13.1.2" screenshot="../images/screenshots/gen-controller/http-request.png">
  +<component name="HTTP Request" index="13.1.2" screenshot="gen-controller/http-request.png">
   
   <description>
           <p>This sampler lets you send an HTTP/HTTPS request to a web server.  It
  @@ -108,7 +108,7 @@
   
   </component>
   
  -<component name="JDBC Request" index="13.1.3" screenshot="../images/screenshots/gen-controller/jdbc-request.gif">
  +<component name="JDBC Request" index="13.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
  @@ -148,7 +148,7 @@
   
   </component>
   
  -<component name="Java Request" index="13.1.4" screenshot="../images/screenshots/java_request.gif">
  +<component name="Java Request" index="13.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,
  @@ -171,7 +171,7 @@
   
   </component>
   
  -<component name="SOAP/XML-RPC Request" index="13.1.5" screenshot="../images/screenshots/soap_sampler.png">
  +<component name="SOAP/XML-RPC Request" index="13.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
  @@ -188,7 +188,7 @@
   
   </component>
   
  -<component name="LDAP Request" index="13.1.6" screenshot="../images/screenshots/ldap_request.png">
  +<component name="LDAP Request" index="13.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"/>
  @@ -268,7 +268,7 @@
                                         </links>
   
   </component>
  -<component name="WebService(SOAP) Request (Alpha Code)" index="13.1.7" screenshot="../images/screenshots/webservice_sampler.png">
  +<component name="WebService(SOAP) Request (Alpha Code)" index="13.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. The sampler uses Apache SOAP driver, to serialize the message and set the header with the correct SOAPAction. Right now the sampler doesn't support automatic WSDL handling, since Apache SOAP currently doesn't provide support for it. Both IBM and SUN provide WSDL drivers.</p>
   </description>
  @@ -287,7 +287,7 @@
   
   <section name="13.2 Logic Controllers" anchor="logic_controllers">
   
  -<component index="13.2.1" name="Interleave Controller" screenshot="../images/screenshots/logic-controller/interleave-controller.gif">
  +<component index="13.2.1" name="Interleave Controller" screenshot="logic-controller/interleave-controller.gif">
   <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>
  @@ -316,7 +316,7 @@
   we configured the Thread Group to have two threads and a loop count of five, for a total of ten
   requests per thread. See the table below for the sequence JMeter sends the HTTP Requests.</p>
   
  -<figure image="../images/screenshots/logic-controller/interleave.png">Figure 1 - Interleave Controller Example 1</figure>
  +<figure image="logic-controller/interleave.png">Figure 1 - Interleave Controller Example 1</figure>
   
   <table border="1" cellspacing="0" cellpadding="4">
   <tr valign="top"><td>Loop Iteration</td><td>Each JMeter Thread Sends These HTTP Requests</td></tr>
  @@ -342,7 +342,7 @@
   to have a single thread and a loop count of eight.  Notice that the Test Plan has an outer Interleave Controller with
   two Interleave Controllers inside of it.</p>
   
  -<figure image="../images/screenshots/logic-controller/interleave2.png">
  +<figure image="logic-controller/interleave2.png">
           Figure 2 - Interleave Controller Example 2
   </figure>
   
  @@ -353,7 +353,7 @@
   </example>
   </component>
   
  -<component index="13.2.2" name="Loop Controller" anchor="loop" screenshot="../images/screenshots/logic-controller/loop-controller.gif">
  +<component index="13.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
  @@ -377,7 +377,7 @@
   In this example, we created a Test Plan that sends a particular HTTP Request
   only once and sends another HTTP Request five times.</p>
   
  -<figure image="../images/screenshots/logic-controller/loop-example.gif">Figure 3 - Loop Controller Example</figure>
  +<figure image="logic-controller/loop-example.gif">Figure 3 - Loop Controller Example</figure>
   
   <p>We configured the Thread Group for a single thread and a loop count value of
   one. Instead of letting the Thread Group control the looping, we used a Loop
  @@ -393,7 +393,7 @@
   </component>
   
   <component index="13.2.3" name="Once Only Controller" anchor="once_only_controller"
  -screenshot="../images/screenshots/logic-controller/once-only-controller.gif">
  +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
   during further iterations through the test plan.</p>
  @@ -413,14 +413,14 @@
   Each thread sends one request to the Home Page, followed by three requests to the Bug Page.
   Although we configured the Thread Group to iterate three times, each JMeter thread only
   sends one request to the Home Page because this request lives inside a Once Only Controller.</p>
  -<figure image="../images/screenshots/logic-controller/once-only-example.png">Figure 4. Once Only Controller Example</figure>
  +<figure image="logic-controller/once-only-example.png">Figure 4. Once Only Controller Example</figure>
   <p>Each JMeter thread will send the requests in the following order: Home Page, Bug Page,
   Bug Page, Bug Page. Note, the File Reporter is configured to store the results in a file named "loop-test.dat" in the current directory.</p>
   
   </example>
   </component>
   
  -<component index="13.2.4" name="Simple Controller" anchor="simple_controller" screenshot="../images/screenshots/logic-controller/simple-controller.gif">
  +<component index="13.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
  @@ -439,12 +439,12 @@
   following order: Ant Home Page, Ant News Page, Log4J Home Page, Log4J History Page.
   Note, the File Reporter
   is configured to store the results in a file named "simple-test.dat" in the current directory.</p>
  -<figure image="../images/screenshots/logic-controller/simple-example.gif">Figure 5 Simple Controller Example</figure>
  +<figure image="logic-controller/simple-example.gif">Figure 5 Simple Controller Example</figure>
   
   </example>
   </component>
   
  -<component index="13.2.5" name="Random Controller" screenshot="../images/screenshots/logic-controller/random-controller.gif">
  +<component index="13.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
  @@ -459,7 +459,7 @@
   
   </component>
   
  -<component index="13.2.6" name="Recording Controller" screenshot="../images/screenshots/logic-controller/recording-controller.gif">
  +<component index="13.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
  @@ -473,7 +473,7 @@
   
   </component>
   
  -<component index="13.2.7" name="Module Controller" screenshot="../images/screenshots/module_controller.png">
  +<component index="13.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
  @@ -490,7 +490,7 @@
   
   </component>
   
  -<component index="13.2.8" name="Throughput Controller" screenshot="../images/screenshots/throughput_controller.png">
  +<component index="13.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
  @@ -517,15 +517,16 @@
   The saving and reading of test results is generic.  The various
   listeners generally have a panel whereby one can specify the file to
   which the results will be written (or read).  By default,
  -the results are stored as XML
  -files, typically with a ".jtl" extension.</p>
  +the results are stored as CSV
  +files, typically with a ".jtl" extension.  Storing as CSV is the most efficient option, but is less detailed than XML (the other available option).</p>
  +<p>To change the format, in jmeter.properties, find the following line:</p>
  +<p>jmeter.save.saveservice.output_format=csv</p>
  +<p>Change "csv" to "xml" for greater detail.</p>
   <p>
  -The information to be saved is configurable.  If one specifies the
  -"Functional Test Mode" on the Test Plan element, one gets the largest
  -amount of information.  If this box is not checked, the default saved
  +The information to be saved is configurable.  For maximum information, choose "xml" as the format and specify "Functional Test Mode" on the Test Plan element.  If this box is not checked, the default saved
   data includes a time stamp (the number of milliseconds since midnight,
   January 1, 1970 UTC), the data type, the thread name, the label, the
  -response time, message, and code, and a success indicator.</p>
  +response time, message, and code, and a success indicator.  If checked, all information, including the full response data will be logged.</p>
   <p>
   One can get a more selective set of information my modifying the
   jmeter.properties file.  The following example indicates how to set
  @@ -594,14 +595,10 @@
   make it impossible for JMeter to interpret the value when it is read
   in later for viewing purposes.</p>
   <p>
  -Note that reading of comma-separated values is also not
  -supported.  This format is provided for use with external viewing
  -and data manipulation tools like spreadsheets or databases.</p>
  -<p>
   The internal viewing capabilities are described in the following subsections.</p>
   
   </description>
  -<component index="13.3.1" name="Mailer Visualizer" screenshot="../images/screenshots/mailer_vis.png">
  +<component index="13.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>
   
  @@ -628,7 +625,7 @@
   <description>No Description</description>
   </component>
   
  -<component index="13.3.3" name="Graph Results" screenshot="../images/screenshots/graph_results.png">
  +<component index="13.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>
  @@ -641,14 +638,14 @@
   number.</p></description>
   </component>
   
  -<component index="13.3.4" name="Spline Visualizer" screenshot="../images/screenshots/spline_visualizer.png">
  +<component index="13.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="13.3.5" name="Assertion Results" screenshot="../images/screenshots/assertion_results.png">
  +<component index="13.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>
  @@ -658,7 +655,7 @@
   </links>
   </component>
   
  -<component index="13.3.6" name="View Results Tree" screenshot="../images/screenshots/view_results_tree.png">
  +<component index="13.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.
  @@ -672,13 +669,13 @@
   </description>
   </component>
   
  -<component index="13.3.7" name="Aggregate Report" screenshot="../images/screenshots/aggregate_report.png">
  +<component index="13.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 an
   idealized throughput calculation.</description>
   </component>
   
  -<component index="13.3.8" name="View Results in Table" screenshot="../images/screenshots/table_results.png">
  +<component index="13.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.</description>
  @@ -694,7 +691,7 @@
   
   <section name="13.4 Configuration Elements" anchor="config_elements">
   
  -<component index="13.4.1" name="HTTP Authorization Manager" screenshot="../images/screenshots/http-config/http-auth-manager.gif">
  +<component index="13.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
  @@ -741,8 +738,8 @@
   to "/secret/index1.html" and "/secret/index2.html".  The other HTTP request, named "NoSecretPage" makes a request to
   "/index.html".</p>
   
  -<figure image="../images/screenshots/http-config/auth-manager-example1a.gif">Figure 6 - Test Plan</figure>
  -<figure image="../images/screenshots/http-config/auth-manager-example1b.gif">Figure 7 - Authorization Manager Control Panel</figure>
  +<figure image="http-config/auth-manager-example1a.gif">Figure 6 - Test Plan</figure>
  +<figure image="http-config/auth-manager-example1b.gif">Figure 7 - Authorization Manager Control Panel</figure>
   
   <p>When we run the Test Plan, JMeter looks in the Authorization table for the URL it is requesting.  If the Base URL matches
   the URL, then JMeter passes this information along with the request.</p>
  @@ -753,7 +750,7 @@
   
   </component>
   
  -<component index="13.4.2" name="HTTP Cookie Manager" screenshot="../images/screenshots/http-config/http-cookie-manager.gif">
  +<component index="13.4.2" name="HTTP Cookie Manager" screenshot="http-config/http-cookie-manager.gif">
   
   <description><p>The Cookie Manager element has two functions:<br/>
   First, it stores and sends cookies just like a web browser. If you have an HTTP Request and
  @@ -778,7 +775,7 @@
   
   </component>
   
  -<component index="13.4.3" name="HTTP Proxy Server" screenshot="../images/screenshots/proxy_control.png">
  +<component index="13.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
  @@ -838,7 +835,7 @@
   </component>
   
   <component index="13.4.4" name="HTTP Request Defaults"
  -        screenshot="../images/screenshots/http-config/http-request-defaults.png">
  +        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,
   you could add a single HTTP Request Defaults element with the "Server Name or IP" field filled in.  Then, when
  @@ -866,28 +863,28 @@
   </component>
   
   <component index="13.4.5" name="FTP Request Defaults"
  -                screenshot="../images/screenshots/ftp-config/ftp-request-defaults.gif">
  +                screenshot="ftp-config/ftp-request-defaults.gif">
   <description></description>
   </component>
   
   <component index="13.4.6" name="JDBC Database Connection Pool Defaults"
  -                screenshot="../images/screenshots/jdbc-config/jdbc-db-conn-pool.gif">
  +                screenshot="jdbc-config/jdbc-db-conn-pool.gif">
   <description></description>
   </component>
   
   <component index="13.4.7" name="JDBC Database Login Defaults"
  -                screenshot="../images/screenshots/jdbc-config/jdbc-db-login.gif">
  +                screenshot="jdbc-config/jdbc-db-login.gif">
   <description></description>
   </component>
   
   <component index="13.4.8" name="JDBC SQL Query Defaults"
  -                screenshot="../images/screenshots/jdbc-config/jdbc-sql-query.gif">
  +                screenshot="jdbc-config/jdbc-sql-query.gif">
   <description></description>
   </component>
   
   
   
  -<component index="13.4.9" name="HTTP Header Manager" screenshot="../images/screenshots/http-config/http-header-manager.gif">
  +<component index="13.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>
   
  @@ -910,13 +907,13 @@
   that tells JMeter to override the default "User-Agent" request header and use a particular Internet Explorer agent string
   instead. (see figures 9 and 10).</p>
   
  -<figure image="../images/screenshots/http-config/header-manager-example1a.gif">Figure 9 - Test Plan</figure>
  -<figure image="../images/screenshots/http-config/header-manager-example1b.gif">Figure 10 - Header Manager Control Panel</figure>
  +<figure image="http-config/header-manager-example1a.gif">Figure 9 - Test Plan</figure>
  +<figure image="http-config/header-manager-example1b.gif">Figure 10 - Header Manager Control Panel</figure>
   </example>
   
   </component>
   
  -<component index="13.4.10" name="Login Config Element" screenshot="../images/screenshots/login-config.png">
  +<component index="13.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>
   
  @@ -928,7 +925,7 @@
   
   </component>
   
  -<component index="13.4.11" name="Simple Config Element" screenshot="../images/screenshots/simple_config_element.png">
  +<component index="13.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>
  @@ -943,13 +940,13 @@
   
   </component>
   
  -<component index="13.4.12" name="LDAP Request Defaults" screenshot="../images/screenshots/ldap_defaults.png">
  +<component index="13.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="13.4.13" name="Java Request Defaults" screenshot="../images/screenshots/java_defaults.png">
  +<component index="13.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>
   
  @@ -959,7 +956,7 @@
   
   <section name="13.5 Assertions" anchor="assertions">
   
  -<component index="13.5.1" name="Response Assertion" anchor="basic_assertion" screenshot="../images/screenshots/assertion/assertion.gif">
  +<component index="13.5.1" name="Response Assertion" anchor="basic_assertion" screenshot="assertion/assertion.gif">
   
   <description><p>The response assertion control panel let's you add strings to be tested. These strings can
   be regular expressions. You can also choose whether the strings will be expected
  @@ -980,16 +977,16 @@
   </properties>
   
   <example title="Assertion Examples" anchor="assertion_examples">
  -<figure image="../images/screenshots/assertion/example1a.png">Figure 7 - Test Plan</figure>
  -<figure image="../images/screenshots/assertion/example1b.gif">Figure 8 - Assertion Control Panel with Pattern</figure>
  -<figure image="../images/screenshots/assertion/example1c-pass.gif">Figure 9 - Assertion Listener Results (Pass)</figure>
  -<figure image="../images/screenshots/assertion/example1c-fail.gif">Figure 10 - Assertion Listener Results (Fail)</figure>
  +<figure image="assertion/example1a.png">Figure 7 - Test Plan</figure>
  +<figure image="assertion/example1b.gif">Figure 8 - Assertion Control Panel with Pattern</figure>
  +<figure image="assertion/example1c-pass.gif">Figure 9 - Assertion Listener Results (Pass)</figure>
  +<figure image="assertion/example1c-fail.gif">Figure 10 - Assertion Listener Results (Fail)</figure>
   </example>
   
   
   </component>
   
  -<component index="13.5.2" name="Duration Assertion" screenshot="../images/screenshots/duration_assertion.png">
  +<component index="13.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>
  @@ -1002,7 +999,7 @@
   </properties>
   </component>
   
  -<component index="13.5.3" name="Size Assertion" screenshot="../images/screenshots/size_assertion.png">
  +<component index="13.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>
   
  @@ -1015,7 +1012,7 @@
   </properties>
   </component>
   
  -<component index="13.5.4" name="XML Assertion" screenshot="../images/screenshots/xml_assertion.png">
  +<component index="13.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>
   
  @@ -1029,7 +1026,7 @@
   
   <section name="13.6 Timers" anchor="timers">
   
  -<component index="13.6.1" name="Constant Timer" anchor="constant" screenshot="../images/screenshots/timers/constant_timer.gif">
  +<component index="13.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>
  @@ -1040,7 +1037,7 @@
   </properties>
   </component>
   
  -<component index="13.6.2" name="Gaussian Random Timer" screenshot="../images/screenshots/timers/gauss_random_timer.gif">
  +<component index="13.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
  @@ -1057,7 +1054,7 @@
   
   </component>
   
  -<component index="13.6.3" name="Uniform Random Timer" screenshot="../images/screenshots/timers/uniform_random_timer.gif">
  +<component index="13.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
  @@ -1073,7 +1070,7 @@
   
   </component>
   
  -<component index="13.6.4" name="Constant Throughput Timer" screenshot="../images/screenshots/timers/constant_throughput_timer.gif">
  +<component index="13.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>
   
  @@ -1129,7 +1126,7 @@
   will choose at random, and replace the value in your URL test sample.  Each time through
   the test, a new random value will be chosen.</p>
   
  -<figure image="../images/screenshots/modification.png">Figure 8 - Online Poll Example</figure>
  +<figure image="modification.png">Figure 8 - Online Poll Example</figure>
   
   <note>One important thing to remember is that you must create a test sample immediately
   prior that will return an HTML page with the links and forms that are relevant to
  @@ -1138,7 +1135,7 @@
   
   </component>
   
  -<component index="13.7.2" name="HTTP URL Re-writing Modifier" screenshot="../images/screenshots/url_rewriter.png">
  +<component index="13.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
  @@ -1161,7 +1158,7 @@
   </properties>
   </component>
   
  -<component index="13.7.3" name="HTML Parameter Mask" useinstead="Counter" screenshot="../images/screenshots/parameter_mask.png">
  +<component index="13.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
  @@ -1189,7 +1186,7 @@
   </properties>
   </component>
   
  -<component index="13.7.4" name="HTTP User Parameter Modifier" useinstead="User Parameters" screenshot="../images/screenshots/user_param_modifier.gif">
  +<component index="13.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
  @@ -1208,7 +1205,7 @@
   </properties>
   </component>
   
  -<component index="13.7.5" name="User Parameters" screenshot="../images/screenshots/user_params.png">
  +<component index="13.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
  @@ -1232,7 +1229,7 @@
   </properties>
   </component>
   
  -<component index="13.7.6" name="Counter" screenshot="../images/screenshots/counter.png">
  +<component index="13.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
  @@ -1255,7 +1252,7 @@
   </section>
   
   <section name="13.8 Post-Processors" anchor="postprocessors">
  -<component index="13.8.1" name="Regular Expression Extractor" screenshot="../images/screenshots/regex_extractor.png">
  +<component index="13.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>
  @@ -1276,11 +1273,11 @@
   
   <section name="13.9 Miscellaneous Features" anchor="Miscellaneous_Features">
   
  -<component index="13.9.1" name="Test Plan" screenshot="../images/screenshots/testplan.png">
  +<component index="13.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="13.9.2" name="Thread Group" screenshot="../images/screenshots/threadgroup.png">
  +<component index="13.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>
  @@ -1292,7 +1289,7 @@
           <property name="End Time" required="No">If the scheduler checkbox is selected, one can choose an absolute end time.  When you start your test, JMeter will wait until the specified start time to begin testing, and it will stop at the specified end time.</property></properties>
   </component>
   
  -<component index="13.9.3" name="WorkBench" screenshot="../images/screenshots/workbench.png">
  +<component index="13.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>
   
  
  
  
  1.5       +4 -5      jakarta-jmeter/xdocs/usermanual/functions.xml
  
  Index: functions.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/functions.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- functions.xml	12 Jun 2003 13:39:42 -0000	1.4
  +++ functions.xml	13 Jun 2003 14:51:51 -0000	1.5
  @@ -52,16 +52,15 @@
   parameters begin with "__" to avoid conflict with user value names<sup>*</sup>.  Some functions take arguments to
   configure them, and these go in parentheses, comma-delimited.  If the function takes no arguments, the parentheses can
   be left out.  A further complication for argument values that themselves contain commas is that the value
  -should be encoded the way HTTP parameters are encoded.  JMeter provides a tool to help you construct
  -function calls for various built-in functions, which you can then copy-paste.  If your argument values
  -do not contain commas, encoding is not required.</p>
  +should be escaped as necessary.  Thus, if you need to include a comma in your parameter value, escape it like so: '\,'.  JMeter provides a tool to help you construct
  +function calls for various built-in functions, which you can then copy-paste.  It will not automatically escape values for you, since functions can be parameters to other functions, and you should only escape values you intend as literal.</p>
   <note><sup>*</sup>If you define a user-defined static variable with the same name as a built-in function, your static
   variable will override the built-in function.</note>
   </subsection>
   
   <subsection name="14.4 The Function Helper Dialog" anchor="function_helper">
   <p>The Function Helper dialog is available from JMeter's Tools menu.</p>
  -<figure image="../images/screenshots/function_helper_dialog.png">Function Helper Dialog</figure>
  +<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
   values for its arguments.  The left column in the table provides a brief description of the
   argument, and the right column is where you write in the value for that argument.  Different
  
  
  
  1.11      +2 -2      jakarta-jmeter/xdocs/usermanual/test_plan.xml
  
  Index: test_plan.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/test_plan.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- test_plan.xml	12 Jun 2003 13:39:42 -0000	1.10
  +++ test_plan.xml	13 Jun 2003 14:51:51 -0000	1.11
  @@ -251,7 +251,7 @@
   Since we placed "Web Defaults 1" inside a Loop Controller, only "Web Page 2" can access it.  The other HTTP
   requests will use "Web Defaults 2", since we placed it in the Thread Group (the "parent" of all other branches).</p>
   
  -<figure image="../images/screenshots/http-config/http-config-example.png">Figure 1 -
  +<figure image="http-config/http-config-example.png">Figure 1 -
   	Test Plan Showing Accessability of Configuration Elements</figure>
   </subsection>
   
  
  
  

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