mstover1    2003/06/15 08:28:31

  Modified:    docs     running.html
               docs/demos InterleaveTestPlan2.jmx ProxyServerTestPlan.jmx
               docs/images/screenshots/logic-controller interleave2.png
               docs/usermanual component_reference.html
  Added:       docs/images/screenshots/logic-controller
                        interleave-controller.png interleave3.png
  Removed:     docs/images/screenshots/logic-controller
                        interleave-controller.gif
  Log:
  doc and build file tweaks
  
  Revision  Changes    Path
  1.68      +0 -0      jakarta-jmeter/docs/running.html
  
  Index: running.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/running.html,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  
  
  
  1.6       +30 -3     jakarta-jmeter/docs/demos/InterleaveTestPlan2.jmx
  
  Index: InterleaveTestPlan2.jmx
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/demos/InterleaveTestPlan2.jmx,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InterleaveTestPlan2.jmx   10 Jun 2003 16:27:18 -0000      1.5
  +++ InterleaveTestPlan2.jmx   15 Jun 2003 15:28:31 -0000      1.6
  @@ -46,7 +46,7 @@
   <testelement class="org.apache.jmeter.control.InterleaveControl">
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
  -<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.IntegerProperty" 
name="InterleaveControl.style">0</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.IntegerProperty" 
name="InterleaveControl.style">1</property>
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.name">Interleave Controller</property>
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="TestElement.enabled">true</property>
   </testelement>
  @@ -73,7 +73,7 @@
   <testelement class="org.apache.jmeter.control.InterleaveControl">
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
  -<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.IntegerProperty" 
name="InterleaveControl.style">0</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.IntegerProperty" 
name="InterleaveControl.style">1</property>
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.name">Interleave Controller</property>
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="TestElement.enabled">true</property>
   </testelement>
  @@ -136,7 +136,7 @@
   <testelement class="org.apache.jmeter.control.InterleaveControl">
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</property>
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</property>
  -<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.IntegerProperty" 
name="InterleaveControl.style">0</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.IntegerProperty" 
name="InterleaveControl.style">1</property>
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.name">Interleave Controller</property>
   <property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="TestElement.enabled">true</property>
   </testelement>
  @@ -195,6 +195,33 @@
   </testelement>
   </node>
   </node>
  +</node>
  +<node>
  +<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="HTTPSampler.path"/>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="HTTPSampler.encoded_path"/>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="HTTPSampler.method">GET</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="HTTPSampler.use_keepalive">true</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="HTTPSampler.protocol"/>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="TestElement.enabled">true</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="HTTPSampler.image_parser">false</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="HTTPSampler.follow_redirects">true</property>
  +<testelement class="org.apache.jmeter.config.Arguments" 
name="HTTPsampler.Arguments">
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.test_class">org.apache.jmeter.config.Arguments</property>
  +<collection class="java.util.LinkedList" 
propType="org.apache.jmeter.testelement.property.CollectionProperty" 
name="Arguments.arguments"/>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.name"/>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="TestElement.enabled">true</property>
  +</testelement>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="HTTPSampler.port"/>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="HTTPSampler.mimetype"/>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="HTTPSampler.FILE_FIELD"/>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.name">Interleaved</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="HTTPSampler.domain">${server}</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="HTTPSampler.FILE_NAME"/>
  +</testelement>
   </node>
   <node>
   <testelement class="org.apache.jmeter.reporters.ResultCollector">
  
  
  
  1.4       +20 -33    jakarta-jmeter/docs/demos/ProxyServerTestPlan.jmx
  
  Index: ProxyServerTestPlan.jmx
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/demos/ProxyServerTestPlan.jmx,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProxyServerTestPlan.jmx   29 Jan 2003 17:18:31 -0000      1.3
  +++ ProxyServerTestPlan.jmx   15 Jun 2003 15:28:31 -0000      1.4
  @@ -1,33 +1,20 @@
  -<?xml version="1.0"?>
  -
  -<TestPlan>
  -<threadgroups>
  -<ThreadGroup name="Thread Group" numThreads="1" rampUp="0">
  -<controllers>
  -<LoopController type="org.apache.jmeter.control.LoopController" name="Loop 
