Author: sebb
Date: Wed Sep 19 10:10:25 2007
New Revision: 577384

URL: http://svn.apache.org/viewvc?rev=577384&view=rev
Log:
sych recent docs changes

Modified:
    jakarta/jmeter/trunk/docs/changes.html
    jakarta/jmeter/trunk/docs/images/screenshots/beanshell_listener.png
    jakarta/jmeter/trunk/docs/images/screenshots/beanshell_postprocessor.png
    jakarta/jmeter/trunk/docs/images/screenshots/beanshell_preprocessor.png
    jakarta/jmeter/trunk/docs/images/screenshots/timers/beanshell_timer.png
    jakarta/jmeter/trunk/docs/known_bugs.html
    jakarta/jmeter/trunk/docs/usermanual/component_reference.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=577384&r1=577383&r2=577384&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/changes.html (original)
+++ jakarta/jmeter/trunk/docs/changes.html Wed Sep 19 10:10:25 2007
@@ -131,6 +131,48 @@
                                                </b>
                                                        </p>
                                                                                
                                                                                
<h3     >
+                                                               Version 2.3.1
+                                               </h3>
+                                                                               
                                                                                
<h4     >
+                                                               Bug fixes
+                                               </h4>
+                                                                               
                                                                                
<ul     >
+                                                               
+
+                                                                               
                <li     >
+                                                               SaveService no 
longer needs to instantiate classes
+                                               </li>
+                                                                       
+
+                                               </ul>
+                                                                               
                                                                                
<h4     >
+                                                               Improvements
+                                               </h4>
+                                                                               
                                                                                
<ul     >
+                                                               
+
+                                                                               
                <li     >
+                                                               Add run_gui Ant 
target, to package and then start the JMeter GUI from Ant
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Add 
File->Revert to easily drop the current changes and reload the project file 
currently loaded
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Bug 31366 - 
Remember recently opened file(s)
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Bug 43351 - Add 
support for Parameters and script file to all BeanShell test elements
+                                               </li>
+                                                                       
+
+                                               </ul>
+                                                                               
                                                                                
<h3     >
                                                                Version 2.3
                                                </h3>
                                                                                
                                                                                
<h3     >
@@ -152,6 +194,21 @@
                                                </li>
                                                                        
 
+                                                                               
                <li     >
+                                                               Bug 43332 - 
2.3RC4 does not clear Guis based on TestBean
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Bug 42948 - 
Problems with Proxy gui table fields in Java 1.6
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Fixup broken 
jmeter-server script
+                                               </li>
+                                                                       
+
                                                </ul>
                                                                                
                                                                                
<h4     >
                                                                Improvements
@@ -171,6 +228,11 @@
 
                                                                                
                <li     >
                                                                Add 
documentation links for Rhino and BeanShell to functions; clarify variables and 
properties
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Ensure uncaught 
exceptions are logged
                                                </li>
                                                                        
 

Modified: jakarta/jmeter/trunk/docs/images/screenshots/beanshell_listener.png
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/beanshell_listener.png?rev=577384&r1=577383&r2=577384&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
jakarta/jmeter/trunk/docs/images/screenshots/beanshell_postprocessor.png
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/beanshell_postprocessor.png?rev=577384&r1=577383&r2=577384&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
jakarta/jmeter/trunk/docs/images/screenshots/beanshell_preprocessor.png
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/beanshell_preprocessor.png?rev=577384&r1=577383&r2=577384&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
jakarta/jmeter/trunk/docs/images/screenshots/timers/beanshell_timer.png
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/timers/beanshell_timer.png?rev=577384&r1=577383&r2=577384&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/docs/known_bugs.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/known_bugs.html?rev=577384&r1=577383&r2=577384&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/known_bugs.html (original)
+++ jakarta/jmeter/trunk/docs/known_bugs.html Wed Sep 19 10:10:25 2007
@@ -128,9 +128,21 @@
                                                                                
                <li     >
                                                                
 
