mstover1    2002/10/15 13:28:43

  Modified:    bin      jmeter.properties
               docs     running.html
               docs/usermanual component_reference.html get-started.html
               src/protocol/http/org/apache/jmeter/protocol/http/modifier
                        URLRewritingModifier.java
               xdocs/stylesheets site.vsl
               xdocs/usermanual component_reference.xml get-started.xml
  Added:       docs/images/screenshots counter.png
  Log:
  Making final updates for 1.8 release
  
  Revision  Changes    Path
  1.48      +2 -1      jakarta-jmeter/bin/jmeter.properties
  
  Index: jmeter.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- jmeter.properties 15 Oct 2002 18:53:24 -0000      1.47
  +++ jmeter.properties 15 Oct 2002 20:28:42 -0000      1.48
  @@ -65,7 +65,7 @@
   
   #Logging levels for the logging categories in JMeter.  Correct values are 
FATAL_ERROR, ERROR, WARN, INFO, and DEBUG
   log_level.jmeter=WARN
  -log_level.jmeter.engine=DEBUG
  +log_level.jmeter.engine=WARN
   log_level.jmeter.gui=WARN
   log_level.jmeter.elements=WARN
   log_level.jmeter.util=WARN
  @@ -75,6 +75,7 @@
   log_level.jmeter.protocol.ftp=WARN
   log_level.jmeter.protocol.jdbc=WARN
   log_level.jmeter.protocol.java=WARN
  +log_level.jorphan=ERROR
   
   #Log file for log messages.
   log_file=jmeter.log
  
  
  
  1.52      +0 -0      jakarta-jmeter/docs/running.html
  
  Index: running.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/running.html,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  
  
  
  1.1                  jakarta-jmeter/docs/images/screenshots/counter.png
  
        <<Binary file>>
  
  
  1.27      +154 -46   jakarta-jmeter/docs/usermanual/component_reference.html
  
  Index: component_reference.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/component_reference.html,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- component_reference.html  27 Sep 2002 14:47:46 -0000      1.26
  +++ component_reference.html  15 Oct 2002 20:28:42 -0000      1.27
  @@ -153,7 +153,7 @@
                         <a name="FTP_Request"><h3>13.1.1 FTP Request</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 This controller lets you send an FTP 
"retrieve file" request to an FTP server.
   If you are going to send multiple requests to the same FTP server, consider
   using a 
  @@ -228,7 +228,7 @@
                         <a name="HTTP_Request"><h3>13.1.2 HTTP Request</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 
        
                                                                                       
         <p      >
  @@ -441,7 +441,7 @@
                         <a name="JDBC_Request"><h3>13.1.3 JDBC Request</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                This sampler lets you 
send an JDBC Request (an SQL query) to a database.
                                                </p>
  @@ -564,7 +564,7 @@
                         <a name="Java_Request"><h3>13.1.4 Java Request</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                This sampler lets you 
control a java class that implements the
   JavaSamplerClient interface.  By writing your own implementation of this interface,
  @@ -625,7 +625,7 @@
                         <a name="SOAP/XML-RPC_Request"><h3>13.1.5 SOAP/XML-RPC 
Request</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                This sampler lets you 
send a SOAP request to a webservice.  It can also be
   used to send XML-RPC over HTTP.  It creates an HTTP POST request, with the 
specified XML as the
  @@ -690,7 +690,7 @@
                         <a name="Interleave_Controller"><h3>13.2.1 Interleave 
Controller</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                If you add Generative 
or Logic Controllers to an Interleave Controller, JMeter will alternate among each of 
the
   other controllers for each loop iteration. 
  @@ -862,7 +862,7 @@
                         <a name="Loop_Controller"><h3>13.2.2 Loop Controller</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                If you add Generative 
or Logic Controllers to a Loop Controller, JMeter will
   loop through them a certain number of times, in addition to the loop value you
  @@ -959,7 +959,7 @@
                         <a name="Once_Only_Controller"><h3>13.2.4 Once Only 