Controller" iterations="1">
  -<configElements>
  -<ProxyControl type="org.apache.jmeter.protocol.http.proxy.ProxyControl">
  -<property name="port">8080</property>
  -<property name="name">HTTP Proxy Server</property>
  -<property name="includes"><Arguments>
  -</Arguments>
  -</property>
  -<property name="excludes"><Arguments>
  -</Arguments>
  -</property>
  -</ProxyControl>
  -</configElements>
  -<controllers>
  -</controllers>
  -</LoopController>
  -</controllers>
  -<timers>
  -</timers>
  -<listeners>
  -</listeners>
  -</ThreadGroup>
  -
  -</threadgroups>
  -<configElements>
  -</configElements>
  -</TestPlan>
  +<?xml version="1.0" encoding="UTF-8"?>
  +<node>
  +<testelement class="org.apache.jmeter.testelement.WorkBench">
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.gui_class">org.apache.jmeter.control.gui.WorkBenchGui</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.test_class">org.apache.jmeter.testelement.WorkBench</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.name">WorkBench</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="TestElement.enabled">true</property>
  +</testelement>
  +<node>
  +<testelement class="org.apache.jmeter.protocol.http.proxy.ProxyControl">
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.gui_class">org.apache.jmeter.protocol.http.proxy.gui.ProxyControlGui</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.test_class">org.apache.jmeter.protocol.http.proxy.ProxyControl</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="TestElement.name">HTTP Proxy Server</property>
  +<collection class="java.util.HashSet" 
propType="org.apache.jmeter.testelement.property.CollectionProperty" 
name="ProxyControlGui.include_list"/>
  +<collection class="java.util.HashSet" 
propType="org.apache.jmeter.testelement.property.CollectionProperty" 
name="ProxyControlGui.exclude_list"/>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.BooleanProperty" 
name="TestElement.enabled">true</property>
  +<property xml:space="preserve" 
propType="org.apache.jmeter.testelement.property.StringProperty" 
name="ProxyControlGui.port">8080</property>
  +</testelement>
  +</node>
  +</node>
  
  
  
  1.2       +27 -40    
jakarta-jmeter/docs/images/screenshots/logic-controller/interleave2.png
  
        <<Binary file>>
  
  
  1.1                  
jakarta-jmeter/docs/images/screenshots/logic-controller/interleave-controller.png
  
        <<Binary file>>
  
  
  1.1                  
jakarta-jmeter/docs/images/screenshots/logic-controller/interleave3.png
  
        <<Binary file>>
  
  
  1.49      +35 -38    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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- component_reference.html  13 Jun 2003 14:51:50 -0000      1.48
  +++ component_reference.html  15 Jun 2003 15:28:31 -0000      1.49
  @@ -1078,7 +1078,7 @@
                                                                        
   
                                                                                       
                         <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/logic-controller/interleave-controller.gif"></div>
  +                                             <div align="center"><img 
src="../images/screenshots/logic-controller/interleave-controller.png"></div>
                                                                                       
                                                                                       
           <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
  @@ -1091,6 +1091,14 @@
                                                                                       
 No
                                                                </td>
                </tr>
  +                     <tr>
  +                     <td>ignore sub-controller blocks</td>
  +                     <td>                                            If checked, 
the interleave controller will treat sub-controllers like single request elements and 
only allow one request per controller at a time.  
  +                     </td>
  +                     <td>
  +                                                                                    
 No
  +                                                             </td>
  +             </tr>
                </table>
        </p>
                                                                                       
                                                                         <a 
name="simple_interleave_example"/>
  @@ -1281,11 +1289,24 @@
                                                                                       
         <p      >
                                                                The outer Interleave 
Controller alternates between the
   two inner ones.  Then, each inner Interleave Controller alternates between each of 
the HTTP Requests.  Each JMeter
  -thread will send the requests in the following order: Home Page, Bug Page, CVS 
Page, and FAQ Page.
  +thread will send the requests in the following order: Home Page, Interleaved, Bug 
Page, Interleaved, CVS Page, Interleaved, and FAQ Page, Interleaved.
   Note, the File Reporter is configured to store the results in a file named 
"interleave-test2.dat" in the current directory.
                                                </p>
                                                                        
   
  +
  +                                                                                    
         <p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img 
