Modified: jakarta/jmeter/trunk/docs/usermanual/functions.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/functions.html?rev=593675&r1=593674&r2=593675&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/functions.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/functions.html Fri Nov  9 14:29:07 2007
@@ -633,7 +633,7 @@
                                                                         
function.
 The __logn() function reference can be used anywhere in the test plan after 
the variable has been defined.
 Alternatively, the Java Request sampler can be used to create a sample 
containing variable references;
-the output will be shown in the approriate Listener.
+the output will be shown in the appropriate Listener.
 For versions of JMeter later than 2.3, there is a 
                                                                                
                <a 
href="../usermanual/component_reference.html#Debug_Sampler">Debug Sampler</a>
                                                                         
@@ -1266,6 +1266,44 @@
                                                </p>
                                                                        
 
+                                                                               
                <p      >
+                                                               
+Versions of JMeter after 2.3 make the following variables available to the 
script:
+
+                                               </p>
+                                                                       
+
+                                                                               
                <ul     >
+                                                               
+
+                                                                               
                <li     >
+                                                               ctx - 
JMeterContext object
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               vars - 
JMeterVariables object
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               threadName - 
String
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               sampler - 
current Sampler object (if any)
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               sampleResult - 
previous SampleResult object (if any)
+                                               </li>
+                                                                       
+
+                                               </ul>
+                                                                       
+
                                                                                
                <p><table border="1" bgcolor="#bbbb00" width="50%" 
cellspacing="0" cellpadding="2">
                <tr><td>                                                
 JMeter is not a browser, and does not interpret the JavaScript in downloaded 
pages.
@@ -2314,11 +2352,32 @@
                                                                                
                <a       href="http://jakarta.apache.org/commons/jexl";>
                                                                Commons JEXL 
expression
                                                </a>
-                                                                       .
+                                                                       . 
+       See links below for more information on JEXL expressions.
        
                                                </p>
                                                                        
        
+                                                                               
                <ul     >
+                                                               
+       
+                                                                               
                <li     >
+                                                                               
                <a       
href="http://commons.apache.org/jexl/reference/syntax.html";>
+                                                               JEXL syntax 
description
+                                               </a>
+                                                       </li>
+                                                                       
+       
+                                                                               
                <li     >
+                                                                               
                <a       
href="http://commons.apache.org/jexl/reference/examples.html#Example_Expressions";>
+                                                               JEXL examples
+                                               </a>
+                                                       </li>
+                                                                       
+       
+                                               </ul>
+                                                                       
+       
                                                                                
                                                                                
                                                 <p>
        <b>Parameters</b>
        <table border="1" cellspacing="0" cellpadding="2">
@@ -2335,6 +2394,40 @@
                </tr>
                </table>
        </p>
+                                                                               
                                                                                
<p      >
+                                                               
+JMeter 2.3 (and later versions) make the following variables available to the 
script:
+
+                                               </p>
+                                                                               
                                                                                
<ul     >
+                                                               
+
+                                                                               
                <li     >
+                                                               ctx - 
JMeterContext object
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               vars - 
JMeterVariables object
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               threadName - 
String
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               sampler - 
current Sampler object (if any)
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               sampleResult - 
previous SampleResult object (if any)
+                                               </li>
+                                                                       
+
+                                               </ul>
                                                                        
</td></tr>
                <tr><td><br></td></tr>
         </table>

Modified: jakarta/jmeter/trunk/docs/usermanual/get-started.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/get-started.html?rev=593675&r1=593674&r2=593675&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/get-started.html Fri Nov  9 14:29:07 
2007
@@ -897,7 +897,10 @@
                                                                -l [name of JTL 
file to log sample results to].
                                                </p>
                                                                                
                                                                                
<p      >
-                                                               -r Run all 
remote servers specified in jmeter.properties (or remote servers specified on 
command line by overriding properties)
+                                                               -r Run the test 
in the servers specified by the JMeter property "remote_hosts"
+                                               </p>
+                                                                               
                                                                                
<p      >
+                                                               -R [list of 
remote servers] Run the test in the specified remote servers
                                                </p>
                                                                                
                                                                                
<p      >
                                                                The script also 
lets you specify the optional firewall/proxy server information:
@@ -934,8 +937,7 @@
                                                </a>
                                                                        , run 
JMeter in server mode on the remote node(s), and then control the server(s) 
from the GUI.
 You can also use non-GUI mode to run remote tests.
-
-Run jmeter-server/jmeter-server.bat, plus these optional commands:
+To start the server(s), run jmeter-server/jmeter-server.bat on each server 
host.
                                                </p>
                                                                                
                                                                                