Controller</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 
   
                                                                                       
         <p      >
  @@ -1029,7 +1029,7 @@
                         <a name="Simple_Controller"><h3>13.2.5 Simple 
Controller</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 
   
                                                                                       
         <p      >
  @@ -1090,7 +1090,7 @@
                         <a name="Random_Controller"><h3>13.2.6 Random 
Controller</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 
   
                                                                                       
         <p      >
  @@ -1134,7 +1134,7 @@
                         <a name="Recording_Controller"><h3>13.2.7 Recording 
Controller</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 
   
                                                                                       
         <p      >
  @@ -1187,7 +1187,7 @@
                         <a name="Mailer_Visualizer"><h3>13.3.1 Mailer 
Visualizer</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The mailer visualizer 
can be set up to send email if a test run receives too many 
   failed responses from the server.
  @@ -1298,7 +1298,7 @@
                         <a name="Graph_Full_Results"><h3>13.3.2 Graph Full 
Results</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 No Description
                                                                                       
                                         </td></tr>
                <tr><td><br/></td></tr>
  @@ -1310,7 +1310,7 @@
                         <a name="Graph_Results"><h3>13.3.3 Graph Results</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The Graph Results 
listener generates a simple graph that plots all sample times.  Along
   the bottom of the graph, the current sample (black), the current average of all 
samples(blue), the
  @@ -1339,7 +1339,7 @@
                         <a name="Spline_Visualizer"><h3>13.3.4 Spline 
Visualizer</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The Spline Visualizer 
provides a view of all sample times from the start
   of the test till the end, regardless of how many samples have been taken.  The 
spline
  @@ -1358,7 +1358,7 @@
                         <a name="Assertion_Results"><h3>13.3.5 Assertion 
Results</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The Assertion Results 
visualizer shows the URL of each sample taken (no time information
   is shown).  It also reports failures of any 
  @@ -1386,7 +1386,7 @@
                         <a name="View_Results_Tree"><h3>13.3.6 View Results 
Tree</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 The View Results Tree shows a tree of 
all sample responses, allowing you to view the
   response for any sample.  In addition to showing the response, you can see the time 
it took to get
   this response, and some response codes.
  @@ -1402,7 +1402,7 @@
                         <a name="Aggregate_Report"><h3>13.3.7 Aggregate 
Report</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 The aggregate report creates a table 
row for each differently named request in your test.  For each
   request, it totals the response information and provides request count, min, max, 
average, error rate, and an
   idealized throughput calculation.
  @@ -1418,7 +1418,7 @@
                         <a name="View_Results_in_Table"><h3>13.3.7 View Results in 
Table</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 This visualizer creates a row for 
every sample result.  Each sample result's URL, 
   time in milliseconds, success/failure is displayed.  Like the 
                                                                                       
         <a href="../usermanual/component_reference.html#View_Results_Tree">View 
Results Tree</a>
  @@ -1449,7 +1449,7 @@
                         <a name="HTTP_Authorization_Manager"><h3>13.4.1 HTTP 
Authorization Manager</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 
   
                                                                                       
         <p      >
  @@ -1603,7 +1603,7 @@
                         <a name="HTTP_Cookie_Manager"><h3>13.4.2 HTTP Cookie 
Manager</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The Cookie Manager 
element has two functions:
                                                                                       
         <br     >
  @@ -1692,7 +1692,7 @@
                         <a name="HTTP_Proxy_Server"><h3>13.4.3 HTTP Proxy 
Server</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The Proxy Server 
allows JMeter to watch and record your actions while you browse your web application
   with your normal browser (such as Internet Explorer).  JMeter will create test 
sample objects and store them
  @@ -1858,7 +1858,7 @@
                         <a name="HTTP_Request_Defaults"><h3>13.4.4 HTTP Request 
Defaults</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                This element lets you 
set default values that your HTTP Request controllers use.  For example, if you are
   creating a Test Plan with 25 HTTP Request controllers and all of the requests are 
being sent to the same server,
  @@ -1958,7 +1958,7 @@
                         <a name="FTP_Request_Defaults"><h3>13.4.5 FTP Request 
