Author: sebb
Date: Fri Oct 19 04:57:54 2007
New Revision: 586387

URL: http://svn.apache.org/viewvc?rev=586387&view=rev
Log:
Synch docs

Modified:
    jakarta/jmeter/trunk/docs/changes.html
    jakarta/jmeter/trunk/docs/usermanual/component_reference.html
    jakarta/jmeter/trunk/docs/usermanual/functions.html
    jakarta/jmeter/trunk/docs/usermanual/get-started.html
    jakarta/jmeter/trunk/docs/usermanual/remote-test.html
    jakarta/jmeter/trunk/docs/usermanual/test_plan.html

Modified: jakarta/jmeter/trunk/docs/changes.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/changes.html?rev=586387&r1=586386&r2=586387&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/changes.html (original)
+++ jakarta/jmeter/trunk/docs/changes.html Fri Oct 19 04:57:54 2007
@@ -134,6 +134,29 @@
                                                                Version 2.3.1
                                                </h3>
                                                                                
                                                                                
<h4     >
+                                                               Incompatible 
changes
+                                               </h4>
+                                                                               
                                                                                
<ul     >
+                                                               
+
+                                                                               
                <li     >
+                                                               JMeter server 
now creates the RMI registry by default.
+If the RMI registry has already been started externally, this will generate a 
warning message, but the server will continue.
+This should not affect JMeter testing. 
+However, if you are also using the RMI registry for other applications there 
may be problems.
+For example, when the JMeter server shuts down it will stop the RMI registry.
+Also user-written command files may need to be adjusted (the ones supplied 
with JMeter have been updated)
+
+                                                                               
                <br     >
+                                               </br>
+                                                                       
+To revert to the earlier behaviour, define the JMeter property: 
server.rmi.create=false.
+
+                                               </li>
+                                                                       
+
+                                               </ul>
+                                                                               
                                                                                
<h4     >
                                                                Bug fixes
                                                </h4>
                                                                                
                                                                                
<ul     >
@@ -159,6 +182,16 @@
                                                </li>
                                                                        
 
+                                                                               
                <li     >
+                                                               HTTP Mirror 
Server now always returns the exact same content, it used to return wrong if 
UTF-8 encoding was used for HTTP POST body, for example
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Bug 43612 - 
HTTP PUT does not honor request parameters
+                                               </li>
+                                                                       
+
                                                </ul>
                                                                                
                                                                                
<h4     >
                                                                Improvements
@@ -248,6 +281,36 @@
 
                                                                                
                <li     >
                                                                If the default 
delimiter does not work when loading a CSV file, guess the delimiter by 
analysing the header line.
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Add optional 
"loopback" protocol for HttpClient sampler
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               HTTP Mirror 
Server now supports blocking waiting for more data to appear, if content-length 
header is present in request
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               HTTP Mirror 
Server GUI now has the Start and Stop buttons in a more visible place
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Server mode now 
creates the RMI registry; to disable set the JMeter property 
server.rmi.create=false
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               HTTP Sampler 
now supports using MIME Type field to specify content-type request header when 
body is constructed from parameter values
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Enable exit 
after a single server test - define JMeter property server.exitaftertest=true
                                                </li>
                                                                        
 

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=586387&r1=586386&r2=586387&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Fri Oct 19 
04:57:54 2007
@@ -732,8 +732,8 @@
                                                </i>
                                                                        , the 