-                                                                               
                <a       
href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=Blocker&bug_severity=Critical&bug_severity=Major&bug_severity=Normal&bug_severity=Minor&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=JMeter&short_desc=&short_desc_type=substring&long_desc=&long_desc_type=substring&bug_file_loc=&bug_file_loc_type=substring&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number";>
+                                                                               
                <a       
href="http://issues.apache.org/bugzilla/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=JMeter&content=";>
                                                                
-BugZilla - Open bugs
+Bugzilla - All open bugs
+                                               </a>
+                                                                       
+
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               
+
+                                                                               
                <a       
href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_severity=Blocker&bug_severity=Critical&bug_severity=Major&bug_severity=Normal&bug_severity=Minor&bug_severity=Trivial&product=JMeter&cmdtype=doit&order=Bug+Number";>
+                                                               
+BugZilla - Open bugs (excluding enhancements)
                                                </a>
                                                        </li>
                                                                        
@@ -138,9 +150,9 @@
                                                                                
                <li     >
                                                                
 
-                                                                               
                <a       
href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=Enhancement&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=JMeter&short_desc=&short_desc_type=substring&long_desc=&long_desc_type=substring&bug_file_loc=&bug_file_loc_type=substring&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number";>
+                                                                               
                <a       
href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_severity=Enhancement&product=JMeter&cmdtype=doit&order=Bug+Number";>
                                                                
-BugZilla - Enhancements
+BugZilla - Enhancements only
                                                </a>
                                                                        
 

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=577384&r1=577383&r2=577384&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Wed Sep 19 
10:10:25 2007
@@ -555,6 +555,21 @@
                                                                        
         
                                                                                
                <p      >
+                                                               
+        JMeter defaults to the SSL protocol level TLS.
+        If the server needs a different level, e.g. SSLv3, change the JMeter 
property, for example:
+
+                                                                               
                <pre    >
+                                                               
+https.default.protocol=SSLv3
+
+                                               </pre>
+                                                                        
+        
+                                               </p>
+                                                                       
+        
+                                                                               
                <p      >
                                                                If the request 
uses cookies, then you will also need an
         
                                                                                
                <a 
href="../usermanual/component_reference.html#HTTP_Cookie_Manager">HTTP Cookie 
Manager</a>
@@ -728,7 +743,7 @@
         
                                                                                
                <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 arbitraty POST bodies to be sent.
+        of the POST request. This allows arbitrary POST bodies to be sent.
                                                </b>
                                                                        
         
@@ -942,6 +957,26 @@
                                                                        
                    
                                                                                
                <li     >
+                                                               Commit
+                                               </li>
+                                                                       
+                   
+                                                                               
                <li     >
+                                                               Rollback
+                                               </li>
+                                                                       
+                   
+                                                                               
                <li     >
+                                                               
Autocommit(false)
+                                               </li>
+                                                                       
+                   
+                                                                               
                <li     >
+                                                               Autocommit(true)
+                                               </li>
+                                                                       
+                   
+                                                                               
                <li     >
                                                                Edit - this 
should be a variable reference that evaluates to one of the above
                                                </li>
                                                                        
@@ -956,7 +991,46 @@
                </tr>
                        <tr>
                        <td>SQL Query</td>
-                       <td>                                            SQL 
query (for example, "select * from t_customers").
+                       <td>                                            
+        SQL query.
+        Do not enter a trailing semi-colon.
+        There is no need to use { and } to enclose Callable statements.
+        For example:
+        
+                                                                               
                <ul     >
+                                                               
+        
+                                                                               
                <li     >
+                                                               select * from 
t_customers where id=23
+                                               </li>
+                                                                       
+        
+                                                                               
                <li     >
+                                                               CALL 
SYSCS_UTIL.SYSCS_EXPORT_TABLE (null,?, ?, null, null, null)
+        
+                                                                               
                <ul     >
+                                                               
+        
+                                                                               
                <li     >
