mstover1    2002/07/03 12:17:58

  Modified:    docs/usermanual component_reference.html
               src_1/org/apache/jmeter/protocol/http/config UrlConfig.java
               xdocs/usermanual component_reference.xml
  Log:
  doc update
  
  Revision  Changes    Path
  1.14      +110 -4    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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- component_reference.html  29 Jun 2002 00:36:59 -0000      1.13
  +++ component_reference.html  3 Jul 2002 19:17:58 -0000       1.14
  @@ -71,6 +71,7 @@
                                        <li><a href="#FTP_Request">FTP Request</a></li>
                                        <li><a href="#HTTP_Request">HTTP 
Request</a></li>
                                        <li><a href="#JDBC_Request">JDBC 
Request</a></li>
  +                                     <li><a href="#Java_Request">Java 
Request</a></li>
                                </ul>
                        <li><a href="#logic_controllers">13.2 Logic 
Controllers</a></li>
                <ul>
  @@ -78,6 +79,7 @@
                                        <li><a href="#Loop_Controller">Loop 
Controller</a></li>
                                        <li><a href="#Once_Only_Controller">Once Only 
Controller</a></li>
                                        <li><a href="#Simple_Controller">Simple 
Controller</a></li>
  +                                     <li><a href="#Random_Controller">Random 
Controller</a></li>
                                </ul>
                        <li><a href="#listeners">13.3 Listeners</a></li>
                <ul>
  @@ -209,7 +211,7 @@
                                                                                       
                                                 
        
                                                                                       
         <p      >
  -                                                             This controller lets 
you send an HTTP/HTTPS request to a web server.  It
  +                                                             This sampler lets you 
send an HTTP/HTTPS request to a web server.  It
        also lets you control whether or not JMeter parses HTML files for images and
        Java applets and sends HTTP requests to retrieve them.
                                                </p>
  @@ -221,13 +223,13 @@
                                                                                       
         <a href="../usermanual/component_reference.html#HTTP_Request_Defaults">HTTP 
Request Defaults</a>
                                                                        
        Configuration Element so you do not have to enter the same information for each
  -     HTTP Request controller.
  +     HTTP Request.
                                                </p>
                                                                        
   
        
                                                                                       
         <p      >
  -                                                             Or, instead of 
manually adding HTTP Request controllers, you may want to use
  +                                                             Or, instead of 
manually adding HTTP Requests, you may want to use
        JMeter's 
                                                                                       
         <a href="../usermanual/component_reference.html#HTTP_Proxy_Server">HTTP Proxy 
Server</a>
                                                                         to create
  @@ -413,7 +415,7 @@
                </td></tr>
                <tr><td>
                                                                                       
                                                                                 <p    
  >
  -                                                             This controller lets 
you send an JDBC Request (an SQL query) to a database.
  +                                                             This sampler lets you 
send an JDBC Request (an SQL query) to a database.
                                                </p>
                                                                        
   
  @@ -528,6 +530,67 @@
                <tr><td><br/></td></tr>
         </table>
        <hr>
  +                                                                                    
                                                                         <table 
border="0" cellspacing="0" cellpadding="2">
  +             <tr><td>
  +               <font face="arial,helvetica,sanserif">
  +                      <a name="Java_Request"><h3>13.1.4 Java Request</h3></a>
  +               </font>
  +             </td></tr>
  +             <tr><td>
  +                                                                                    
                                                                                 <p    
  >
  +                                                             This sampler lets you 
control a java class that implements the 
  +JavaSamplerClient interface.  By writing your own implementation of this interface,
  +you can use JMeter to harness multiple threads, input parameter control, and
  +data collection.
  +                                             </p>
  +                                                                     
  +
  +                                                                                    
         <p      >
  +                                                             The pull-down menu 
provides the list of all such implementations found by
  +JMeter in its classpath.  The parameters can then be specified in the 
  +table below - as defined by your implementation.  A simple example (SleepTest) is
  +provided.
  +                                             </p>
  +                                                                     <p><b>Control 
Panel</b></p>
  +                                                                                    
 <div align="center"><img src="../images/screenshots/java_request.gif"></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 sampler
  +      that is shown in the tree.
  +                     </td>
  +                     <td>
  +                                                                                    
 No
  +                                                             </td>
  +             </tr>
  +                     <tr>
  +                     <td>Classname</td>
  +                     <td>                                            The specific 
implementation of
  +     the JavaSamplerClient interface to be sampled.
  +                     </td>
  +                     <td>
  +                                                                                    
 Yes
  +                                                             </td>
  +             </tr>
  +                     <tr>
  +                     <td>Send Parameters with Request</td>
  +                     <td>                                            A list of
  +     arguments that will be passed to the sampled class.  All arguments
  +     are sent as Strings.
  +                     </td>
  +                     <td>
  +                                                                                    
 No
  +                                                             </td>
  +             </tr>
  +             </table>
  +     </p>
  +                                                                     </td></tr>
  +             <tr><td><br/></td></tr>
  +      </table>
  +     <hr>
                                                                          </blockquote>
                  </p>
                </td></tr>
  @@ -938,6 +1001,49 @@
   
   
                                                                                       
         </td></tr>
  +             <tr><td><br/></td></tr>
  +      </table>
  +     <hr>
  +                                                                                    
                                                                         <table 
border="0" cellspacing="0" cellpadding="2">
  +             <tr><td>
  +               <font face="arial,helvetica,sanserif">
  +                      <a name="Random_Controller"><h3>13.2.6 Random 