Defaults</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                       
          <p><b>Control Panel</b></p>
                                                <div align="center"><img 
src="../images/screenshots/ftp-config/ftp-request-defaults.gif"></div>
                                                                                       
                 </td></tr>
  @@ -1971,7 +1971,7 @@
                         <a name="JDBC_Database_Connection_Pool_Defaults"><h3>13.4.6 
JDBC Database Connection Pool Defaults</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                       
          <p><b>Control Panel</b></p>
                                                <div align="center"><img 
src="../images/screenshots/jdbc-config/jdbc-db-conn-pool.gif"></div>
                                                                                       
                 </td></tr>
  @@ -1984,7 +1984,7 @@
                         <a name="JDBC_Database_Login_Defaults"><h3>13.4.7 JDBC 
Database Login Defaults</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                       
          <p><b>Control Panel</b></p>
                                                <div align="center"><img 
src="../images/screenshots/jdbc-config/jdbc-db-login.gif"></div>
                                                                                       
                 </td></tr>
  @@ -1997,7 +1997,7 @@
                         <a name="JDBC_SQL_Query_Defaults"><h3>13.4.8 JDBC SQL Query 
Defaults</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                       
          <p><b>Control Panel</b></p>
                                                <div align="center"><img 
src="../images/screenshots/jdbc-config/jdbc-sql-query.gif"></div>
                                                                                       
                 </td></tr>
  @@ -2010,7 +2010,7 @@
                         <a name="HTTP_Header_Manager"><h3>13.4.9 HTTP Header 
Manager</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The Header Manager 
lets you add or override HTTP request headers.
                                                </p>
  @@ -2119,7 +2119,7 @@
                         <a name="User_Parameters"><h3>13.4.10 User Parameters</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                Allows the user to 
specify values for User Variables specific to individual threads.
                                                </p>
  @@ -2162,12 +2162,83 @@
                         <a name="Counter"><h3>13.4.11 Counter</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                Allows the user to 
create a counter that can be referenced anywhere
  -in the Thread Group.
  +in the Thread Group.  The counter config lets the user configure a starting point, 
a maximum,
  +and the increment.  The counter will loop from the start to the max, and then start 
over
  +with the start, continuing on like that until the test is ended.  
                                                </p>
  -                                                                                    
                                                 </td></tr>
  +                                                                                    
                                 <p><b>Control Panel</b></p>
  +                                             <div align="center"><img 
src="../images/screenshots/counter.png"></div>
  +                                                                                    
                                                                                       
           <p>
  +     <b>Parameters</b>
  +     <table border="1" cellspacing="0" cellpadding="2">
  +     <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  +                     <tr>
  +                     <td>Name</td>
  +                     <td>                                            Descriptive 
name for this element that is shown in the tree.
  +                     </td>
  +                     <td>
  +                                                                                    
 No
  +                                                             </td>
  +             </tr>
  +                     <tr>
  +                     <td>Start</td>
  +                     <td>                                            The starting 
number for the counter.  The counter will equal this
  +     number during the first iteration.
  +                     </td>
  +                     <td>
  +                                                                                    
 Yes
  +                                                             </td>
  +             </tr>
  +                     <tr>
  +                     <td>Increment</td>
  +                     <td>                                            How much to 
increment the counter by after each
  +     iteration.
  +                     </td>
  +                     <td>
  +                                                                                    
 Yes
  +                                                             </td>
  +             </tr>
  +                     <tr>
  +                     <td>Maximum</td>
  +                     <td>                                            If the counter 
exceeds the maximum, then it is reset to the Start value.
  +                     </td>
  +                     <td>
  +                                                                                    
 Yes
  +                                                             </td>
  +             </tr>
  +                     <tr>
  +                     <td>Reference Name</td>
  +                     <td>                                            This controls 