+                                                               Parameter 
values: tablename,filename
+                                               </li>
+                                                                       
+        
+                                                                               
                <li     >
+                                                               Parameter 
types:  VARCHAR,VARCHAR
+                                               </li>
+                                                                       
+        
+                                               </ul>
+                                                                       
+        
+                                               </li>
+                                                                       
+        The second example assumes you are using Apache Derby.
+        
+                                               </ul>
+                                                                       
+        
                        </td>
                        <td>
                                                                                
        Yes
@@ -975,7 +1049,7 @@
         
                        </td>
                        <td>
-                                                                               
        Yes, if a prepared statement has parameters
+                                                                               
        Yes, if a prepared or callable statement has parameters
                                                                </td>
                </tr>
                        <tr>
@@ -990,15 +1064,14 @@
         
                        </td>
                        <td>
-                                                                               
        Yes, if a prepared statement has parameters
+                                                                               
        Yes, if a prepared or callable statement has parameters
                                                                </td>
                </tr>
                </table>
        </p>
                                                                                
                                                                                
<p><b>See Also:</b>
        <ul>
-                                               <li><a 
href="test_plan.html#assertions">Assertion</a></li>
-                                                               <li><a 
href="build-db-test-plan.html">Building a Database Test Plan</a></li>
+                                               <li><a 
href="build-db-test-plan.html">Building a Database Test Plan</a></li>
                                                                <li>    <a 
href="../usermanual/component_reference.html#JDBC_Connection_Configuration">JDBC
 Connection Configuration</a>
 </li>
                                </ul>
@@ -2429,31 +2502,48 @@
                        <td>                                            
Descriptive name for this controller that is shown in the tree.
                        </td>
                        <td>
-                                                                               
        no
+                                                                               
        No
                                                                </td>
                </tr>
                        <tr>
                        <td>Parameters</td>
-                       <td>                                            List of 
parameters to be passed to the script file or the script.
-                       </td>
+                       <td>                                            
Parameters to pass to the BeanShell script.
+       The parameters are stored in the following variables:
+       
+                                                                               
                <ul     >
+                                                               
+               
+                                                                               
                <li     >
+                                                               Parameters - 
string containing the parameters as a single variable
+                                               </li>
+                                                                       
+           
+                                                                               
                <li     >
+                                                               bsh.args - 
String array containing parameters, split on white-space
+                                               </li>
+                                                                       
+       
+                                               </ul>
+                               </td>
                        <td>
-                                                                               
        no
+                                                                               
        No
                                                                </td>
                </tr>
                        <tr>
-                       <td>Script File</td>
-                       <td>                                            Name of 
a file to be used as a BeanShell script
+                       <td>Script file</td>
+                       <td>                                            A file 
containing the BeanShell script to run.
                        </td>
                        <td>
-                                                                               
        (yes)
+                                                                               
        No
                                                                </td>
                </tr>
                        <tr>
                        <td>Script</td>
-                       <td>                                            Script 
to be passed to BeanShell
+                       <td>                                            The 
BeanShell script to run. 
+    The return value (if not null) is stored as the sampler result.
                        </td>
                        <td>
-                                                                               
        (yes)
+                                                                               
        Yes (unless script file is provided)
                                                                </td>
                </tr>
                </table>
@@ -2708,17 +2798,6 @@
 Before invoking the script, some variables are set up:
 
                                                </p>
-                                                                               
                                                                                
<p      >
-                                                               
-The contents of the Parameters field is put into the variable "Parameters".
-The string is also split into separate tokens using a single space as the 
separator, and the resulting list
-is stored in the String array args.
-
-                                               </p>
-                                                                               
                                                                                
<p      >
-                                                               
-The full list of variables that is set up is as follows:
-                                               </p>
                                                                                
                                                                                
<ul     >
                                                                
 
@@ -2743,7 +2822,7 @@
                                                                        
 
                                                                                
                <li     >