Controller</h3></a>
  +               </font>
  +             </td></tr>
  +             <tr><td>
  +                                                                                    
                                                 
  +
  +                                                                                    
         <p      >
  +                                                             The Random Logic 
Controller acts similarly to the Interleave Controller, except that
  +instead of going in order through its sub-controllers and samplers, it picks one
  +at random at each pass.
  +                                             </p>
  +                                                                     
  +
  +                                                                                    
         <p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" 
cellpadding="2">
  +             <tr><td>                                                Interactions 
between multiple controllers can yield complex behavior.
  +This is particularly true of the Random Controller.  Experiment before you assume 
  +what results any given interaction will give
  +                     </td></tr>
  +     </table></p>
  +                                                                     
  +
  +                                                             <p><b>Control 
Panel</b></p>
  +                                                                                    
                                                                                       
           <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 controller that is shown in the tree.
  +                     </td>
  +                     <td>
  +                                                                                    
 No
  +                                                             </td>
  +             </tr>
  +             </table>
  +     </p>
  +                                                                     </td></tr>
                <tr><td><br/></td></tr>
         </table>
        <hr>
  
  
  
  1.9       +3 -3      
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/UrlConfig.java
  
  Index: UrlConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/UrlConfig.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- UrlConfig.java    19 Jun 2002 20:36:08 -0000      1.8
  +++ UrlConfig.java    3 Jul 2002 19:17:58 -0000       1.9
  @@ -365,7 +365,7 @@
                                // we need to add a try/catch around the method call.
                                try
                                {
  -                                     addArgument(name, URLDecoder.decode(value));
  +                                     addArgument(URLDecoder.decode(name), 
URLDecoder.decode(value));
                                }
                                catch (Exception e)
                                {
  
  
  
  1.16      +42 -4     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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- component_reference.xml   29 Jun 2002 00:37:00 -0000      1.15
  +++ component_reference.xml   3 Jul 2002 19:17:58 -0000       1.16
  @@ -35,15 +35,15 @@
   <component name="HTTP Request" index="13.1.2" 
screenshot="../images/screenshots/gen-controller/http-request.gif">
   
   <description>
  -     <p>This controller lets you send an HTTP/HTTPS request to a web server.  It
  +     <p>This sampler lets you send an HTTP/HTTPS request to a web server.  It
        also lets you control whether or not JMeter parses HTML files for images and
        Java applets and sends HTTP requests to retrieve them.</p>
        <p>If you are going to send multiple requests to the same web server, consider
        using an <complink name="HTTP Request Defaults"/>
        Configuration Element so you do not have to enter the same information for each
  -     HTTP Request controller.</p>
  +     HTTP Request.</p>
   
  -     <p>Or, instead of manually adding HTTP Request controllers, you may want to use
  +     <p>Or, instead of manually adding HTTP Requests, you may want to use
        JMeter's <complink name="HTTP Proxy Server"/> to create
        them.  This can save you time if you have a lot of HTTP requests or requests 
with many
        parameters.</p>
  @@ -105,7 +105,7 @@
   
   <component name="JDBC Request" index="13.1.3" 
screenshot="../images/screenshots/gen-controller/jdbc-request.gif">
   
  -<description><p>This controller lets you send an JDBC Request (an SQL query) to a 
database.</p>
  +<description><p>This sampler lets you send an JDBC Request (an SQL query) to a 
database.</p>
   <p>If you are going to send multiple requests to the same database, consider
   using one or more of the Defaults Configuration Elements:
   <complink name="JDBC Database Login Defaults"/>,
  @@ -143,6 +143,29 @@
   
   </component>
   
  +<component name="Java Request" index="13.1.4" 
screenshot="../images/screenshots/java_request.gif">
  +
  +<description><p>This sampler lets you control a java class that implements the 
  +JavaSamplerClient interface.  By writing your own implementation of this interface,
  +you can use JMeter to harness multiple threads, input parameter control, and
  +data collection.</p>
  +<p>The pull-down menu provides the list of all such implementations found by
  +JMeter in its classpath.  The parameters can then be specified in the 
  +table below - as defined by your implementation.  A simple example (SleepTest) is
  +provided.</p></description>
  +
  +<properties>
  +     <property name="Name" required="No">Descriptive name for this sampler
  +      that is shown in the tree.</property>
  +     <property name="Classname" required="Yes">The specific implementation of
  +     the JavaSamplerClient interface to be sampled.</property>
  +     <property name="Send Parameters with Request" required="No">A list of
  +     arguments that will be passed to the sampled class.  All arguments
  +     are sent as Strings.</property>
  +     </properties>
  +
  +</component>
  +
   </section>
   
   <section name="13.2 Logic Controllers" anchor="logic_controllers">
  @@ -297,6 +320,21 @@
   <figure image="../images/screenshots/logic-controller/simple-example.gif">Figure 5 
Simple Controller Example</figure>
   
   </example>
  +</component>
  +
  +<component index="13.2.6" name="Random Controller">
  +<description>
  +<p>The Random Logic Controller acts similarly to the Interleave Controller, except 
that
  +instead of going in order through its sub-controllers and samplers, it picks one
  +at random at each pass.</p>
  +<note>Interactions between multiple controllers can yield complex behavior.
  +This is particularly true of the Random Controller.  Experiment before you assume 
  +what results any given interaction will give</note>
  +</description>
  +<properties>
  +     <property name="Name" required="No">Descriptive name for this controller that 
is shown in the tree.</property>
  +</properties>
  +
   </component>
   </section>
   
  
  
  

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

Reply via email to