<p      >
                                                                The script also 
lets you specify the optional firewall/proxy server information:
@@ -953,6 +955,22 @@
                                                </b>
                                                                        : 
jmeter-server -H my.proxy.server -P 8000
                                                </p>
+                                                                               
                                                                                
<p      >
+                                                               If you want the 
server to exit after a single test has been run, then define the JMeter 
property server.exitaftertest=true.
+
+                                               </p>
+                                                                               
                                                                                
<p      >
+                                                               To run the test 
from the client in non-GUI mode, use the following command:
+                                               </p>
+                                                                               
                                                                                
<pre    >
+                                                               
+jmeter -n -t testplan.jmx -r [-Gprop=val] [-Z]
+where:
+-G is used to define JMeter properties to be set in the servers
+-X means exit the servers at the end of the test
+-Rserver1,server2 - can be used instead of -r to provide a list of servers 
(overrides remote_hosts)
+
+                                               </pre>
                                                                          
</blockquote>
                </td></tr>
                <tr><td><br></td></tr>
@@ -973,7 +991,10 @@
                                                                
-D[prop_name]=[value] - defines a java system property value.
                                                </p>
                                                                                
                                                                                
<p      >
-                                                               -J[prop 
name]=[value] - overrides a JMeter property.
+                                                               -J[prop 
name]=[value] - defines a local JMeter property.
+                                               </p>
+                                                                               
                                                                                
<p      >
+                                                               -G[prop 
name]=[value] - defines a JMeter property to be sent to all remote servers.
                                                </p>
                                                                                
                                                                                
<p      >
                                                                
-L[category]=[priority] - overrides a logging setting, setting a particular 
category to the given priority level.
@@ -1125,6 +1146,8 @@
                 Set password for proxy server that JMeter is to use
         -J, --jmeterproperty {argument}={value}
                 Define additional JMeter properties
+        -G, --globalproperty (argument)=(value)
+                Define Global properties (sent to servers)
         -D, --systemproperty {argument}={value}
                 Define additional System properties
         -S, --systemPropertyFile {filename}
@@ -1138,6 +1161,8 @@
                 Start these remote servers (overrides remote_hosts)
         -d, --homedir {argument}
                 the jmeter home directory to use
+        -X, --remoteexit
+                Exit the remote servers at end of test (non-GUI)
 
                                                </pre>
                                                                          
</blockquote>

Modified: jakarta/jmeter/trunk/docs/usermanual/remote-test.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/remote-test.html?rev=593675&r1=593674&r2=593675&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/remote-test.html Fri Nov  9 14:29:07 
2007
@@ -217,12 +217,18 @@
 add the value of your running JMeter server's IP address.  Multiple such 
servers can be added, comma-delimited.
                                                </p>
                                                                                
                                                                                
<p      >
-                                                               Note that you 
can also use the -J 
+                                                               Note that you 
can use the -R 
                                                                                
                <a       href="get-started.html#override">
                                                                command line 
option
                                                </a>
-                                                                        to 
specify the remote host(s) to use.
-       E.g. jmeter -Jremote_hosts=host1,127.0.0.1,host2
+                                                                       
+instead to specify the remote host(s) to use. This has the same effect as 
using -r and -Jremote_hosts={serverlist}.
+       E.g. jmeter -Rhost1,127.0.0.1,host2
+                                               </p>
+                                                                               
                                                                                
<p      >
+                                                               If you define 
the JMeter property server.exitaftertest=true, then the server will exit after 
it runs a single test.
+See also the -X flag (described below)
+
                                                </p>
                                                                                
                                                                                
<p      >
                                                                                
                <b      >
@@ -253,6 +259,10 @@
 jmeter -n -t script.jmx -r
 or
 jmeter -n -t script.jmx -R server1,server2...
+
+Other flags that may be useful:
+-Gproperty=value - define a property in all the servers (may appear more than 
once)
+-Z - Exit remote servers at the end of the test.
 
                                                </pre>
                                                                        
@@ -263,14 +273,6 @@
                                                </br>
                                                                        
 The command-line client will exit when all the remote servers have stopped.
-
-                                                                               
                <p><table border="1" bgcolor="#bbbb00" width="50%" 
cellspacing="0" cellpadding="2">
-               <tr><td>                                                
-There is currently no way to stop the remote servers gracefully from the 
command-line.
-
-                       </td></tr>
-       </table></p>
-                                                                       
 
                                                </p>
                                                                                
                                                                                
 <table border="0" cellspacing="0" cellpadding="2" width="100%">



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

Reply via email to