-                                                               args - the 
parameters, split as described above
+                                                               bsh.args - the 
parameters, split as described above
                                                </li>
                                                                        
 
@@ -4863,16 +4942,51 @@
                                                                                
                                                        
 
                                                                                
                <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 
+                                                               
+The Module Controller provides a mechanism for substituting test plan 
fragments into the current test plan at run-time.
+
+                                               </p>
+                                                                       
+
+                                                                               
                <p      >
+                                                               
+A test plan fragment consists of a Controller and all the test elements 
(samplers etc) contained in it. 
+The fragment can be located in any Thread Group, or on the 
                                                                                
                <a 
href="../usermanual/component_reference.html#WorkBench">WorkBench</a>
-                                                                       , each 
with a different series of
+                                                                       .
+If the fragment is located in a Thread Group, then its Controller can be 
disabled to prevent the fragment being run
+except by the Module Controller. 
+Or you can store the fragments in a dummy Thread Group, and disable the entire 
Thread Group. 
+
+                                               </p>
+                                                                       
+
+                                                                               
                <p      >
+                                                               
+There can be multiple fragments, each with a different series of
 samplers under them.  The module controller can then be used to easily switch 
between these multiple test cases simply by choosing
 the appropriate controller in its drop down box.  This provides convenience 
for running many alternate test plans quickly and easily.
 
                                                </p>
                                                                        
 
+                                                                               
                <p      >
+                                                               
+A fragment name is made up of the Controller name and all its parent names.
+For example:
+
+                                                                               
                <pre    >
+                                                               
+Test Plan / Protocol: JDBC / Control / Interleave Controller
+
+                                               </pre>
+                                                                       
+Any fragments used by the Module Controller must have a unique name,
+as the name is used to find the target controller when a test plan is reloaded.
+
+                                               </p>
+                                                                       
+
                                                                                
                                <p><b>Control Panel</b></p>
                                                <div align="center"><img 
width='409' height='255' 
src="../images/screenshots/module_controller.png"></div>
                                                                                
                                                                                
                                <p><table border="1" bgcolor="#bbbb00" 
width="50%" cellspacing="0" cellpadding="2">
@@ -6038,7 +6152,7 @@
                                                                        
 
                                                                                
                                <p><b>Control Panel</b></p>
-                                               <div align="center"><img 
width='768' height='230' 
src="../images/screenshots/beanshell_listener.png"></div>
+                                               <div align="center"><img 
width='516' height='286' 
src="../images/screenshots/beanshell_listener.png"></div>
                                                                                
                                                                                
                         <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
@@ -6052,15 +6166,50 @@
                                                                </td>
                </tr>
                        <tr>
+                       <td>Parameters</td>
+                       <td>                                            
Parameters to pass to the BeanShell script.
+       The parameters are stored in the following variables:
+       
+                                                                               
                <ul     >
+                                                               
+               
+                                                                               
                <li     >
+                                                               Parameters - 
string containing the parameters as a single variable
+                                               </li>
+                                                                       
+           
+                                                                               
                <li     >
+                                                               bsh.args - 
String array containing parameters, split on white-space
+                                               </li>
+                                                                       
+       
+                                               </ul>
+                               </td>
+                       <td>
+                                                                               
        No
+                                                               </td>
+               </tr>
+                       <tr>
+                       <td>Script file</td>
+                       <td>                                            A file 
containing the BeanShell script to run
+                       </td>
+                       <td>
+                                                                               
        No
+                                                               </td>
+               </tr>
+                       <tr>
                        <td>Script</td>
-                       <td>                                            The 
BeanShell script. The return value is ignored. See below for variables defined 
to the script.
+                       <td>                                            The 
BeanShell script to run. The return value is ignored.
                        </td>
                        <td>
-                                                                               
        Yes
+                                                                               
        Yes (unless script file is provided)
                                                                </td>
                </tr>
                </table>
        </p>
+                                                                               
                                                                                