options to encode the parameter, and an option to include or exclude an equals 
sign (some applications
         don't expect an equals when the value is the empty string).  The query 
string will be generated in the correct fashion, depending on
-        the choice of "Method" you made (ie if you chose GET, the query string 
will be
-        appended to the URL, if POST, then it will be sent separately).  Also, 
if you are
+        the choice of "Method" you made (ie if you chose GET or DELETE, the 
query string will be
+        appended to the URL, if POST or PUT, then it will be sent separately). 
 Also, if you are
         sending a file using a multipart form, the query string will be 
created using the
         multipart form specifications.
         
@@ -759,12 +759,20 @@
         does not send a file, if filled in, JMeter automatically sends the 
request as
         a multipart form request.
         
+                                                                               
                <p      >
+                                                               
+        If it is a POST or PUT request and the 'name' atribute (below) are 
omitted, then the file is sent as the body
+        of the request. This allows arbitrary bodies to be sent. This 
functionality is present for POST requests
+        after version 2.2, and also for PUT requests after version 2.3.
+        
                                                                                
                <b      >
-                                                               In versions of 
JMeter after 2.2: if both the 'name' atribute and MIME type (below) are 
omitted, then the file is sent as the body
-        of the POST request. This allows arbitrary POST bodies to be sent.
+                                                               See below for 
some further information on parameter handling.
                                                </b>
                                                                        
         
+                                               </p>
+                                                                       
+        
                        </td>
                        <td>
                                                                                
        No
@@ -780,7 +788,11 @@
                </tr>
                        <tr>
                        <td>MIME Type</td>
-                       <td>                                            MIME 
type (for example, text/plain).
+                       <td>                                            MIME 
type (for example, text/plain).
+        If it is a POST or PUT request and either the 'name' atribute (below) 
are omitted or the request body is
+        constructed from parameter values only, then the value of this field 
is used as the value of the
+        content-type request header.
+        
                        </td>
                        <td>
                                                                                
        No
@@ -843,9 +855,11 @@
                                                                                
                <br     >
                                                </br>
                                                                        
-For the POST method, if there is no file to send, and the name(s) of the 
parameter(s) are omitted,
-then the body is created by concatenating all the value(s) of the parameters. 
+For the POST and PUT method, if there is no file to send, and the name(s) of 
the parameter(s) are omitted,
+then the body is created by concatenating all the value(s) of the parameters.
+This allows arbitrary bodies to be sent.
 The values are encoded if the encoding flag is set (versions of JMeter after 
2.3).
+See also the MIME Type above how you can control the content-type request 
header that are sent.
 
                                                                                
                <br     >
                                                </br>
@@ -856,6 +870,16 @@
 
                                                </p>
                                                                                
                                                                                
<p      >
+                                                               
+Method Handling:
+                                                                               
                <br     >
+                                               </br>
+                                                                       
+The POST and PUT request methods work similar, except that the PUT method does 
not support multipart requests.
+The GET and DELETE request methods work similar.
+
+                                               </p>
+                                                                               
                                                                                
<p      >
                                                                Upto and 
including JMeter 2.1.1, only responses with the content-type "text/html" were 
scanned for
 embedded resources. Other content-types were assumed to be something other 
than HTML.
 JMeter 2.1.2 introduces the a new property 
@@ -11373,6 +11397,15 @@
                                                                                
                <p      >
                                                                
 The Debug Sampler generates a sample containing the values of all JMeter 
variables and/or properties.
+
+                                               </p>
+                                                                       
+
+                                                                               
                <p      >
+                                                               
+The values can be seen in the 
+                                                                               
                <a 
href="../usermanual/component_reference.html#View_Results_Tree">View Results 
Tree</a>
+                                                                        
Listener Response Data pane.
 
                                                </p>
                                                                        

Modified: jakarta/jmeter/trunk/docs/usermanual/functions.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/functions.html?rev=586387&r1=586386&r2=586387&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/functions.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/functions.html Fri Oct 19 04:57:54 2007
@@ -191,150 +191,286 @@
                                                                                
                                                                                
<p      >
                                                                List of 
functions:
                                                </p>
-                                                                               
                                                                                
<ul     >
-                                                               
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__regexFunction">
-                                                               regexFunction - 
regular expression evaluator
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__counter">
-                                                               counter
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__threadNum">
-                                                               threadNum - get 
thread number
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__intSum">
-                                                               intSum - add 
variables
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__StringFromFile">
-                                                               StringFromFile 
- read a line from a file
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__machineName">
-                                                               machineName - 
get the local machine name
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__javaScript">
-                                                               JavaScript 
(Mozilla Rhino)
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__Random">
-                                                               random number
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__CSVRead">
-                                                               CSVRead - read 
from CSV delimited file
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__property">
-                                                               read a property
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__P">
-                                                               P - read a 
property
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__setProperty">
-                                                               setProperty - 
set a property
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__log">
-                                                               log - log a 
message
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__logn">
-                                                               logn - log a 
message
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__BeanShell">
-                                                               BeanShell - run 
BeanShell
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__split">
-                                                               split - Split a 
string into variables
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__XPath">
-                                                               XPath - XPath 
use an xpath expression
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__time">
-                                                               time - return 
current time in various formats
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__jexl">
-                                                               jexl - evaluate 
a Commons Jexl expression
-                                               </a>
-                                                       </li>
-                                                                       
-        
-                                                                               
                <li     >
-                                                                               
                <a       href="#__V">
-                                                               V evaluate a 
variable expression
-                                               </a>
-                                                       </li>
-                                                                       
-
-                                               </ul>
+                                                                               
                                                                         <table>
+                                                       <tr>
+                                                       <td bgcolor="#039acc" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 Name
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 Comment
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__regexFunction">regexFunction</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 parse previous response using a regular 
expression
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__counter">counter</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 generate an incrementing number
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__threadNum">threadNum</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 get thread number
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__intSum">intSum</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 add numbers
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a 
href="#__StringFromFile">StringFromFile</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 read a line from a file
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__machineName">machineName</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 get the local machine name
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__javaScript">javaScript</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 process JavaScript (Mozilla Rhino)
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__Random">Random</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 generate a random number
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__CSVRead">CSVRead</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 read from CSV delimited file
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__property">property</a> 
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 read a property
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__P">P</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 read a property (shorthand method)
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__setProperty">setProperty</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 set a JMeter property
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__log">log</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 log (or display) a message (and return the 
value)
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__logn">logn</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 log (or display) a message (empty return 
value)
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__BeanShell">BeanShell</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 run a BeanShell script
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__split">split</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 Split a string into variables
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__XPath">XPath</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 Use an XPath expression to read from a file
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__time">time</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 return current time in various formats
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__jexl">jexl</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 evaluate a Commons Jexl expression
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__V">V</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 evaluate a variable name
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__eval">eval</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 evaluate a variable expression
+                        </font>
+</td>
+                        </tr>
+                                                                       <tr>
+                                                       <td bgcolor="#a0ddf0" 
colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                  <a href="#__evalVar">evalVar</a>
+                        </font>
+</td>
+                                                                       <td 
bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+                                 evaluate an expression stored in a variable
+                        </font>
+</td>
+                        </tr>
+                        </table>
+                                                                               
                                                                                