how you refer to this value in other elements.  Syntax is
  +     as in 
  +                                                                                    
         <a       href="functions.html">
  +                                                             user-defined values
  +                                             </a>
  +                                                                     : 
  +                                                                                    
         <code   >
  +                                                             $(reference_name}
  +                                             </code>
  +                                                                     .
  +                     </td>
  +                     <td>
  +                                                                                    
 Yes
  +                                                             </td>
  +             </tr>
  +                     <tr>
  +                     <td>Track Counter Independently for each User</td>
  +                     <td>                                            In other 
words, is this a global counter, or does each user get their
  +     own counter?  If unchecked, the counter is global (ie, user #1 will get value 
"1", and user #2 will get value "2" on 
  +     the first iteration).  If checked, each user has an independent counter.
  +                     </td>
  +                     <td>
  +                                                                                    
 No
  +                                                             </td>
  +             </tr>
  +             </table>
  +     </p>
  +                                                                     </td></tr>
                <tr><td><br/></td></tr>
         </table>
        <hr>
  @@ -2190,7 +2261,7 @@
                         <a name="Response_Assertion"><h3>13.5.1 Response 
Assertion</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The response assertion 
control panel let's you add strings to be tested. These strings can
   be regular expressions. You can also choose whether the strings will be expected
  @@ -2279,7 +2350,7 @@
                         <a name="Duration_Assertion"><h3>13.5.2 Duration 
Assertion</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The Duration Assertion 
tests that each response was received within a given amount
   of time.  Any response that takes longer than the given number of milliseconds 