<p      >
+                                                               The following 
variables are set up for use by the script:
+                                               </p>
                                                                                
                                                                                
<ul     >
                                                                
 
@@ -6250,11 +6399,14 @@
        
                                                                                
                <p><table border="1" bgcolor="#bbbb00" width="50%" 
cellspacing="0" cellpadding="2">
                <tr><td>                                                CSV 
Dataset variables are defined after configuration processing is completed,
-       so they cannot be used for other configuration items such as JDBC 
Config (see 
+       so they cannot be used for some configuration items - such as JDBC 
Config - 
+       that process their contents at configuration time (see 
                                                                                
                <a       
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40934";>
                                                                Bug 40394 
                                                </a>
-                                                                       )
+                                                                       )
+       However the variables do work in the HTTP Auth Manager, as the username 
etc are processed at run-time.
+       
                        </td></tr>
        </table></p>
                                                                        
@@ -6391,7 +6543,7 @@
 
                                                                                
                <p      >
                                                                The 
Authorization Manager lets you specify one or more user logins for web pages 
that are
-restricted using Basic HTTP Authentication.  You see this type of 
authentication when you use
+restricted using server authentication.  You see this type of authentication 
when you use
 your browser to access a restricted page, and your browser displays a login 
dialog box.  JMeter
 transmits the login information when it encounters this type of page.
                                                </p>
@@ -6419,10 +6571,14 @@
                                                                        
 
                                                                                
                <p><table border="1" bgcolor="#bbbb00" width="50%" 
cellspacing="0" cellpadding="2">
-               <tr><td>                                                In the 
current release, all JMeter threads in a Thread Group use the same 
username/password
-for a given Base URL even if you create multiple users with the same Base URL 
in the authorization table.
-We plan to correct this in a future release.  As a workwaround, you can create 
multiple Thread Groups for your
-Test Plan, with each Thread Group having its own Authorization Manager.
+               <tr><td>                                                
+When looking for a match against a URL, JMeter checks each entry in turn, and 
stops when it finds the first match.
+Thus the most specific URLs should appear first in the list, followed by less 
specific ones.
+Duplicate URLs will be ignored.
+If you want to use different usernames/passwords for different threads, you 
can use variables.
+These can be set up using a 
+                                                                               
                <a 
href="../usermanual/component_reference.html#CSV_Data_Set_Config">CSV Data Set 
Config</a>
+                                                                        
Element (for example).
 
                        </td></tr>
        </table></p>
@@ -6527,7 +6683,7 @@
                                                </ul>
                                                                                
                                                                                
<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" 
cellpadding="2">
                <tr><td>                                                When 
you save the Test Plan, JMeter automatically saves all of the authorization
-table entries.
+table entries - including any passwords, which are not encrypted.
                        </td></tr>
        </table></p>
                                                                                
                                                                                
<a name="authorization_example"/>
@@ -6621,6 +6777,16 @@
                                                </p>
                                                                        
 
+                                                                               
                <p      >
+                                                               
+Since version 2.0.3, cookies with null values are ignored by default.
+This can be changed by setting the JMeter property: 
CookieManager.delete_null_cookies=false.
+Note that this also applies to manually defined cookies - any such cookies 
will be removed from the display when it is updated.
+Note also that the cookie name must be unique - if a second cookie is defined 
with the same name, it will replace the first.
+
+                                               </p>
+                                                                       
+
                                                                                
                                <p><b>Control Panel</b></p>
                                                <div align="center"><img 
width='548' height='319' 
src="../images/screenshots/http-config/http-cookie-manager.png"></div>
                                                                                
                                                                                
                         <p>
@@ -6648,8 +6814,8 @@
                        <td>Cookie Policy</td>
                        <td>                                            The 
cookie policy that will be used to manage the cookies. 
   "compatibility" is the default, and should work in most cases.