<p      >
+                                               </p>
                                                                                
                                                                                
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
                <tr><td bgcolor="#828DA6">
                  <font color="#ffffff" face="arial,helvetica,sanserif">
@@ -384,7 +520,7 @@
                                                                                
                                                                                
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
                <tr><td bgcolor="#828DA6">
                  <font color="#ffffff" face="arial,helvetica,sanserif">
-                        <a name="where"><strong>19.2 Where can functions be 
used?</strong></a>
+                        <a name="where"><strong>19.2 Where can functions and 
variables be used?</strong></a>
                  </font>
                </td></tr>
                <tr><td>
@@ -395,11 +531,6 @@
 because they are expecting numbers, and thus will not accept a function.  
However, most fields will allow
 functions.
 
-                                                                               
                <br     >
-                                               </br>
-                                                                       
-The Cookie Manager does not support variables/functions.
-
                                                </p>
                                                                                
                                                                                
<p      >
                                                                
@@ -441,29 +572,23 @@
                                                                                
                                                                                
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
                <tr><td bgcolor="#828DA6">
                  <font color="#ffffff" face="arial,helvetica,sanserif">
-                        <a name="how"><strong>19.3 Writing the function 
string</strong></a>
+                        <a name="how"><strong>19.3 How to reference variables 
and functions</strong></a>
                  </font>
                </td></tr>
                <tr><td>
                  <blockquote>
                                                                                
                                        <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 '}'.
+                                                               Referencing a 
variable in a test element is done by bracketing the variable name with '${' 
and '}'.
                                                </p>
                                                                                
                                                                                
<p      >
-                                                               Built-in 
functions are written in the same manner, but by convention, the names of 
built-in
+                                                               Functions are 
referenced in the same manner, but by convention, the names of
 functions 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.
+be omitted.
                                                </p>
                                                                                
                                                                                
<p      >
                                                                Argument values 
that themselves contain commas should be escaped as necessary.
@@ -479,10 +604,42 @@
                                                </pre>
                                                                                
                                                                                
<p      >
                                                                
+Functions can reference variables and other functions, for example 
+
+                                                                               
                <code   >