(specified by the
  @@ -2333,7 +2404,7 @@
                         <a name="Constant_Timer"><h3>13.6.1 Constant Timer</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 
   
                                                                                       
         <p      >
  @@ -2374,7 +2445,7 @@
                         <a name="Gaussian_Random_Timer"><h3>13.6.2 Gaussian Random 
Timer</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                This timer pauses each 
thread request for a random amount of time, with most
   of the time intervals ocurring near a particular value.  The total delay is the
  @@ -2424,7 +2495,7 @@
                         <a name="Uniform_Random_Timer"><h3>13.6.3 Uniform Random 
Timer</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                This timer pauses each 
thread request for a random amount of time, with
   each time interval having the same probability of occurring. The total delay
  @@ -2487,7 +2558,7 @@
                         <a name="HTML_Link_Parser"><h3>13.7.1 HTML Link 
Parser</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                 
   
                                                                                       
         <p      >
  @@ -2569,7 +2640,7 @@
                         <a name="HTTP_URL_Re-writing_Modifier"><h3>13.7.2 HTTP URL 
Re-writing Modifier</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                This modifier works 
similarly to the HTML Link Parser, except it has a specific purpose for which
   it is easier to use than the HTML Link Parser, and more efficient.  For web 
applications that
  @@ -2636,7 +2707,8 @@
                         <a name="HTML_Parameter_Mask"><h3>13.7.3 HTML Parameter 
Mask</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                                     <tr><td><em>* - This element is deprecated.  
Use <a href="../usermanual/component_reference.html#Counter">Counter</a> 
instead</td></tr>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The HTML Parameter 
Mask is used to generate unique values for HTML arguments.  By
   specifying the name of the parameter, a value prefix and suffix, and counter 
parameters, this
  @@ -2753,7 +2825,8 @@
                         <a name="HTTP_User_Parameter_Modifier"><h3>13.7.4 HTTP User 
Parameter Modifier</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                                     <tr><td><em>* - This element is deprecated.  
Use <a href="../usermanual/component_reference.html#User_Parameters">User 
Parameters</a> instead</td></tr>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The User Parameter 
Modifier uses an XML file get values for HTTP arguments.  Any
   HTTP Request that this modifier modifies will be checked for the existence of the 
specified
  @@ -2770,7 +2843,9 @@
   any other thread
                        </td></tr>
        </table></p>
  -                                                                                    
                                 <p><b>Control Panel</b></p>
  +                                                                     
  +
  +                                                                                    
                         <p><b>Control Panel</b></p>
                                                <div align="center"><img 
src="../images/screenshots/user_param_modifier.gif"></div>
                                                                                       
                                                                                       
           <p>
        <b>Parameters</b>
  @@ -2818,7 +2893,7 @@
                         <a name="SSL_Manager"><h3>13.8.1 SSL Manager</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                 <p      >
                                                                
     The SSL Manager is a way to select a client certificate so that you can test
  @@ -2914,12 +2989,20 @@
                         <a name="__regexFunction"><h3>13.9.1 __regexFunction</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The Regex Function is 
used to parse the previous response using any regular 
   expression (provided by user).  The function returns the template string with 
variable values filled
   in.
                                                </p>
  +                                                                     
  +
  +                                                                                    
         <p      >
  +                                                             The __regexFunction 
stores values for future use.  In the sixth parameter, you can specify
  +a reference name.  After this function executes, the same values can be retrieved 
at later times
  +using the syntax for user-defined values.  For instance, ${refName_g1} would refer 
to the first
  +group parsed by this function.  ${refName_g0} always refers to the entire match.
  +                                             </p>
                                                                                       
                                                                                       
                                           <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
  @@ -3000,6 +3083,18 @@
                                                                                       
 No
                                                                </td>
                </tr>
  +                     <tr>
  +                     <td>Sixth argument</td>
  +                     <td>                                            A reference 
name for reusing the values parsed by this function.
  +                                                                                    
         <br     >
  +                                             </br>
  +                                                                     
  +             Stored values are of the form ${refName_g#} where "#" is the group 
number from the regular expression.
  +                     </td>
  +                     <td>
  +                                                                                    
 No
  +                                                             </td>
  +             </tr>
                </table>
        </p>
                                                                        </td></tr>
  @@ -3012,7 +3107,7 @@
                         <a name="__counter"><h3>13.9.2 __counter</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The counter generates 
a new number each time it is called, starting with 1
   and incrementing by +1 each time.  The counter can be configured to keep each 
simulated user's values
  @@ -3033,6 +3128,19 @@
                                                                                       
 Yes
                                                                </td>
                </tr>
  +                     <tr>
  +                     <td>Second argument</td>
  +                     <td>                                            A reference 
name for reusing the value created by this function.
  +                                                                                    
         <br     >
  +                                             </br>
  +                                                                     
  +             Stored values are of the form ${refName}.  This allows you to keep one 
counter and refer to its value in
  +             multiple places.
  +                     </td>
  +                     <td>
  +                                                                                    
 No
  +                                                             </td>
  +             </tr>
                </table>
        </p>
                                                                        </td></tr>
  @@ -3045,7 +3153,7 @@
                         <a name="__threadNum"><h3>13.9.3 __threadNum</h3></a>
                  </font>
                </td></tr>
  -             <tr><td>
  +                             <tr><td>
                                                                                       
                                                                                 <p    
  >
                                                                The thread number 
function simply returns the number of the thread currently 
   being executed.  These numbers are independent of ThreadGroup, meaning thread #1 in 
one threadgroup
  
  
  
  1.21      +1 -1      jakarta-jmeter/docs/usermanual/get-started.html
  
  Index: get-started.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/get-started.html,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- get-started.html  12 Aug 2002 13:26:28 -0000      1.20
  +++ get-started.html  15 Oct 2002 20:28:42 -0000      1.21
  @@ -147,7 +147,7 @@
                <tr><td>
                  <blockquote>
                                                                                       
                                 <p      >
  -                                                             JMeter requires a 
fully compliant JDK1.2 (or higher) environment. Because JMeter uses only
  +                                                             JMeter (as of version 
1.8) requires a fully compliant JDK1.4 (or higher) environment. Because JMeter uses 
only
   standard Java APIs (java.*), please do not file bug reports if your JRE fails to run
   JMeter because of JRE implementation issues.
                                                </p>
  
  
  
  1.5       +2 -2      
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
  
  Index: URLRewritingModifier.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- URLRewritingModifier.java 14 Oct 2002 20:22:23 -0000      1.4
  +++ URLRewritingModifier.java 15 Oct 2002 20:28:42 -0000      1.5
  @@ -94,10 +94,10 @@
                                compiler.compile(
                                        "[Nn][Aa][Mm][Ee]=\""
                                                + argName
  -                                             + 
"\"[^>]+[vV][Aa][Ll][Uu][Ee]=\"(.*)\"");
  +                                             + 
"\"[^>]+[vV][Aa][Ll][Uu][Ee]=\"([^\"]*)\"");
                        case3 =
                                compiler.compile(
  -                                     
"[vV][Aa][Ll][Uu][Ee]=\"(.*)\"[^>]+[Nn][Aa][Mm][Ee]=\""
  +                                     
"[vV][Aa][Ll][Uu][Ee]=\"([^\"]*)\"[^>]+[Nn][Aa][Mm][Ee]=\""
                                                + argName
                                                + "\"");
                }
  
  
  
  1.13      +3 -0      jakarta-jmeter/xdocs/stylesheets/site.vsl
  
  Index: site.vsl
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/stylesheets/site.vsl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- site.vsl  9 Aug 2002 19:08:55 -0000       1.12
  +++ site.vsl  15 Oct 2002 20:28:42 -0000      1.13
  @@ -248,6 +248,9 @@
                         <a 
