You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2012/01/28 18:12:55 UTC
svn commit: r1237098 [4/4] - in /jmeter/trunk: docs/ docs/usermanual/ xdocs/
Modified: jmeter/trunk/docs/usermanual/functions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/functions.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/functions.html (original)
+++ jmeter/trunk/docs/usermanual/functions.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual: Functions and Variables</title>
+<title>Apache JMeter - User's Manual: Functions and Variables</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -161,7 +165,7 @@ ${__functionName(var1,var2,var3)}
Where "__functionName" matches the name of a function.
<br>
-</br>
+
Parentheses surround the parameters sent to the function, for example ${__time(YMD)}
The actual parameters vary from function to function.
@@ -286,6 +290,23 @@ Information
</td>
<td bgcolor="#a0ddf0" valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ <a href="#__machineIP">machineIP</a>
+</font>
+</td>
+<td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+get the local machine IP address
+</font>
+</td>
+</tr>
+<tr>
+<td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+Information
+</font>
+</td>
+<td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
<a href="#__machineName">machineName</a>
</font>
</td>
@@ -490,7 +511,7 @@ Calculation
</td>
<td bgcolor="#a0ddf0" valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
- <a href="#__Random">RandomString</a>
+ <a href="#__RandomString">RandomString</a>
</font>
</td>
<td bgcolor="#a0ddf0" valign="top" align="left">
@@ -541,7 +562,7 @@ Scripting
</td>
<td bgcolor="#a0ddf0" valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
- <a href="#__jexl">jexl</a>
+ <a href="#__jexl">jexl, jexl2</a>
</font>
</td>
<td bgcolor="#a0ddf0" valign="top" align="left">
@@ -754,6 +775,23 @@ Encode strings using HTML encoding
</font>
</td>
</tr>
+<tr>
+<td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+String
+</font>
+</td>
+<td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ <a href="#__TestPlanName">TestPlanName</a>
+</font>
+</td>
+<td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+Return name of current test plan
+</font>
+</td>
+</tr>
</table>
<p>
</p>
@@ -768,7 +806,7 @@ Encode strings using HTML encoding
<p>
There are two kinds of functions: user-defined static values (or variables), and built-in functions.
<br>
-</br>
+
User-defined static values allow the user to define variables to be replaced with their static value when
a test tree is compiled and submitted to be run. This replacement happens once at the beginning of the test
@@ -900,24 +938,24 @@ Also note that variables defined in a UD
remember to include any necessary quotes for text strings,
i.e. use
<br>
-</br>
+
SELECT item from table where name='${VAR}'
<br>
-</br>
+
<b>
not
</b>
<br>
-</br>
+
SELECT item from table where name=${VAR}
<br>
-</br>
+
(unless VAR itself contains the quotes)
</td></tr>
@@ -1227,7 +1265,7 @@ No
<td>Sixth argument</td>
<td>A reference name for reusing the values parsed by this function.
<br>
-</br>
+
Stored values are ${refName} (the replacement template string) and ${refName_g#} where "#" is the
group number from the regular expression ("0" can be used to refer to the entire match).
@@ -1286,6 +1324,26 @@ The global counter - "FALSE" - is separa
<p>
+
+
+<b>
+
+Multiple __counter function calls in the same iteration won't increment the value further.
+
+</b>
+
+
+<br>
+
+
+If you want to have a count that increments for each sample, use the function in a Pre-Processor such as
+<a href="../usermanual/component_reference.html#User_Parameters">User Parameters</a>
+.
+
+</p>
+
+
+<p>
<b>Parameters</b>
<a name="__counter_parms"/>
<a class="sectionlink" href="#__counter_parms" title="Link to here">¶</a><table border="1" cellspacing="0" cellpadding="2">
@@ -1303,7 +1361,7 @@ Yes
<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. [For JMeter 2.1.1 and earlier this parameter was required.]
@@ -1526,6 +1584,7 @@ CSV Data Set Config test element
<p>
Each time it is called it reads the next line from the file.
+ All threads share the same instance, so different threads will get different lines.
When the end of the file is reached, it will start reading again from the beginning,
unless the maximum loop count has been reached.
If there are multiple references to the function in a test script, each will open the file independently,
@@ -1534,6 +1593,18 @@ CSV Data Set Config test element
</p>
+
+<p>
+<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
+<tr><td>
+ Function instances are shared between threads, and the file is (re-)opened by whatever thread
+ happens to need the next line of input, so using the threadNumber as part of the file name
+ will result in unpredictable behaviour.
+
+</td></tr>
+</table>
+</p>
+
<p>
If an error occurs opening or reading the file, then the function returns the string "**ERR**"
@@ -1611,7 +1682,7 @@ When using the optional sequence numbers
# - insert the number, with no leading zeros or spaces
<br>
-</br>
+
000 - insert the number packed out to 3 digits with leading zeros if necessary
@@ -1620,15 +1691,15 @@ When using the optional sequence numbers
Examples:
<br>
-</br>
+
pin#'.'dat -> pin1.dat, ... pin9.dat, pin10.dat, ... pin9999.dat
<br>
-</br>
+
pin000'.'dat -> pin001.dat ... pin099.dat ... pin999.dat ... pin9999.dat
<br>
-</br>
+
pin'.'dat# -> pin.dat1, ... pin.dat9 ... pin.dat999
@@ -1639,7 +1710,7 @@ Examples:
If more digits are required than there are formatting characters, the number will be
expanded as necessary.
<br>
-</br>
+
<b>
@@ -1651,22 +1722,22 @@ To prevent a formatting character from b
(though #. and 000. work as expected in locales where the decimal point is also ".")
<br>
-</br>
+
In other locales (e.g. fr), the decimal point is "," - which means that "#."
becomes "nnn,".
<br>
-</br>
+
See the documentation for DecimalFormat for full details.
<br>
-</br>
+
If the path name does not contain any special formatting characters,
the current sequence number will be appended to the name, otherwise
the number will be inserted aaccording to the fomatting instructions.
<br>
-</br>
+
If the start sequence number is omitted, and the end sequence number is specified,
the sequence number is interpreted as a loop count, and the file will be used at most "end" times.
@@ -1676,15 +1747,15 @@ To prevent a formatting character from b
<br>
-</br>
+
${_StringFromFile(PIN#'.'DAT,,1,2)} - reads PIN1.DAT, PIN2.DAT
<br>
-</br>
+
${_StringFromFile(PIN.DAT,,,2)} - reads PIN.DAT twice
<br>
-</br>
+
</code>
@@ -1705,7 +1776,7 @@ not
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__machineName">19.5.6 __machineName</a>
+<a name="__machineName">19.5.6a __machineName</a>
<a class="sectionlink" href="#__machineName" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -1737,6 +1808,38 @@ No
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
+<a name="__machineIP">19.5.6b __machineIP</a>
+<a class="sectionlink" href="#__machineIP" title="Link to here">¶</a></h3>
+</font>
+</td></tr>
+<tr><td>
+<p>
+The machineIP function returns the local IP address
+</p>
+<p>
+<b>Parameters</b>
+<a name="__machineIP_parms"/>
+<a class="sectionlink" href="#__machineIP_parms" title="Link to here">¶</a><table border="1" cellspacing="0" cellpadding="2">
+<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
+<tr>
+<td>Variable Name</td>
+<td>A reference name for reusing the value
+ computed by this function.
+</td>
+<td>
+No
+</td>
+</tr>
+</table>
+</p>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
+<hr>
+<table border="0" cellspacing="0" cellpadding="2">
+<tr><td>
+<font face="arial,helvetica,sanserif">
+<h3>
<a name="__javaScript">19.5.7 __javaScript</a>
<a class="sectionlink" href="#__javaScript" title="Link to here">¶</a></h3>
</font>
@@ -1904,12 +2007,12 @@ No
the expression has commas, please make sure to escape them. For example in:
<br>
-</br>
+
${__javaScript('${sp}'.slice(7\,99999))}
<br>
-</br>
+
the comma after 7 is escaped.
</td></tr>
@@ -1971,7 +2074,7 @@ No
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__RandomString">19.5.9 __RandomString</a>
+<a name="__RandomString">19.5.8 __RandomString</a>
<a class="sectionlink" href="#__RandomString" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -1986,7 +2089,7 @@ The RandomString function returns a rand
<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
<tr>
<td>Length</td>
-<td>A number
+<td>A number length of generated String
</td>
<td>
Yes
@@ -1994,7 +2097,7 @@ Yes
</tr>
<tr>
<td>Characters to use</td>
-<td>A String contains chars used in generated chars
+<td>Chars used to generate String
</td>
<td>
No
@@ -2015,12 +2118,11 @@ No
<tr><td><br></td></tr>
</table>
<hr>
-
<table border="0" cellspacing="0" cellpadding="2">
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__CSVRead">19.5.10 __CSVRead</a>
+<a name="__CSVRead">19.5.8 __CSVRead</a>
<a class="sectionlink" href="#__CSVRead" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -2186,7 +2288,7 @@ StringFromFile
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__property">19.5.11 __property</a>
+<a name="__property">19.5.9 __property</a>
<a class="sectionlink" href="#__property" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -2270,7 +2372,7 @@ No
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__P">19.5.12 __P</a>
+<a name="__P">19.5.10 __P</a>
<a class="sectionlink" href="#__P" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -2293,33 +2395,33 @@ For example:
Define the property value:
<br>
-</br>
+
jmeter -Jgroup1.threads=7 -Jhostname1=www.realhost.edu
<br>
-</br>
+
Fetch the values:
<br>
-</br>
+
${__P(group1.threads)} - return the value of group1.threads
<br>
-</br>
+
${__P(group1.loops)} - return the value of group1.loops
<br>
-</br>
+
${__P(hostname,www.dummy.org)} - return value of property hostname or www.dummy.org if not defined
<br>
-</br>
+
</code>
@@ -2363,7 +2465,7 @@ No
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__log">19.5.13 __log</a>
+<a name="__log">19.5.11 __log</a>
<a class="sectionlink" href="#__log" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -2438,7 +2540,7 @@ For example:
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__logn">19.5.14 __logn</a>
+<a name="__logn">19.5.12 __logn</a>
<a class="sectionlink" href="#__logn" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -2502,7 +2604,7 @@ For example:
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__BeanShell">19.5.15 __BeanShell</a>
+<a name="__BeanShell">19.5.13 __BeanShell</a>
<a class="sectionlink" href="#__BeanShell" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -2661,7 +2763,7 @@ Remember to include any necessary quotes
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__split">19.5.16 __split</a>
+<a name="__split">19.5.14 __split</a>
<a class="sectionlink" href="#__split" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -2690,47 +2792,47 @@ Remember to include any necessary quotes
<br>
-</br>
+
Define VAR="a||c|" in the test plan.
<br>
-</br>
+
${__split(${VAR},VAR,|)}
<br>
-</br>
+
This will return the contents of VAR, i.e. "a||c|" and set the following variables:
<br>
-</br>
+
VAR_n=4 (3 in JMeter 2.1.1 and earlier)
<br>
-</br>
+
VAR_1=a
<br>
-</br>
+
VAR_2=?
<br>
-</br>
+
VAR_3=c
<br>
-</br>
+
VAR_4=? (null in JMeter 2.1.1 and earlier)
<br>
-</br>
+
VAR_5=null (in JMeter 2.1.2 and later)
@@ -2795,7 +2897,7 @@ No
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__XPath">19.5.17 __XPath</a>
+<a name="__XPath">19.5.15 __XPath</a>
<a class="sectionlink" href="#__XPath" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -2830,17 +2932,17 @@ No
<br>
-</br>
+
<br>
-</br>
+
${__XPath(/path/to/build.xml, //target/@name)}
<br>
-</br>
+
This will match all targets in build.xml and return the contents of the next name attribute
@@ -2878,7 +2980,7 @@ Yes
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__setProperty">19.5.18 __setProperty</a>
+<a name="__setProperty">19.5.16 __setProperty</a>
<a class="sectionlink" href="#__setProperty" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -2942,7 +3044,7 @@ No
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__time">19.5.19 __time</a>
+<a name="__time">19.5.17 __time</a>
<a class="sectionlink" href="#__time" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3028,7 +3130,7 @@ time.YMD=yyMMdd
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__jexl">19.5.20 __jexl</a>
+<a name="__jexl">19.5.18 __jexl</a>
<a class="sectionlink" href="#__jexl" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3038,7 +3140,7 @@ time.YMD=yyMMdd
<p>
The jexl function returns the result of evaluating a
-<a href="http://jakarta.apache.org/commons/jexl">
+<a href="http://commons.apache.org/jexl">
Commons JEXL expression
</a>
.
@@ -3046,6 +3148,11 @@ Commons JEXL expression
</p>
+
+<p>
+The __jexl function uses Commons JEXL 1, and the __jexl2 function uses Commons JEXL 2
+</p>
+
<ul>
@@ -3153,7 +3260,7 @@ OUT - System.out - e.g. OUT.println("mes
Systemclass=log.class.forName("java.lang.System");
<br>
-</br>
+
now=Systemclass.currentTimeMillis();
@@ -3188,7 +3295,7 @@ OUT - System.out - e.g. OUT.println("mes
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__V">19.5.21 __V</a>
+<a name="__V">19.5.19 __V</a>
<a class="sectionlink" href="#__V" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3253,7 +3360,7 @@ Yes
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__evalVar">19.5.22 __evalVar</a>
+<a name="__evalVar">19.5.20 __evalVar</a>
<a class="sectionlink" href="#__evalVar" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3301,7 +3408,7 @@ Yes
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__eval">19.5.23 __eval</a>
+<a name="__eval">19.5.21 __eval</a>
<a class="sectionlink" href="#__eval" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3382,7 +3489,7 @@ Yes
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__char">19.5.24 __char</a>
+<a name="__char">19.5.22 __char</a>
<a class="sectionlink" href="#__char" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3412,7 +3519,7 @@ Yes
<tr>
<td>Unicode character number (decimal or 0xhex)</td>
<td>
- The decimal number (or hex number, if prefixed by 0x) to be converted to a Unicode character.
+ The decimal number (or hex number, if prefixed by 0x, or octal, if prefixed by 0) to be converted to a Unicode character.
</td>
<td>
@@ -3425,12 +3532,12 @@ Yes
Examples:
<br>
-</br>
-${__char(0xC,0xA)} = CRLF
+
+${__char(13,10)} = ${__char(0xD,0xA)} = ${__char(015,012)} = CRLF
<br>
-</br>
+
${__char(165)} = � (yen)
@@ -3443,7 +3550,7 @@ ${__char(165)} = � (yen)
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__unescape">19.5.25 __unescape</a>
+<a name="__unescape">19.5.23 __unescape</a>
<a class="sectionlink" href="#__unescape" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3485,12 +3592,12 @@ Yes
Examples:
<br>
-</br>
+
${__unescape(\r\n)} = CRLF
<br>
-</br>
+
${__unescape(1\t2)} = 1[tab]2
@@ -3503,7 +3610,7 @@ ${__unescape(1\t2)} = 1[tab]2
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__unescapeHtml">19.5.26 __unescapeHtml</a>
+<a name="__unescapeHtml">19.5.24 __unescapeHtml</a>
<a class="sectionlink" href="#__unescapeHtml" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3583,7 +3690,7 @@ Yes
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__escapeHtml">19.5.27 __escapeHtml</a>
+<a name="__escapeHtml">19.5.25 __escapeHtml</a>
<a class="sectionlink" href="#__escapeHtml" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3647,7 +3754,7 @@ Yes
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__FileToString">19.5.28 __FileToString</a>
+<a name="__FileToString">19.5.26 __FileToString</a>
<a class="sectionlink" href="#__FileToString" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3715,7 +3822,7 @@ The file name, encoding and reference na
<tr><td>
<font face="arial,helvetica,sanserif">
<h3>
-<a name="__samplerName">19.5.29 __samplerName</a>
+<a name="__samplerName">19.5.27 __samplerName</a>
<a class="sectionlink" href="#__samplerName" title="Link to here">¶</a></h3>
</font>
</td></tr>
@@ -3762,6 +3869,28 @@ No
<tr><td><br></td></tr>
</table>
<hr>
+<table border="0" cellspacing="0" cellpadding="2">
+<tr><td>
+<font face="arial,helvetica,sanserif">
+<h3>
+<a name="__TestPlanName">19.5.28 __TestPlanName</a>
+<a class="sectionlink" href="#__TestPlanName" title="Link to here">¶</a></h3>
+</font>
+</td></tr>
+<tr><td>
+
+
+<p>
+
+ The TestPlanName function returns the name of the current test plan (can be used in Including Plans to know the name of the calling test plan).
+
+</p>
+
+
+</td></tr>
+<tr><td><br></td></tr>
+</table>
+<hr>
</blockquote>
</td></tr>
<tr><td><br></td></tr>
@@ -3888,7 +4017,7 @@ They are mainly intended for use in file
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/get-started.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/get-started.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jmeter/trunk/docs/usermanual/get-started.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual: Getting Started</title>
+<title>Apache JMeter - User's Manual: Getting Started</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -149,7 +153,7 @@ style="border-width:0; float: left" fram
<p>
The easiest way to begin using JMeter is to first
-<a href="http://jakarta.apache.org/site/downloads/index.html">
+<a href="http://jmeter.apache.org/download_jmeter.cgi">
download the latest production release
</a>
and install it.
@@ -318,7 +322,7 @@ that has a compliant Java implementation
<p>
Operating systems tested with JMeter can be view on
-<a href="http://wiki.apache.org/jakarta-jmeter/JMeterAndOperatingSystemsTested">
+<a href="http://wiki.apache.org/jmeter/JMeterAndOperatingSystemsTested">
this page
</a>
@@ -503,7 +507,7 @@ Make sure the file is a jar file, not a
JMeter now includes the JMS API from Apache Geronimo, so you just need to add the appropriate JMS Client implementation
jar(s) from the JMS provider. Please refer to their documentation for details.
There may also be some information on the
-<a href="http://wiki.apache.org/jakarta-jmeter/">
+<a href="http://wiki.apache.org/jmeter/">
JMeter Wiki
</a>
.
@@ -575,7 +579,7 @@ JMeter Classpath
<blockquote>
<p>
We recommend that most users run the
-<a href="http://jakarta.apache.org/site/downloads/index.html">
+<a href="http://jmeter.apache.org/download_jmeter.cgi">
latest release
</a>
.
@@ -623,7 +627,7 @@ You can rename the parent directory (i.e
<tr><td>
<blockquote>
<br>
-</br>
+
<p>
To run JMeter, run the jmeter.bat (for Windows) or jmeter (for Unix) file.
These files are found in the bin directory.
@@ -860,23 +864,23 @@ from a command line with the following p
-H [proxy server hostname or ip address]
<br>
-</br>
+
-P [proxy server port]
<br>
-</br>
+
-N [nonproxy hosts] (e.g. *.apache.org|localhost)
<br>
-</br>
+
-u [username for proxy authentication - if required]
<br>
-</br>
+
-a [password for proxy authentication - if required]
<br>
-</br>
+
</p>
@@ -939,7 +943,7 @@ The script also lets you specify the opt
<p>
-H [proxy server hostname or ip address]
<br>
-</br>
+
-P [proxy server port]
</p>
@@ -949,6 +953,17 @@ Example
</b>
: jmeter -n -t my_test.jmx -l log.jtl -H my.proxy.server -P 8000
</p>
+<p>
+
+If the property
+<code>
+jmeterengine.stopfail.system.exit
+</code>
+ is set to true (default is false),
+then JMeter will invoke System.exit(1) if it cannot stop all threads.
+Normally this is not necessary.
+
+</p>
</blockquote>
</td></tr>
<tr><td><br></td></tr>
@@ -976,7 +991,7 @@ The script also lets you specify the opt
<p>
-H [proxy server hostname or ip address]
<br>
-</br>
+
-P [proxy server port]
</p>
@@ -1003,6 +1018,17 @@ where:
Overrides remote_hosts, but does not define the property.
</pre>
+<p>
+
+If the property
+<code>
+jmeterengine.remote.system.exit
+</code>
+ is set to true (default is false),
+then JMeter will invoke System.exit(0) after stopping RMI at the end of a test.
+Normally this is not necessary.
+
+</p>
</blockquote>
</td></tr>
<tr><td><br></td></tr>
@@ -1059,7 +1085,7 @@ jmeter -LDEBUG
<b>
N.B.
<br>
-</br>
+
The command line properties are processed early in startup, but after the logging system has been set up.
Attempts to use the -J flag to update log_level or log_file properties will have no effect.
@@ -1231,6 +1257,40 @@ that was run in interactive mode.
</td></tr>
<tr><td><br></td></tr>
</table>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr><td bgcolor="#828DA6">
+<font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="shutdown"><strong>2.4.8 non-GUI shutdown</strong></a>
+<a class="sectionlink" href="#shutdown" title="Link to here">¶</a></font>
+</td></tr>
+<tr><td>
+<blockquote>
+<p>
+
+Prior to version 2.5.1, JMeter invoked System.exit() when a non-GUI test completed.
+This caused problems for applications that invoke JMeter directly, so JMeter no longer invokes System.exit()
+for a normal test completion. [Some fatal errors may still invoke System.exit()]
+JMeter will exit all the non-daemon threads it starts, but it is possible that some non-daemon threads
+may still remain; these will prevent the JVM from exitting.
+To detect this situation, JMeter starts a new daemon thread just before it exits.
+This daemon thread waits a short while; if it returns from the wait, then clearly the
+JVM has not been able to exit, and the thread prints a message to say why.
+
+</p>
+<p>
+
+The property
+<code>
+jmeter.exit.check.pause
+</code>
+ can be used to override the default pause of 2000ms (2secs).
+If set to 0, then JMeter does not start the daemon thread.
+
+</p>
+</blockquote>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
</blockquote>
</p>
</td></tr>
@@ -1445,7 +1505,7 @@ See also the comments in the jmeter.prop
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/glossary.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/glossary.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/glossary.html (original)
+++ jmeter/trunk/docs/usermanual/glossary.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual: Glossary</title>
+<title>Apache JMeter - User's Manual: Glossary</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -251,7 +255,7 @@ Thread Name
as it appears in Listeners and logfiles
is derived from the Thread Group name and the thread within the group.
<br>
-</br>
+
The name has the format
@@ -306,7 +310,7 @@ Throughput
The time is calculated from the start of the first sample to the end of the last sample.
This includes any intervals between samples, as it is supposed to represent the load on the server.
<br>
-</br>
+
The formula is: Throughput = (number of requests) / (total time).
@@ -334,7 +338,7 @@ The formula is: Throughput = (number of
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/hints_and_tips.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/hints_and_tips.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/hints_and_tips.html (original)
+++ jmeter/trunk/docs/usermanual/hints_and_tips.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual: Hints and Tips</title>
+<title>Apache JMeter - User's Manual: Hints and Tips</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -150,7 +154,7 @@ style="border-width:0; float: left" fram
This section is a collection of various hints and tips that have been suggested by various questions on the JMeter User list.
If you don't find what you are looking for here, please check the
-<a href="http://wiki.apache.org/jakarta-jmeter">
+<a href="http://wiki.apache.org/jmeter">
JMeter Wiki
</a>
.
@@ -228,6 +232,53 @@ You can use these to determine the corre
</td></tr>
<tr><td><br></td></tr>
</table>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr><td bgcolor="#828DA6">
+<font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="searching"><strong>21.3 Searching</strong></a>
+<a class="sectionlink" href="#searching" title="Link to here">¶</a></font>
+</td></tr>
+<tr><td>
+<blockquote>
+<p>
+
+It is sometimes hard to find in a Test Plan tree and elements using a variable or containing a certain URL or parameter.
+A new feature is now available since 2.6, you can access it in Menu Search.
+It provides search with following options:
+
+<ul>
+
+
+<li>
+Case Sensitive : Makes search case sensitive
+</li>
+
+
+<li>
+Regexp : Is text to search a regexp, if so Regexp will be searched in Tree of components, example "\btest\b" will match any component that contains test in searchable elements of the component
+</li>
+
+
+</ul>
+
+
+</p>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='950' height='802' src="../images/screenshots/searching/raw-search.png"><br>
+<font size="-1">Figure 1 - Search raw text in TreeView
+</font></td></tr></table></p>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='336' height='153' src="../images/screenshots/searching/raw-search-result.png"><br>
+<font size="-1">Figure 2 - Result in TreeView
+</font></td></tr></table></p>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='336' height='153' src="../images/screenshots/searching/regexp-search.png"><br>
+<font size="-1">Figure 3 - Search Regexp in TreeView (in this example we search whole word)
+</font></td></tr></table></p>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='336' height='153' src="../images/screenshots/searching/regexp-search-result.png"><br>
+<font size="-1">Figure 4 - Result in TreeView
+</font></td></tr></table></p>
+</blockquote>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
</blockquote>
</p>
</td></tr>
@@ -254,7 +305,7 @@ You can use these to determine the corre
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/index.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/index.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/index.html (original)
+++ jmeter/trunk/docs/usermanual/index.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual</title>
+<title>Apache JMeter - User's Manual</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -1327,7 +1331,7 @@ Changes
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/intro.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/intro.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/intro.html (original)
+++ jmeter/trunk/docs/usermanual/intro.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual: Introduction</title>
+<title>Apache JMeter - User's Manual: Introduction</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -244,7 +248,7 @@ capabilities.
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/ldapanswer_xml.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapanswer_xml.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/ldapanswer_xml.html (original)
+++ jmeter/trunk/docs/usermanual/ldapanswer_xml.html Sat Jan 28 17:12:54 2012
@@ -32,7 +32,7 @@
<meta name="author" value="Dolf Smits">
<meta name="email" value="Dolf.Smits@Siemens.com">
-<title>JMeter - User's Manual: LDAP answer XML description</title>
+<title>Apache JMeter - User's Manual: LDAP answer XML description</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -45,10 +45,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -69,12 +69,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -83,15 +83,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -109,11 +113,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -155,7 +159,7 @@ style="border-width:0; float: left" fram
The global structure is as follows:
<br>
-</br>
+
@@ -400,7 +404,7 @@ This contains the attribute value as ret
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/ldapops_tutor.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapops_tutor.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/ldapops_tutor.html (original)
+++ jmeter/trunk/docs/usermanual/ldapops_tutor.html Sat Jan 28 17:12:54 2012
@@ -32,7 +32,7 @@
<meta name="author" value="Dolf Smits">
<meta name="email" value="Dolf.Smits@Siemens.com">
-<title>JMeter - JMeter - User's Manual: LDAP Operations</title>
+<title>Apache JMeter - JMeter - User's Manual: LDAP Operations</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -45,10 +45,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -69,12 +69,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -83,15 +83,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -109,11 +113,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -142,35 +146,35 @@ style="border-width:0; float: left" fram
In this short tutorial, I will explain which LDAP operations exist and what they do.
Per operation, I will shortly explain how these operations are implemented.
<br>
-</br>
+
LDAP servers are some kind of hierarchical database, they store objects (entries) in a tree. The uppermost part of a tree is called the ROOT of the tree.
<br>
-</br>
+
eg. When a tree starts with dc=com, the root equals dc=com.
<br>
-</br>
+
The next level can exist under the root, eg dc=Siemens. The full name of this object (the "distinghuised name") is "dc=siemens,dc=com.
<br>
-</br>
+
Again, a following level can be made, by adding the user "cn=admin" under dc=siemens,dc=com. This object has a DN (distinguished name) of "cn=admin,dc=siemens,dc=com".
<br>
-</br>
+
The relative distinguished name (RDN) is the last part of the DN, eg. cn=admin.
<br>
-</br>
+
The characteristics of an object are determined by the objectClasses, which can be seen as a collection of attributes.
<br>
-</br>
+
The type of an object is determined by the "structural objectClass" eg person, organizationalUnit or country.
<br>
-</br>
+
The attributes contain the data of an object, eg mailadress, name, streetadress etc. Each attribute can have 0, 1 or more values.
@@ -320,19 +324,19 @@ style="border-width:0; float: left" fram
This operation modifies one or more attributes from a given object.
It needs the distinghised name from the object, as well as the attributes and the new values for this attribute.
<br>
-</br>
+
Three versions are available, add, for adding an attribute value
<br>
-</br>
+
replace, for overwriting the old attribute value with a new value
<br>
-</br>
+
delete, to delete a value form an attribute, or to delete all the values of an attribute
<br>
-</br>
+
</p>
@@ -370,19 +374,19 @@ style="border-width:0; float: left" fram
This operation modifies the distinguished name from an object (it "moves" the object).
<br>
-</br>
+
It comes in two flavours, just renaming an entry, then you specify a new RDN (relative distinguished name, this is the lowest part of the DN)
<br>
-</br>
+
eg, you can rename "cn=admin,dc=siemens,dc=com" to cn=administrator,dc=Siemens,dc=com"
<br>
-</br>
+
The second flavour is renaming (moving) a complete subtree by specifying a "new superior"
<br>
-</br>
+
eg you can move a complete subtree "ou=retired,ou=people,dc=siemens,dc=com" to a new subtree "ou=retired people,dc=siemens,dc=com" by specifying
a new rdn "ou=retired people" and a new superior of "dc=siemens,dc=com"
@@ -405,7 +409,7 @@ style="border-width:0; float: left" fram
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/listeners.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/listeners.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/listeners.html (original)
+++ jmeter/trunk/docs/usermanual/listeners.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual: Listeners</title>
+<title>Apache JMeter - User's Manual: Listeners</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -334,6 +338,12 @@ The full set of properties that affect r
# Put the start time stamp in logs instead of the end
sampleresult.timestamp.start=true
+# Whether to use System.nanoTime() - otherwise only use System.currentTimeMillis()
+#sampleresult.useNanoTime=true
+
+# Use a background thread to calculate the nanoTime offset
+# Set this to <= 0 to disable the background thread
+#sampleresult.nanoThreadSleep=5000
# legitimate values: none, first, all
#jmeter.save.saveservice.assertion_results=none
@@ -427,7 +437,7 @@ CSV format cannot currently be used to s
</p>
<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="../images/screenshots/sample_result_config.png"><br>
<font size="-1"><br>
-</br>
+
<b>
Configuration dialogue
</b>
@@ -1115,7 +1125,7 @@ However, this can make the file rather l
that it is still valid XML. Also, images cannot be included.
<br>
-</br>
+
Another solution is to use the Post-Processor
<a href="../usermanual/component_reference.html#Save_Responses_to_a_file">Save_Responses_to_a_file</a>
@@ -1218,7 +1228,7 @@ e.g. a spreadsheet or text editor.
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/regular_expressions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/regular_expressions.html (original)
+++ jmeter/trunk/docs/usermanual/regular_expressions.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual: Regular Expressions</title>
+<title>Apache JMeter - User's Manual: Regular Expressions</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -163,7 +167,7 @@ Apache Jakarta ORO
<br>
-</br>
+
There is some documentation for this on the Jakarta web-site, for example
@@ -268,7 +272,7 @@ Extract single string
Suppose you want to match the following portion of a web-page:
<br>
-</br>
+
<code>
@@ -277,7 +281,7 @@ name="file" value="readme.txt">
<br>
-</br>
+
and you want to extract
<code>
@@ -286,12 +290,12 @@ readme.txt
.
<br>
-</br>
+
A suitable regular expression would be:
<br>
-</br>
+
<code>
@@ -353,7 +357,7 @@ until it found the last possible
Note: although the above expression works, it's more efficient to use the following expression:
<br>
-</br>
+
<code>
@@ -362,11 +366,11 @@ name="file" value="([^"]+)">
where
<br>
-</br>
+
[^"] - means match anything except "
<br>
-</br>
+
In this case, the matching engine can stop looking as soon as it sees the first
<code>
@@ -395,7 +399,7 @@ Extract multiple strings
Suppose you want to match the following portion of a web-page:
<br>
-</br>
+
<code>
@@ -413,12 +417,12 @@ readme.txt
.
<br>
-</br>
+
A suitable reqular expression would be:
<br>
-</br>
+
<code>
@@ -427,7 +431,7 @@ name="([^"]+)" value="([^"]+)"
<br>
-</br>
+
This would create 2 groups, which could be used in the JMeter Regular Expression Extractor template as $1$ and $2$.
@@ -803,7 +807,7 @@ without needing to access any external s
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/remote-test.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/remote-test.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jmeter/trunk/docs/usermanual/remote-test.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual: Remote (Distributed) Testing</title>
+<title>Apache JMeter - User's Manual: Remote (Distributed) Testing</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -330,7 +334,7 @@ The first example will start whatever se
the second example will define remote_hosts from the list of servers and then run the remote servers.
<br>
-</br>
+
The command-line client will exit when all the remote servers have stopped.
@@ -414,8 +418,21 @@ Steps 2 and 3 remain the same.
<p>
JMeter/RMI requires a connection from the client to the server. This will use the port you chose, default 1099.
+<br>
+
+
JMeter/RMI also requires a reverse connection in order to return sample results from the server to the client.
-This will use a high-numbered port.
+<br>
+
+
+This will use a high-numbered port.
+<br>
+
+
+This port can be controlled by jmeter property called client.rmi.localport in jmeter.properties.
+<br>
+
+
If there are any firewalls or other network filters between JMeter client and server,
you will need to make sure that they are set up to allow the connections through.
If necessary, use monitoring software to show what traffic is being generated.
@@ -473,6 +490,25 @@ The solution to the problem is to remove
<p>
Also create a policy file and add [computer_name][computer_domain] line to /etc/hosts.
</p>
+<p>
+In order to better support SSH-tunneling of the RMI communication channels used
+in remote testing, since JMeter 2.6:
+</p>
+<ul>
+
+
+<li>
+a new property "client.rmi.localport" can be set to control the RMI port used by the RemoteSampleListenerImpl
+</li>
+
+
+<li>
+To support tunneling RMI traffic over an SSH tunnel as the remote endpoint using a port on the local machine,
+ loopback interface is now allowed to be used if it has been specified directly using the Java System Property "java.rmi.server.hostname" parameter.
+</li>
+
+
+</ul>
</blockquote>
</td></tr>
<tr><td><br></td></tr>
@@ -576,6 +612,12 @@ Hold - hold samples in an array until th
<li>
+DiskStore - store samples in a disk file (under java.io.temp) until the end of a run.
+ The serialised data file is deleted on JVM exit.
+</li>
+
+
+<li>
Batch - send saved samples when either the count or time exceeds a threshold,
at which point the samples are sent synchronously.
The thresholds can be configured on the server using the following properties:
@@ -727,7 +769,7 @@ time_threshold - number of milliseconds
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/docs/usermanual/test_plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/test_plan.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/test_plan.html (original)
+++ jmeter/trunk/docs/usermanual/test_plan.html Sat Jan 28 17:12:54 2012
@@ -30,7 +30,7 @@
-<title>JMeter - User's Manual: Elements of a Test Plan</title>
+<title>Apache JMeter - User's Manual: Elements of a Test Plan</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
</td>
<td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jmeter.apache.org/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
</td>
</tr>
</table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
</li>
<li><a href="http://www.apache.org/licenses/">License</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
</li>
</ul>
<p><strong>Download</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
</li>
<li><a href="../nightly.html">Developer (Nightly) Builds</a>
</li>
@@ -81,15 +81,19 @@ style="border-width:0; float: left" fram
<ul>
<li><a href="../usermanual/index.html">User Manual</a>
</li>
+<li><a href="../usermanual/component_reference.html">Component Reference</a>
+</li>
+<li><a href="../usermanual/functions.html">Functions Reference</a>
+</li>
<li><a href="../api/index.html">Javadocs</a>
</li>
<li><a href="../localising/index.html">Localisation (Translator's Guide)</a>
</li>
<li><a href="../building.html">Building JMeter and Add-Ons</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
</li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
</li>
</ul>
<p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +111,11 @@ style="border-width:0; float: left" fram
</ul>
<p><strong>Community</strong></p>
<ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
</li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
</li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
</li>
</ul>
<p><strong>Foundation</strong></p>
@@ -1048,7 +1052,7 @@ Gettting Started - Configuring JMeter
for more details).
<br>
-</br>
+
Properties are global to jmeter, and are mostly used to define some of the defaults JMeter uses.
For example the property remote_hosts defines the servers that JMeter will try to run remotely.
@@ -1070,7 +1074,7 @@ variables
are local to each thread. The values may be the same for each thread, or they may be different.
<br>
-</br>
+
If a variable is updated by a thread, only the thread copy of the variable is changed.
For example the
@@ -1217,7 +1221,7 @@ jmeter ... -Jhost=www3.example.org -Jloo
</td></tr>
<tr><td colspan="2">
<div align="center"><font color="#525D76" size="-1"><em>
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-2012, Apache Software Foundation
</em></font></div>
</td></tr>
<tr><td colspan="2">
Modified: jmeter/trunk/xdocs/overview.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/overview.html?rev=1237098&r1=1237097&r2=1237098&view=diff
==============================================================================
--- jmeter/trunk/xdocs/overview.html (original)
+++ jmeter/trunk/xdocs/overview.html Sat Jan 28 17:12:54 2012
@@ -18,7 +18,7 @@
<!-- This file is copied into the Javadoc overview -->
<html>
<body>
-This is the documentation for Apache JMeter version 2.5.1 API.
-@version 2.5.1
+This is the documentation for Apache JMeter version 2.6-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT API.
+@version 2.6-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT
</body>
</html>
\ No newline at end of file