src="../images/screenshots/logic-controller/interleave3.png"><br>
  +     <font size="-1">                                                
  +        Figure 3 - Interleave Controller Example 3
  +
  +                     </font></td></tr></table></p>
  +                                                                     
  +
  +                                                                                    
         <p      >
  +                                                             If the two interleave 
controllers under the main interleave controller were instead simple controllers, then 
the order would be: Home Page, CVS Page, Interleaved, Bug Page, FAQ Page, Interleaved. 
 However, if "ignore sub-controller blocks" was checked on the main interleave 
controller, then the order would be: Home Page, Interleaved, Bug Page, Interleaved, 
CVS Page, Interleaved, and FAQ Page, Interleaved.
  +                                             </p>
  +                                                                     
  +
                                                                                       
         </td></tr>
                <tr><td><br></td></tr>
         </table>
  @@ -2013,9 +2034,7 @@
                </td></tr>
                                <tr><td>
                                                                                       
                                                 No Description
  -                                                                                    
                         <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/"></div>
  -                                                                                    
                 </td></tr>
  +                                                                                    
                                         </td></tr>
                <tr><td><br></td></tr>
         </table>
        <hr>
  @@ -2167,9 +2186,7 @@
                                                                                       
                                                 This listener can record results to a 
file
   but not to the UI.  It is meant to provide an efficient means of
   recording data by eliminating GUI overhead.
  -                                                                                    
                         <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/"></div>
  -                                                                                    
                 </td></tr>
  +                                                                                    
                                         </td></tr>
                <tr><td><br></td></tr>
         </table>
        <hr>
  @@ -3447,9 +3464,7 @@
                                                </p>
                                                                        
   
  -                                                                                    
                         <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                                                                                       
                  <a name="spider_example"/>
  +                                                                                    
                                                                                       
                                          <a name="spider_example"/>
        <p><b>Spidering Example</b></p>
                                                        
   
  @@ -4275,9 +4290,7 @@
                                                                        
   
                                                </p>
  -                                                                                    
                                 <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                                                                                       
           <p>
  +                                                                                    
                                                                                       
                                           <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
        <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4390,9 +4403,7 @@
   that is like counting the number of iterations through the test plan.  A global 
counter is like
   counting how many times that request was run.
                                                </p>
  -                                                                                    
                                 <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                                                                                       
           <p>
  +                                                                                    
                                                                                       
                                           <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
        <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4444,9 +4455,7 @@
                                                </p>
                                                                        
   
  -                                                                                    
                         <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                 </td></tr>
  +                                                                                    
                                         </td></tr>
                <tr><td><br></td></tr>
         </table>
        <hr>
  @@ -4461,9 +4470,7 @@
                                                                The intsum function 
can be used to compute the sum of two or more integer values.
   
                                                </p>
  -                                                                                    
                                 <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                                                                                       
           <p>
  +                                                                                    
                                                                                       
                                           <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
        <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4540,9 +4547,7 @@
                                                </p>
                                                                        
   
  -                                                                                    
                         <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                                                                                       
           <p>
  +                                                                                    
                                                                                       
                                   <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
        <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4588,9 +4593,7 @@
                                                                                       
                                                                                 <p    
  >
                                                                The machineName 
function returns the local host name
                                                </p>
  -                                                                                    
                                 <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                                                                                       
           <p>
  +                                                                                    
                                                                                       
                                           <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
        <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4621,9 +4624,7 @@
                                                </p>
                                                                        
        
  -                                                                                    
                         <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                                                                                       
           <p>
  +                                                                                    
                                                                                       
                                   <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
        <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4660,9 +4661,7 @@
                                                                                       
                                                                                 <p    
  >
                                                                The random function 
returns a random number that lies between the given min and max values.
                                                </p>
  -                                                                                    
                                 <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                                                                                       
           <p>
  +                                                                                    
                                                                                       
                                           <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
        <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  @@ -4716,9 +4715,7 @@
                                                                                       
         <p      >
                                                                NOTE: A single 
instance of the file is opened and used for all threads.
                                                </p>
  -                                                                                    
                                 <p><b>Control Panel</b></p>
  -                                             <div align="center"><img 
src="../images/screenshots/$component.getAttributeValue('screenshot')"></div>
  -                                                                                    
                                                                                       
           <p>
  +                                                                                    
                                                                                       
                                           <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
        <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
  
  
  

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

Reply via email to