+                                                               
${__XPath(${__P(xpath.file),${XPATH})}
+                                               </code>
+                                                                        
+will use the property "xpath.file" as the file name
+and the contents of the variable XPATH as the expression to search for.
+
+                                               </p>
+                                                                               
                                                                                
<p      >
+                                                               
 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      >
+                                                               
+
+                                                                               
                <b      >
+                                                               The value of a 
variable or function can be reported
+                                               </b>
+                                                                        using 
the 
+                                                                               
                <a       href="#__logn">
+                                                               __logn()
+                                               </a>
+                                                                        
function.
+The __logn() function reference can be used anywhere in the test plan after 
the variable has been defined.
+Alternatively, the Java Request sampler can be used to create a sample 
containing variable references;
+the output will be shown in the approriate Listener.
+For versions of JMeter later than 2.3, there is a 
+                                                                               
                <a 
href="../usermanual/component_reference.html#Debug_Sampler">Debug Sampler</a>
+                                                                        
+that can be used to display the values of variables etc in the Tree View 
Listener.
+
+                                               </p>
                                                                                
                                                                                
<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" 
cellpadding="2">
                <tr><td>                                                        
                        <sup    >
                                                                *
@@ -1567,6 +1724,13 @@
        In this case, the output is always printed - it does not depend on the 
current log setting.
 
                                                </p>
+                                                                               
                                                                                
<pre    >
+                                                               
+For example:
+     ${__log(Message)} - written to the log file
+     ${__log(Message,OUT)} - written to console window
+
+                                               </pre>
                                                                        
</td></tr>
                <tr><td><br></td></tr>
         </table>
@@ -1622,6 +1786,12 @@
        In this case, the output is always printed - it does not depend on the 
current log setting.
 
                                                </p>
+                                                                               
                                                                                
<pre    >
+                                                               
+For example:
+     ${__logn(VAR1=${VAR1},OUT)} - write the value of the variable to the 
console window
+
+                                               </pre>
                                                                        
</td></tr>
                <tr><td><br></td></tr>
         </table>
@@ -1920,8 +2090,15 @@
        
                                                                                
                <p      >
                                                                
-       The XPath function reads an XML file and matches the XPath, each
-       of the node match's are iterated through similar to the CVSReader.
+       The XPath function reads an XML file and matches the XPath.
+       Each time the function is called, the next match will be returned.
+       At end of file, it will wrap around to the start.
+       
+                                                                               
                <p><table border="1" bgcolor="#bbbb00" width="50%" 
cellspacing="0" cellpadding="2">
+               <tr><td>                                                Note 
that the entire file is held in memory, so this function should not be used for 
very large files.
+                       </td></tr>
+       </table></p>
+                                                                       
        
                                                </p>
                                                                        
@@ -1947,7 +2124,7 @@
                                                                                
                <br     >
                                                </br>
                                                                        
-       This will match all targets in build.xml and return the name variable
+       This will match all targets in build.xml and return the contents of the 
next name attribute
        
                                                </code>
                                                                        

Modified: jakarta/jmeter/trunk/docs/usermanual/get-started.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/get-started.html?rev=586387&r1=586386&r2=586387&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/get-started.html Fri Oct 19 04:57:54 
2007
@@ -934,17 +934,6 @@
                                                </a>
                                                                        , run 
JMeter in server mode on the remote node(s), and then control the server(s) 
from the GUI.
 You can also use non-GUI mode to run remote tests.
-
-                                                                               
                <p><table border="1" bgcolor="#bbbb00" width="50%" 
cellspacing="0" cellpadding="2">
-               <tr><td>                                                The 
jmeter-server/jmeter-server.bat script should start rmiregistry for you with 
the appropriate classpath. If it fails to
-do so, 
-                                                                               
                <a       href="remote-test.html#detail_instructions">
-                                                               read the details
-                                               </a>
-                                                                        about 
starting the jmeter server.
-                       </td></tr>
-       </table></p>
-                                                                       
 
 Run jmeter-server/jmeter-server.bat, plus these optional commands:
                                                </p>

Modified: jakarta/jmeter/trunk/docs/usermanual/remote-test.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/remote-test.html?rev=586387&r1=586386&r2=586387&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/remote-test.html Fri Oct 19 04:57:54 
2007
@@ -195,6 +195,15 @@
                                                                         
(windows) script.
                                                </p>
                                                                                
                                                                                
<p      >
+                                                               Note that there 
can only be one JMeter server on each node unless different RMI ports are used.
+                                               </p>
+                                                                               
                                                                                
<p      >
+                                                               Since JMeter 
2.3.1, the JMeter server application starts the RMI registry itself; 
+there is no need to start RMI registry separately.
+To revert to the previous behaviour, define the JMeter property 
server.rmi.create=false on the server host systems.
+
+                                               </p>
+                                                                               
                                                                                
<p      >
                                                                                
                <b      >
                                                                Step 2: Add the 
server IP to your client's Properties File
                                                </b>
@@ -281,6 +290,13 @@
                                                </b>
                                                        </p>
                                                                                
                                                                                
<p      >
+                                                               
+Since JMeter 2.3.1, the RMI registry is started by the JMeter server, so this 
section does not apply in the normal case.
+To revert to the previous behaviour, define the JMeter property 
server.rmi.create=false on the server host systems
+and follow the instructions below.
+
+                                               </p>
+                                                                               
                                                                                
<p      >
                                                                JMeter uses 
Remote Method Invocation (RMI) as the remote communication mechanism.  
Therefore, you need
 to run the RMI Registry application (which is named, "rmiregistry") that comes 
with the JDK and is located in the "bin" 
 directory.  Before running rmiregistry, make sure that the following jars are 
in your system claspath:
@@ -340,6 +356,12 @@
                                                                If you see 
connections refused, turn on debugging by passing the following options.
                                                </p>
                                                                                
                                                                                
<p      >
+                                                               Since JMeter 
2.3.1, the RMI registry is started by the server; however the options can still 
be passed in from the JMeter command line.
+For example: "jmeter -s -Dsun.rmi.loader.logLevel=verbose" (i.e. omit the -J 
prefixes).
+Alternatively the properties can be defined in the system.properties file.
+
+                                               </p>
+                                                                               
                                                                                
<p      >
                                                                The solution to 
the problem is to remove the loopbacks 127.0.0.1 and 127.0.0.2 from etc/hosts. 
What happens is jmeter-server can't connect to rmiregistry if 127.0.0.2 
loopback is not available. Use the following settings to fix the problem.
                                                </p>
                                                                                
                                                                                
<p      >
@@ -432,7 +454,6 @@
                                                                
 In both cases, the script starts rmiregistry on the specified port, 
 and then starts JMeter in server mode, having defined the "server_port" 
property.
-
 
                                                </p>
                                                                                
                                                                                
<p      >

Modified: jakarta/jmeter/trunk/docs/usermanual/test_plan.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/test_plan.html?rev=586387&r1=586386&r2=586387&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/test_plan.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/test_plan.html Fri Oct 19 04:57:54 2007
@@ -681,9 +681,16 @@
                <tr><td>
                  <blockquote>
                                                                                
                                        <p      >
-                                                               A Pre-Processor 
executes some action prior to a Sampler Request being made.  If a Pre-Processor 
is attached to a Sampler element, then it will execute just prior to that 
sampler element running.  A Pre-Processor is most often used to modify the 
settings of a Sample Request just before it runs, or to update variables that 
aren't extracted from response text.  See the 
-                                                                               
                                <a 
href="build-test-plan.html#scoping_rules">scoping rules</a>
-                                                                               
 for more details on when Pre-Processors are executed.
+                                                               A Pre-Processor 
executes some action prior to a Sampler Request being made. 
+If a Pre-Processor is attached to a Sampler element, then it will execute just 
prior to that sampler element running. 
+A Pre-Processor is most often used to modify the settings of a Sample Request 
just before it runs, or to update variables that aren't extracted from response 
text.  
+See the 
+                                                                               
                <a       href="build-test-plan.html#scoping_rules">
+                                                                               
                <b      >
+                                                               scoping rules
+                                               </b>
+                                                       </a>
+                                                                        for 
more details on when Pre-Processors are executed.
                                                </p>
                                                                          
</blockquote>
                </td></tr>
@@ -698,9 +705,16 @@
                <tr><td>
                  <blockquote>
                                                                                
                                        <p      >
-                                                               A 
Post-Processor executes some action after a Sampler Request has been made.  If 
a Post-Processor is attached to a Sampler element, then it will execute just 
after that sampler element runs.  A Post-Processor is most often used to 
process the response data, often to extract values from it.  See the 
-                                                                               
                                <a 
href="build-test-plan.html#scoping_rules">scoping rules</a>
-                                                                               
 for more details on when Pre-Processors are executed.
+                                                               A 
Post-Processor executes some action after a Sampler Request has been made.
+If a Post-Processor is attached to a Sampler element, then it will execute 
just after that sampler element runs.
+A Post-Processor is most often used to process the response data, often to 
extract values from it.  
+See the 
+                                                                               
                <a       href="build-test-plan.html#scoping_rules">
+                                                                               
                <b      >
+                                                               scoping rules
+                                               </b>
+                                                       </a>
+                                                                        for 
more details on when Post-Processors are executed.
                                                </p>
                                                                          
</blockquote>
                </td></tr>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to