-  See http://jakarta.apache.org/commons/httpclient/cookies.html and 
-  
http://jakarta.apache.org/commons/httpclient/apidocs/org/apache/commons/httpclient/cookie/CookiePolicy.html
+  See http://jakarta.apache.org/httpcomponents/httpclient-3.x/cookies.html and 
+  
http://jakarta.apache.org/httpcomponents/httpclient-3.x/apidocs/org/apache/commons/httpclient/cookie/CookiePolicy.html
   [Note: "ignoreCookies" is equivalent to omitting the CookieManager.]
     
                        </td>
@@ -6660,7 +6826,13 @@
                        <tr>
                        <td>Cookies Stored in the Cookie Manager</td>
                        <td>                                            This
-  gives you the opportunity to use hardcoded cookies that will be used by all 
threads during the test execution.
+  gives you the opportunity to use hardcoded cookies that will be used by all 
threads during the test execution.
+  
+                                                                               
                <br     >
+                                               </br>
+                                                                       
+  The "domain" is the hostname of the server (without http://); the port is 
currently ignored.
+  
                        </td>
                        <td>
                                                                                
        No (discouraged, unless you know what you're doing)
@@ -8330,7 +8502,7 @@
                </tr>
                        <tr>
                        <td>Script file</td>
-                       <td>                                            A file 
containing the BeanShell script to run
+                       <td>                                            A file 
containing the BeanShell script to run. This overrides the script.
                        </td>
                        <td>
                                                                                
        No
@@ -8338,10 +8510,10 @@
                </tr>
                        <tr>
                        <td>Script</td>
-                       <td>                                            The 
BeanShell script to run
+                       <td>                                            The 
BeanShell script to run. The return value is ignored.
                        </td>
                        <td>
-                                                                               
        No
+                                                                               
        Yes (unless script file is provided)
                                                                </td>
                </tr>
                </table>
@@ -9122,7 +9294,7 @@
                                                                        
 
                                                                                
                                <p><b>Control Panel</b></p>
-                                               <div align="center"><img 
width='459' height='238' 
src="../images/screenshots/timers/beanshell_timer.png"></div>
+                                               <div align="center"><img 
width='516' height='286' 
src="../images/screenshots/timers/beanshell_timer.png"></div>
                                                                                
                                                                                
                         <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
@@ -9136,17 +9308,57 @@
                                                                </td>
                </tr>
                        <tr>
+                       <td>Parameters</td>
+                       <td>                                            
Parameters to pass to the BeanShell script.
+       The parameters are stored in the following variables:
+       
+                                                                               
                <ul     >
+                                                               
+               
+                                                                               
                <li     >
+                                                               Parameters - 
string containing the parameters as a single variable
+                                               </li>
+                                                                       
+           
+                                                                               
                <li     >
+                                                               bsh.args - 
String array containing parameters, split on white-space
+                                               </li>
+                                                                       
+       
+                                               </ul>
+                                                                       
+       
+                       </td>
+                       <td>
+                                                                               
        No
+                                                               </td>
+               </tr>
+                       <tr>
+                       <td>Script file</td>
+                       <td>                                            
+    A file containing the BeanShell script to run.
+     The return value is used as the number of milliseconds to wait.
+     
+                       </td>
+                       <td>
+                                                                               
        No
+                                                               </td>
+               </tr>
+                       <tr>
                        <td>Script</td>
                        <td>                                            
         The BeanShell script. The return value is used as the number of 
milliseconds to wait.
-        
+    
                        </td>
                        <td>
-                                                                               
        Yes
+                                                                               
        Yes (unless script file is provided)
                                                                </td>
                </tr>
                </table>
        </p>
+                                                                               
                                                                                
<p      >
+                                                               The following 
variables are set up for use by the script:
+                                               </p>
                                                                                
                                                                                
<ul     >
                                                                
 
@@ -9799,7 +10011,7 @@
                                                                        
 
                                                                                
                                <p><b>Control Panel</b></p>
-                                               <div align="center"><img 
width='461' height='188' 
src="../images/screenshots/beanshell_preprocessor.png"></div>
+                                               <div align="center"><img 
width='516' height='286' 
src="../images/screenshots/beanshell_preprocessor.png"></div>
                                                                                
                                                                                
                         <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
@@ -9813,15 +10025,50 @@
                                                                </td>
                </tr>
                        <tr>
+                       <td>Parameters</td>
+                       <td>                                            
Parameters to pass to the BeanShell script.
+       The parameters are stored in the following variables:
+       
+                                                                               
                <ul     >
+                                                               
+               
+                                                                               
                <li     >
+                                                               Parameters - 
string containing the parameters as a single variable
+                                               </li>
+                                                                       
+           
+                                                                               
                <li     >
+                                                               bsh.args - 
String array containing parameters, split on white-space
+                                               </li>
+                                                                       
+       
+                                               </ul>
+                               </td>
+                       <td>
+                                                                               
        No
+                                                               </td>
+               </tr>
+                       <tr>
+                       <td>Script file</td>
+                       <td>                                            A file 
containing the BeanShell script to run.
+                       </td>
+                       <td>
+                                                                               
        No
+                                                               </td>
+               </tr>
+                       <tr>
                        <td>Script</td>
-                       <td>                                            The 
BeanShell script. The return value is ignored. See below for variables defined 
to the script.
+                       <td>                                            The 
BeanShell script. The return value is ignored.
                        </td>
                        <td>
-                                                                               
        Yes
+                                                                               
        Yes (unless script file is provided)
                                                                </td>
                </tr>
                </table>
        </p>
+                                                                               
                                                                                
<p      >
+                                                               The following 
variables are set up for use by the script:
+                                               </p>
                                                                                
                                                                                
<ul     >
                                                                
 
@@ -10500,7 +10747,7 @@
                                                                        
 
                                                                                
                                <p><b>Control Panel</b></p>
-                                               <div align="center"><img 
width='461' height='188' 
src="../images/screenshots/beanshell_postprocessor.png"></div>
+                                               <div align="center"><img 
width='516' height='286' 
src="../images/screenshots/beanshell_postprocessor.png"></div>
                                                                                
                                                                                
                         <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
@@ -10514,15 +10761,50 @@
                                                                </td>
                </tr>
                        <tr>
+                       <td>Parameters</td>
+                       <td>                                            
Parameters to pass to the BeanShell script.
+       The parameters are stored in the following variables:
+       
+                                                                               
                <ul     >
+                                                               
+               
+                                                                               
                <li     >
+                                                               Parameters - 
string containing the parameters as a single variable
+                                               </li>
+                                                                       
+           
+                                                                               
                <li     >
+                                                               bsh.args - 
String array containing parameters, split on white-space
+                                               </li>
+                                                                       
+       
+                                               </ul>
+                               </td>
+                       <td>
+                                                                               
        No
+                                                               </td>
+               </tr>
+                       <tr>
+                       <td>Script file</td>
+                       <td>                                            A file 
containing the BeanShell script to run.
+                       </td>
+                       <td>
+                                                                               
        No
+                                                               </td>
+               </tr>
+                       <tr>
                        <td>Script</td>
-                       <td>                                            The 
BeanShell script. The return value is ignored. See below for variables defined 
to the script.
+                       <td>                                            The 
BeanShell script. The return value is ignored.
                        </td>
                        <td>
-                                                                               
        Yes
+                                                                               
        Yes (unless script file is provided)
                                                                </td>
                </tr>
                </table>
        </p>
+                                                                               
                                                                                
<p      >
+                                                               The following 
variables are set up for use by the script:
+                                               </p>
                                                                                
                                                                                
<ul     >
                                                                
 

Modified: jakarta/jmeter/trunk/docs/usermanual/get-started.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/get-started.html?rev=577384&r1=577383&r2=577384&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/get-started.html Wed Sep 19 10:10:25 
2007
@@ -480,12 +480,18 @@
                                                                                
                <a       href="#classpath">
                                                                classpath
                                                </a>
-                                                                       .  
Also, update 
+                                                                       .  
+Also, update 
                                                                                
                <a       href="#configuring_jmeter">
-                                                               
jmeter.properties
+                                                               
system.properties
                                                </a>
-                                                                       
-to register the SSL Provider.
+                                                                        to 
register the SSL Provider.
+                                               </p>
+                                                                               
                                                                                
<p      >
+                                                               
+JMeter defaults to protocol level TLS. This can be changed by editting the 
JMeter property 
+"https.default.protocol" in jmeter.properties or user.properties.
+
                                                </p>
                                                                                
                                                                                
<p      >
                                                                                
                <b      >
@@ -1138,9 +1144,9 @@
                 Define loglevel: [category=]level 
                 e.g. jorphan=INFO or jmeter.util=DEBUG
         -r, --runremote
-                Start remote servers
+                Start remote servers (as defined by the jmeter property 
remote_hosts)
         -R, --remotestart  server1,...
-                Start these remote servers
+                Start these remote servers (overrides remote_hosts)
         -d, --homedir {argument}
                 the jmeter home directory to use
 

Modified: jakarta/jmeter/trunk/docs/usermanual/remote-test.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/remote-test.html?rev=577384&r1=577383&r2=577384&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/remote-test.html Wed Sep 19 10:10:25 
2007
@@ -432,7 +432,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=577384&r1=577383&r2=577384&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/test_plan.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/test_plan.html Wed Sep 19 10:10:25 2007
@@ -845,6 +845,68 @@
                </td></tr>
                <tr><td><br></td></tr>
         </table>
+                                                                               
                                                                                
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
+               <tr><td bgcolor="#828DA6">
+                 <font color="#ffffff" face="arial,helvetica,sanserif">
+                        <a name="properties"><strong>4.10 Properties and 
Variables</strong></a>
+                 </font>
+               </td></tr>
+               <tr><td>
+                 <blockquote>
+                                                                               
                                        <p      >
+                                                               
+JMeter 
+                                                                               
                <b      >
+                                                               properties
+                                               </b>
+                                                                        are 
defined in jmeter.properties (see 
+                                                                               
                <a       href="get-started.html#configuring_jmeter">
+                                                               Gettting 
Started - Configuring JMeter
+                                               </a>
+                                                                        for 
more details).
+
+                                                                               
                <br     >
+                                               </br>
+                                                                       
+Properties are global to jmeter, and are used to define some of the defaults 
JMeter uses.
+For example the property remote_hosts defines the servers that JMeter will try 
to run remotely.
+Properties can be referenced in test plans 
+- see 
+                                                                               
                <a       href="functions.html#__property">
+                                                               Functions - 
read a property
+                                               </a>
+                                                                        -
+but cannot be used for thread-specific values.
+
+                                               </p>
+                                                                               
                                                                                
<p      >
+                                                               
+JMeter 
+                                                                               
                <b      >
+                                                               variables
+                                               </b>
+                                                                        are 
local to each thread. The values may be the same for each thread, or they may 
be different.
+
+                                                                               
                <br     >
+                                               </br>
+                                                                       
+If a variable is updated by a thread, only the thread copy of the variable is 
changed.
+For example the 
+                                                                               
                <a 
href="../usermanual/component_reference.html#Regular_Expression_Extractor">Regular
 Expression Extractor</a>
+                                                                        
Post-Processor 
+will set its variables according to the sample that its thread has read, and 
these can be used later
+by the same thread.
+For details of how to reference variables and functions, see 
+                                                                               
                <a       href="functions.html">
+                                                               Functions and 
Variables
+                                               </a>
+                                                                       
+
+                                               </p>
+                                                                         
</blockquote>
+               </td></tr>
+               <tr><td><br></td></tr>
+        </table>
                                                                          
</blockquote>
                  </p>
                </td></tr>



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

Reply via email to