name="$component.getAttributeValue("name").replace($space,$udsc)"><h3>$!component.getAttributeValue("index")
 $component.getAttributeValue("name")</h3></a>
                  </font>
                </td></tr>
  +             #if($component.getAttribute("useinstead"))
  +                     <tr><td><em>* - This element is deprecated.  Use <a 
href="$relativePath/usermanual/component_reference.html#$component.getAttributeValue("useinstead").replace($space,$udsc)">$component.getAttributeValue("useinstead")</a>
 instead</td></tr>
  +             #end
                <tr><td>
                  #foreach ( $c_items in $component.getChildren() )
                                #if ($c_items.getName().equals("description"))
  
  
  
  1.27      +32 -6     jakarta-jmeter/xdocs/usermanual/component_reference.xml
  
  Index: component_reference.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/component_reference.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- component_reference.xml   27 Sep 2002 14:47:46 -0000      1.26
  +++ component_reference.xml   15 Oct 2002 20:28:42 -0000      1.27
  @@ -689,9 +689,24 @@
   </description>
   </component>
   
  -<component index="13.4.11" name="Counter">
  +<component index="13.4.11" name="Counter" 
screenshot="../images/screenshots/counter.png">
   <description><p>Allows the user to create a counter that can be referenced anywhere
  -in the Thread Group.</p></description>
  +in the Thread Group.  The counter config lets the user configure a starting point, 
a maximum,
  +and the increment.  The counter will loop from the start to the max, and then start 
over
  +with the start, continuing on like that until the test is ended.  </p></description>
  +<properties>
  +     <property name="Name" required="">Descriptive name for this element that is 
shown in the tree.</property>
  +     <property name="Start" required="Yes">The starting number for the counter.  
The counter will equal this
  +     number during the first iteration.</property>
  +     <property name="Increment" required="Yes">How much to increment the counter by 
after each
  +     iteration.</property>
  +     <property name="Maximum" required="Yes">If the counter exceeds the maximum, 
then it is reset to the Start value.</property>
  +     <property name="Reference Name" required="Yes">This controls how you refer to 
this value in other elements.  Syntax is
  +     as in <a href="functions.html">user-defined values</a>: 
<code>$(reference_name}</code>.</property>
  +     <property name="Track Counter Independently for each User" required="No">In 
other words, is this a global counter, or does each user get their
  +     own counter?  If unchecked, the counter is global (ie, user #1 will get value 
"1", and user #2 will get value "2" on 
  +     the first iteration).  If checked, each user has an independent 
counter.</property>
  +</properties>
   </component>
   
   </section>
  @@ -863,7 +878,7 @@
   </properties>
   </component>
   
  -<component index="13.7.3" name="HTML Parameter Mask" 
screenshot="../images/screenshots/parameter_mask.png">
  +<component index="13.7.3" name="HTML Parameter Mask" useinstead="Counter" 
screenshot="../images/screenshots/parameter_mask.png">
   <description><p>The HTML Parameter Mask is used to generate unique values for HTML 
arguments.  By
   specifying the name of the parameter, a value prefix and suffix, and counter 
parameters, this
   modifier will generate values of the form "<code>name=prefixcountersuffix</code>".  
Any HTTP
  @@ -891,7 +906,7 @@
   </properties>
   </component>
   
  -<component index="13.7.4" name="HTTP User Parameter Modifier" 
screenshot="../images/screenshots/user_param_modifier.gif">
  +<component index="13.7.4" name="HTTP User Parameter Modifier" useinstead="User 
Parameters" screenshot="../images/screenshots/user_param_modifier.gif">
   <description><p>The User Parameter Modifier uses an XML file get values for HTTP 
arguments.  Any
   HTTP Request that this modifier modifies will be checked for the existence of the 
specified
   arguments.  If found, the values for those arguments will be replaced by the values 
found in the
  @@ -900,7 +915,8 @@
   until the last set of values is reached, at which point it will begin again at the 
first set.</p>
   <note>If the number of value sets is equal to the number of threads in your test, 
then it will work
   out that each thread will get the same set of values each time, which will be a 
different set from
  -any other thread</note></description>
  +any other thread</note>
  +</description>
   
   <properties>
        <property name="Name" required="No">Descriptive name given to this element in 
the test tree.</property>
  @@ -975,7 +991,11 @@
   <component index="13.9.1" name="__regexFunction">
   <description><p>The Regex Function is used to parse the previous response using any 
regular 
   expression (provided by user).  The function returns the template string with 
variable values filled
  -in.</p></description>
  +in.</p>
  +<p>The __regexFunction stores values for future use.  In the sixth parameter, you 
can specify
  +a reference name.  After this function executes, the same values can be retrieved 
at later times
  +using the syntax for user-defined values.  For instance, ${refName_g1} would refer 
to the first
  +group parsed by this function.  ${refName_g0} always refers to the entire 
match.</p></description>
   
   <properties>
        <property name="First arguement" required="Yes">The first argument is the 
regular expression
  @@ -1001,6 +1021,8 @@
        <property name="Fourth argument" required="No">If 'ALL' was selected for the 
above argument
        value, then this argument will be inserted between each appended copy of the 
template value.</property>
        <property name="Fifth argument" required="No">Default value returned if no 
match is found</property>
  +     <property name="Sixth argument" required="No">A reference name for reusing the 
values parsed by this function.<br/>
  +             Stored values are of the form ${refName_g#} where "#" is the group 
number from the regular expression.</property>
   </properties>
   </component>
   
  @@ -1014,6 +1036,10 @@
   <properties>
        <property name="First argument" required="Yes">TRUE if you wish each simulated 
user's counter 
        to be kept independent and separate from the other users.  FALSE for a global 
counter.</property>
  +
  +<property name="Second argument" required="No">A reference name for reusing the 
value created by this function.<br/>
  +             Stored values are of the form ${refName}.  This allows you to keep one 
counter and refer to its value in
  +             multiple places.</property>
   </properties>
   </component>
   
  
  
  
  1.14      +1 -1      jakarta-jmeter/xdocs/usermanual/get-started.xml
  
  Index: get-started.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/get-started.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- get-started.xml   12 Aug 2002 13:26:28 -0000      1.13
  +++ get-started.xml   15 Oct 2002 20:28:42 -0000      1.14
  @@ -29,7 +29,7 @@
   <p>JMeter requires your computing environment meets some minimum requirements.</p>
   
   <subsection name="2.1.1 Java Version" anchor="java_ver">
  -<p>JMeter requires a fully compliant JDK1.2 (or higher) environment. Because JMeter 
uses only
  +<p>JMeter (as of version 1.8) requires a fully compliant JDK1.4 (or higher) 
environment. Because JMeter uses only
   standard Java APIs (java.*), please do not file bug reports if your JRE fails to run
   JMeter because of JRE implementation issues.</p>
   <note>JDK1.4.1Beta appears to be buggy, and there are some GUI elements that won't 
work correctly in this JVM.</note>
  
  
  

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

Reply via email to