You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by mi...@apache.org on 2011/07/31 21:18:58 UTC

svn commit: r1152618 [4/4] - in /jakarta/jmeter/trunk: docs/ docs/css/ docs/localising/ docs/usermanual/ xdocs/

Modified: jakarta/jmeter/trunk/docs/usermanual/functions.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/functions.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/functions.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/functions.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -142,7 +142,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="functions"><strong>19. Functions and Variables</strong></a></font>
+<a name="functions"><strong>19. Functions and Variables</strong></a><a class="sectionlink" href="#functions" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -269,6 +269,23 @@ Information
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ <a href="#__samplerName">samplerName</a>
+</font>
+</td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+get the sampler name (label)
+</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>
@@ -727,7 +744,7 @@ Encode strings using HTML encoding
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="what_can_do"><strong>19.1 What can functions do</strong></a>
-</font>
+<a class="sectionlink" href="#what_can_do" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -775,7 +792,7 @@ Each occurrence of a function call in a 
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="where"><strong>19.2 Where can functions and variables be used?</strong></a>
-</font>
+<a class="sectionlink" href="#where" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -897,7 +914,7 @@ SELECT item from table where name=${VAR}
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="how"><strong>19.3 How to reference variables and functions</strong></a>
-</font>
+<a class="sectionlink" href="#how" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1015,7 +1032,7 @@ variable will override the built-in func
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="function_helper"><strong>19.4 The Function Helper Dialog</strong></a>
-</font>
+<a class="sectionlink" href="#function_helper" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1043,14 +1060,16 @@ for you to copy-paste into your test pla
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="functions"><strong>19.5 Functions</strong></a>
-</font>
+<a class="sectionlink" href="#functions" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__regexFunction">19.5.1 __regexFunction</h3></a>
+<h3>
+<a name="__regexFunction">19.5.1 __regexFunction</a>
+<a class="sectionlink" href="#__regexFunction" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1108,7 +1127,8 @@ ${refName_matchNr} to refer to the numbe
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__regexFunction_parms"/>
+<a class="sectionlink" href="#__regexFunction_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>First argument</td>
@@ -1218,7 +1238,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__counter">19.5.2 __counter</h3></a>
+<h3>
+<a name="__counter">19.5.2 __counter</a>
+<a class="sectionlink" href="#__counter" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1248,7 +1270,8 @@ The global counter - "FALSE" - is separa
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__counter_parms"/>
+<a class="sectionlink" href="#__counter_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>First argument</td>
@@ -1281,7 +1304,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__threadNum">19.5.3 __threadNum</h3></a>
+<h3>
+<a name="__threadNum">19.5.3 __threadNum</a>
+<a class="sectionlink" href="#__threadNum" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1314,7 +1339,9 @@ Nor does it make sense to use it on the 
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__intSum">19.5.4a __intSum</h3></a>
+<h3>
+<a name="__intSum">19.5.4a __intSum</a>
+<a class="sectionlink" href="#__intSum" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1340,7 +1367,8 @@ The reference name is now optional, but 
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__intSum_parms"/>
+<a class="sectionlink" href="#__intSum_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>First argument</td>
@@ -1386,7 +1414,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__longSum">19.5.4b __longSum</h3></a>
+<h3>
+<a name="__longSum">19.5.4b __longSum</a>
+<a class="sectionlink" href="#__longSum" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1396,7 +1426,8 @@ The longSum function can be used to comp
 </p>
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__longSum_parms"/>
+<a class="sectionlink" href="#__longSum_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>First argument</td>
@@ -1444,7 +1475,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__StringFromFile">19.5.5 __StringFromFile</h3></a>
+<h3>
+<a name="__StringFromFile">19.5.5 __StringFromFile</a>
+<a class="sectionlink" href="#__StringFromFile" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1492,7 +1525,8 @@ If an error occurs opening or reading th
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__StringFromFile_parms"/>
+<a class="sectionlink" href="#__StringFromFile_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>File Name</td>
@@ -1653,7 +1687,9 @@ not
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__machineName">19.5.6 __machineName</h3></a>
+<h3>
+<a name="__machineName">19.5.6 __machineName</a>
+<a class="sectionlink" href="#__machineName" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1662,7 +1698,8 @@ The machineName function returns the loc
 </p>
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__machineName_parms"/>
+<a class="sectionlink" href="#__machineName_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Variable Name</td>
@@ -1682,7 +1719,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__javaScript">19.5.7 __javaScript</h3></a>
+<h3>
+<a name="__javaScript">19.5.7 __javaScript</a>
+<a class="sectionlink" href="#__javaScript" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1791,7 +1830,8 @@ JMeter is not a browser, and does not in
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__javaScript_parms"/>
+<a class="sectionlink" href="#__javaScript_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Expression</td>
@@ -1865,7 +1905,9 @@ the comma after 7 is escaped.
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__Random">19.5.8 __Random</h3></a>
+<h3>
+<a name="__Random">19.5.8 __Random</a>
+<a class="sectionlink" href="#__Random" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1874,7 +1916,8 @@ The random function returns a random num
 </p>
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__Random_parms"/>
+<a class="sectionlink" href="#__Random_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Minimum value</td>
@@ -1910,7 +1953,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__CSVRead">19.5.8 __CSVRead</h3></a>
+<h3>
+<a name="__CSVRead">19.5.8 __CSVRead</a>
+<a class="sectionlink" href="#__CSVRead" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -1990,7 +2035,8 @@ All subsequent references to the same fi
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__CSVRead_parms"/>
+<a class="sectionlink" href="#__CSVRead_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>File Name</td>
@@ -2073,7 +2119,9 @@ StringFromFile
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__property">19.5.9 __property</h3></a>
+<h3>
+<a name="__property">19.5.9 __property</a>
+<a class="sectionlink" href="#__property" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2118,7 +2166,8 @@ ${__property(abcd,,atod)} - return value
 	
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__property_parms"/>
+<a class="sectionlink" href="#__property_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Property Name</td>
@@ -2154,7 +2203,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__P">19.5.10 __P</h3></a>
+<h3>
+<a name="__P">19.5.10 __P</a>
+<a class="sectionlink" href="#__P" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2216,7 +2267,8 @@ the second would return 1 and the last w
 	
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__P_parms"/>
+<a class="sectionlink" href="#__P_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Property Name</td>
@@ -2244,7 +2296,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__log">19.5.11 __log</h3></a>
+<h3>
+<a name="__log">19.5.11 __log</a>
+<a class="sectionlink" href="#__log" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2259,7 +2313,8 @@ No
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__log_parms"/>
+<a class="sectionlink" href="#__log_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>String to be logged</td>
@@ -2316,7 +2371,9 @@ For example:
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__logn">19.5.12 __logn</h3></a>
+<h3>
+<a name="__logn">19.5.12 __logn</a>
+<a class="sectionlink" href="#__logn" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2331,7 +2388,8 @@ For example:
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__logn_parms"/>
+<a class="sectionlink" href="#__logn_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>String to be logged</td>
@@ -2377,7 +2435,9 @@ For example:
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__BeanShell">19.5.13 __BeanShell</h3></a>
+<h3>
+<a name="__BeanShell">19.5.13 __BeanShell</a>
+<a class="sectionlink" href="#__BeanShell" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2484,7 +2544,8 @@ Other variables vary from invocation to 
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__BeanShell_parms"/>
+<a class="sectionlink" href="#__BeanShell_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>BeanShell script</td>
@@ -2533,7 +2594,9 @@ Remember to include any necessary quotes
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__split">19.5.14 __split</h3></a>
+<h3>
+<a name="__split">19.5.14 __split</a>
+<a class="sectionlink" href="#__split" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2568,7 +2631,7 @@ Remember to include any necessary quotes
 <br>
 </br>
 
-	${__split(${VAR},VAR),|}
+	${__split(${VAR},VAR,|)}
 	
 <br>
 </br>
@@ -2610,7 +2673,8 @@ Remember to include any necessary quotes
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__split_parms"/>
+<a class="sectionlink" href="#__split_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>String to split</td>
@@ -2664,7 +2728,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__XPath">19.5.15 __XPath</h3></a>
+<h3>
+<a name="__XPath">19.5.15 __XPath</a>
+<a class="sectionlink" href="#__XPath" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2717,7 +2783,8 @@ No
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__XPath_parms"/>
+<a class="sectionlink" href="#__XPath_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>XML file to parse</td>
@@ -2744,7 +2811,9 @@ Yes
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__setProperty">19.5.16 __setProperty</h3></a>
+<h3>
+<a name="__setProperty">19.5.16 __setProperty</a>
+<a class="sectionlink" href="#__setProperty" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2770,7 +2839,8 @@ Properties are global to JMeter,
 	
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__setProperty_parms"/>
+<a class="sectionlink" href="#__setProperty_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Property Name</td>
@@ -2805,7 +2875,9 @@ No
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__time">19.5.17 __time</h3></a>
+<h3>
+<a name="__time">19.5.17 __time</a>
+<a class="sectionlink" href="#__time" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2818,7 +2890,8 @@ The time function returns the current ti
 	
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__time_parms"/>
+<a class="sectionlink" href="#__time_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Format</td>
@@ -2888,7 +2961,9 @@ time.YMD=yyMMdd
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__jexl">19.5.18 __jexl</h3></a>
+<h3>
+<a name="__jexl">19.5.18 __jexl</a>
+<a class="sectionlink" href="#__jexl" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -2928,7 +3003,8 @@ JEXL examples
 	
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__jexl_parms"/>
+<a class="sectionlink" href="#__jexl_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Expression</td>
@@ -3045,7 +3121,9 @@ OUT - System.out - e.g. OUT.println("mes
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__V">19.5.19 __V</h3></a>
+<h3>
+<a name="__V">19.5.19 __V</a>
+<a class="sectionlink" href="#__V" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -3086,7 +3164,8 @@ ${__V(A${N})} - works OK. A${N} becomes 
 	
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__V_parms"/>
+<a class="sectionlink" href="#__V_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Variable name</td>
@@ -3107,7 +3186,9 @@ Yes
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__evalVar">19.5.20 __evalVar</h3></a>
+<h3>
+<a name="__evalVar">19.5.20 __evalVar</a>
+<a class="sectionlink" href="#__evalVar" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -3131,7 +3212,8 @@ The eval function returns the result of 
 	
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__evalVar_parms"/>
+<a class="sectionlink" href="#__evalVar_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Variable name</td>
@@ -3152,7 +3234,9 @@ Yes
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__eval">19.5.21 __eval</h3></a>
+<h3>
+<a name="__eval">19.5.21 __eval</a>
+<a class="sectionlink" href="#__eval" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -3209,7 +3293,8 @@ SQL=select ${column} from ${table} where
 	
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__eval_parms"/>
+<a class="sectionlink" href="#__eval_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Variable name</td>
@@ -3230,7 +3315,9 @@ Yes
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__char">19.5.22 __char</h3></a>
+<h3>
+<a name="__char">19.5.22 __char</a>
+<a class="sectionlink" href="#__char" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -3253,7 +3340,8 @@ Yes
     
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__char_parms"/>
+<a class="sectionlink" href="#__char_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>Unicode character number (decimal or 0xhex)</td>
@@ -3288,7 +3376,9 @@ ${__char(165)} = � (yen)
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__unescape">19.5.23 __unescape</h3></a>
+<h3>
+<a name="__unescape">19.5.23 __unescape</a>
+<a class="sectionlink" href="#__unescape" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -3310,7 +3400,8 @@ ${__char(165)} = � (yen)
     
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__unescape_parms"/>
+<a class="sectionlink" href="#__unescape_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>String to unescape</td>
@@ -3345,7 +3436,9 @@ ${__unescape(1\t2)} = 1[tab]2
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__unescapeHtml">19.5.24 __unescapeHtml</h3></a>
+<h3>
+<a name="__unescapeHtml">19.5.24 __unescapeHtml</a>
+<a class="sectionlink" href="#__unescapeHtml" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -3401,7 +3494,8 @@ e.g. 
     
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__unescapeHtml_parms"/>
+<a class="sectionlink" href="#__unescapeHtml_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>String to unescape</td>
@@ -3422,7 +3516,9 @@ Yes
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__escapeHtml">19.5.25 __escapeHtml</h3></a>
+<h3>
+<a name="__escapeHtml">19.5.25 __escapeHtml</a>
+<a class="sectionlink" href="#__escapeHtml" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -3462,7 +3558,8 @@ becomes:
     
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__escapeHtml_parms"/>
+<a class="sectionlink" href="#__escapeHtml_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>String to escape</td>
@@ -3483,7 +3580,9 @@ Yes
 <table border="0" cellspacing="0" cellpadding="2">
 <tr><td>
 <font face="arial,helvetica,sanserif">
-<h3><a name="__FileToString">19.5.26 __FileToString</h3></a>
+<h3>
+<a name="__FileToString">19.5.26 __FileToString</a>
+<a class="sectionlink" href="#__FileToString" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
 <tr><td>
@@ -3504,7 +3603,8 @@ If an error occurs opening or reading th
 
 <p>
 <b>Parameters</b>
-<table border="1" cellspacing="0" cellpadding="2">
+<a name="__FileToString_parms"/>
+<a class="sectionlink" href="#__FileToString_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
 <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
 <tr>
 <td>File Name</td>
@@ -3545,6 +3645,57 @@ The file name, encoding and reference na
 <tr><td><br></td></tr>
 </table>
 <hr>
+<table border="0" cellspacing="0" cellpadding="2">
+<tr><td>
+<font face="arial,helvetica,sanserif">
+<h3>
+<a name="__samplerName">19.5.27 __samplerName</a>
+<a class="sectionlink" href="#__samplerName" title="Link to here">&para;</a></h3>
+</font>
+</td></tr>
+<tr><td>
+
+    
+<p>
+
+    The samplerName function returns the name (i.e. label) of the current sampler.
+    
+</p>
+
+    
+<p>
+
+    The function does not work in Test elements that don't have an associated sampler.
+    For example the Test Plan. 
+    Configuration elements also don't have an associated sampler.
+    However some Configuration elements are referenced directly by samplers, such as the HTTP Header Manager
+    and Http Cookie Manager, and in this case the functions are resolved in the context of the Http Sampler.
+    Pre-Processors, Post-Processors and Assertions always have an associated Sampler.
+    
+</p>
+
+
+<p>
+<b>Parameters</b>
+<a name="__samplerName_parms"/>
+<a class="sectionlink" href="#__samplerName_parms" title="Link to here">&para;</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 - refName - for reusing the value created by this function. Stored values are of the form ${refName}.
+        
+</td>
+<td>
+No
+</td>
+</tr>
+</table>
+</p>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
+<hr>
 </blockquote>
 </td></tr>
 <tr><td><br></td></tr>
@@ -3553,7 +3704,7 @@ The file name, encoding and reference na
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="predefinedvars"><strong>19.6 Pre-defined Variables</strong></a>
-</font>
+<a class="sectionlink" href="#predefinedvars" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -3568,12 +3719,16 @@ However some variables are defined inter
 
 
 <li>
-cookiename - contains the cookie value
+COOKIE_cookiename - contains the cookie value (see 
+<a href="../usermanual/component_reference.html#HTTP_Cookie_Manager">HTTP Cookie Manager</a>
+)
 </li>
 
 
 <li>
-JMeterThread.last_sample_ok - whether or not the last sample was OK - true/false
+JMeterThread.last_sample_ok - whether or not the last sample was OK - true/false.
+Note: this is updated after PostProcessors and Assertions have been run.
+
 </li>
 
 
@@ -3591,7 +3746,7 @@ START variables (see next section)
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="predefinedprops"><strong>19.6 Pre-defined Properties</strong></a>
-</font>
+<a class="sectionlink" href="#predefinedprops" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -3667,7 +3822,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 &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -3710,3 +3865,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/get-started.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/get-started.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/get-started.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -142,7 +142,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="get_started"><strong>2. Getting Started</strong></a></font>
+<a name="get_started"><strong>2. Getting Started</strong></a><a class="sectionlink" href="#get_started" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -273,7 +273,7 @@ over your Test Plans.
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="requirements"><strong>2.1 Requirements</strong></a></font>
+<a name="requirements"><strong>2.1 Requirements</strong></a><a class="sectionlink" href="#requirements" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -284,7 +284,7 @@ JMeter requires your computing environme
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="java_versions"><strong>2.1.1 Java Version</strong></a>
-</font>
+<a class="sectionlink" href="#java_versions" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -307,7 +307,7 @@ JMeter because of JRE implementation iss
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="os"><strong>2.1.2 Operating Systems</strong></a>
-</font>
+<a class="sectionlink" href="#os" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -351,7 +351,7 @@ OpenVMS Alpha 7.3+
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="optional"><strong>2.2 Optional</strong></a></font>
+<a name="optional"><strong>2.2 Optional</strong></a><a class="sectionlink" href="#optional" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -362,7 +362,7 @@ If you plan on doing JMeter development,
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="opt_compiler"><strong>2.2.1 Java Compiler</strong></a>
-</font>
+<a class="sectionlink" href="#opt_compiler" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -377,7 +377,7 @@ If you want to build the JMeter source o
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="opt_sax"><strong>2.2.2 SAX XML Parser</strong></a>
-</font>
+<a class="sectionlink" href="#opt_sax" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -407,7 +407,7 @@ implementation.
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="opt_email"><strong>2.2.3 Email Support</strong></a>
-</font>
+<a class="sectionlink" href="#opt_email" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -425,7 +425,7 @@ It also has an SMTP sampler.
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="opt_ssl"><strong>2.2.4 SSL Encryption</strong></a>
-</font>
+<a class="sectionlink" href="#opt_ssl" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -485,7 +485,7 @@ The SMTP sampler can optionally use a lo
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="opt_jdbc"><strong>2.2.5 JDBC Driver</strong></a>
-</font>
+<a class="sectionlink" href="#opt_jdbc" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -506,7 +506,7 @@ Make sure the file is a jar file, not a 
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="opt_jms"><strong>2.2.6 JMS client</strong></a>
-</font>
+<a class="sectionlink" href="#opt_jms" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -529,7 +529,7 @@ JMeter Wiki
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="libraries_activemq"><strong>2.2.7 Libraries for ActiveMQ JMS</strong></a>
-</font>
+<a class="sectionlink" href="#libraries_activemq" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -581,7 +581,7 @@ JMeter Classpath
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="install"><strong>2.3 Installation</strong></a></font>
+<a name="install"><strong>2.3 Installation</strong></a><a class="sectionlink" href="#install" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -630,7 +630,7 @@ You can rename the parent directory (i.e
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="running"><strong>2.4 Running JMeter</strong></a></font>
+<a name="running"><strong>2.4 Running JMeter</strong></a><a class="sectionlink" href="#running" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -770,7 +770,7 @@ will override the HEAP settings in the s
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="classpath"><strong>2.4.1 JMeter's Classpath</strong></a>
-</font>
+<a class="sectionlink" href="#classpath" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -859,7 +859,7 @@ and the java command silently ignores th
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="proxy_server"><strong>2.4.2 Using a Proxy Server</strong></a>
-</font>
+<a class="sectionlink" href="#proxy_server" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -919,7 +919,7 @@ This is not to be confused with the prox
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="non_gui"><strong>2.4.3 Non-GUI Mode (Command Line mode)</strong></a>
-</font>
+<a class="sectionlink" href="#non_gui" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -969,7 +969,7 @@ Example
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="server"><strong>2.4.4 Server Mode</strong></a>
-</font>
+<a class="sectionlink" href="#server" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1023,7 +1023,7 @@ where:
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="override"><strong>2.4.5 Overriding Properties Via The Command Line</strong></a>
-</font>
+<a class="sectionlink" href="#override" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1087,7 +1087,7 @@ N.B.
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="logging"><strong>2.4.6 Logging and error messages</strong></a>
-</font>
+<a class="sectionlink" href="#logging" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1168,7 +1168,7 @@ The log file can be helpful in determini
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="options"><strong>2.4.7 Full list of command-line options</strong></a>
-</font>
+<a class="sectionlink" href="#options" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1251,7 +1251,7 @@ that was run in interactive mode.
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="configuring_jmeter"><strong>2.5 Configuring JMeter</strong></a></font>
+<a name="configuring_jmeter"><strong>2.5 Configuring JMeter</strong></a><a class="sectionlink" href="#configuring_jmeter" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1457,7 +1457,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 &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -1500,3 +1500,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/glossary.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/glossary.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/glossary.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/glossary.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -139,7 +139,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="glossary"><strong>22. Glossary</strong></a></font>
+<a name="glossary"><strong>22. Glossary</strong></a><a class="sectionlink" href="#glossary" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -333,7 +333,7 @@ The formula is: Throughput = (number of 
 </td></tr>
 <tr><td colspan="2">
 <div align="center"><font color="#525D76" size="-1"><em>
-Copyright &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -376,3 +376,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/hints_and_tips.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/hints_and_tips.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/hints_and_tips.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/hints_and_tips.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -142,7 +142,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="hints"><strong>21. Hints and Tips</strong></a></font>
+<a name="hints"><strong>21. Hints and Tips</strong></a><a class="sectionlink" href="#hints" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -161,7 +161,7 @@ Also, try search the JMeter User list; s
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="variable_and_threads"><strong>21.1 Passing variables between threads</strong></a>
-</font>
+<a class="sectionlink" href="#variable_and_threads" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -212,7 +212,7 @@ read it using CSV Dataset.
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="debug_logging"><strong>21.2 Enabling Debug logging</strong></a>
-</font>
+<a class="sectionlink" href="#debug_logging" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -254,7 +254,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 &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -297,3 +297,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/index.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/index.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/index.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/index.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -139,7 +139,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="index"><strong>User's Manual</strong></a></font>
+<a name="index"><strong>User's Manual</strong></a><a class="sectionlink" href="#index" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -152,7 +152,7 @@ Click on the section name to go straight
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="summary"><strong>Section Summary</strong></a>
-</font>
+<a class="sectionlink" href="#summary" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -428,7 +428,7 @@ Changes
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="details"><strong>Detailed Section List</strong></a>
-</font>
+<a class="sectionlink" href="#details" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1327,7 +1327,7 @@ Changes
 </td></tr>
 <tr><td colspan="2">
 <div align="center"><font color="#525D76" size="-1"><em>
-Copyright &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -1370,3 +1370,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/intro.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/intro.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/intro.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/intro.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -139,7 +139,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="intro"><strong>1. Introduction</strong></a></font>
+<a name="intro"><strong>1. Introduction</strong></a><a class="sectionlink" href="#intro" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -188,7 +188,7 @@ But please note that JMeter is not a bro
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="history"><strong>1.1 History</strong></a>
-</font>
+<a class="sectionlink" href="#history" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -207,7 +207,7 @@ and to add functional-testing capabiliti
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="future"><strong>1.2 The Future</strong></a>
-</font>
+<a class="sectionlink" href="#future" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -244,7 +244,7 @@ capabilities.
 </td></tr>
 <tr><td colspan="2">
 <div align="center"><font color="#525D76" size="-1"><em>
-Copyright &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -287,3 +287,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/jmeter_proxy_step_by_step.pdf
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/jmeter_proxy_step_by_step.pdf?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/docs/usermanual/ldapanswer_xml.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/ldapanswer_xml.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/ldapanswer_xml.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/ldapanswer_xml.html Sun Jul 31 19:18:54 2011
@@ -65,9 +65,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -131,7 +131,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="ldapans_xml"><strong>description of the ldapanswer XML definition</strong></a></font>
+<a name="ldapans_xml"><strong>description of the ldapanswer XML definition</strong></a><a class="sectionlink" href="#ldapans_xml" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -147,7 +147,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="overview"><strong>1 Global overview</strong></a>
-</font>
+<a class="sectionlink" href="#overview" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -179,7 +179,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="operation"><strong>1.1 The operation section</strong></a>
-</font>
+<a class="sectionlink" href="#operation" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -291,7 +291,7 @@ This will be used only in search request
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="response_message"><strong>1.2 Response message section</strong></a>
-</font>
+<a class="sectionlink" href="#response_message" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -314,7 +314,7 @@ The following tag is used:
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="response_code"><strong>1.3 Response code section</strong></a>
-</font>
+<a class="sectionlink" href="#response_code" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -339,7 +339,7 @@ The following tag is used:
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="search"><strong>1.4 Search Result section</strong></a>
-</font>
+<a class="sectionlink" href="#search" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -400,7 +400,7 @@ This contains the attribute value as ret
 </td></tr>
 <tr><td colspan="2">
 <div align="center"><font color="#525D76" size="-1"><em>
-Copyright &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -443,3 +443,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/ldapops_tutor.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/ldapops_tutor.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/ldapops_tutor.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/ldapops_tutor.html Sun Jul 31 19:18:54 2011
@@ -65,9 +65,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -131,7 +131,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="ops"><strong>A short LDAP Operations tutorial</strong></a></font>
+<a name="ops"><strong>A short LDAP Operations tutorial</strong></a><a class="sectionlink" href="#ops" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -179,7 +179,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="bind"><strong>1 Bind operation</strong></a>
-</font>
+<a class="sectionlink" href="#bind" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -194,7 +194,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="thread_bind"><strong>1.1 Thread Bind</strong></a>
-</font>
+<a class="sectionlink" href="#thread_bind" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -212,7 +212,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="single"><strong>1.2 Single bind/unbind</strong></a>
-</font>
+<a class="sectionlink" href="#single" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -236,7 +236,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="unbind"><strong>2 Unbind</strong></a>
-</font>
+<a class="sectionlink" href="#unbind" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -255,7 +255,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="compare"><strong>3 Compare</strong></a>
-</font>
+<a class="sectionlink" href="#compare" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -274,7 +274,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="search"><strong>4 Search</strong></a>
-</font>
+<a class="sectionlink" href="#search" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -293,7 +293,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="add"><strong>5 Add</strong></a>
-</font>
+<a class="sectionlink" href="#add" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -311,7 +311,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="modify"><strong>6 Modify</strong></a>
-</font>
+<a class="sectionlink" href="#modify" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -344,7 +344,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="delete"><strong>7 Delete</strong></a>
-</font>
+<a class="sectionlink" href="#delete" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -362,7 +362,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="moddn"><strong>8 modDN</strong></a>
-</font>
+<a class="sectionlink" href="#moddn" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -405,7 +405,7 @@ style="border-width:0; float: left" fram
 </td></tr>
 <tr><td colspan="2">
 <div align="center"><font color="#525D76" size="-1"><em>
-Copyright &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -448,3 +448,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/listeners.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/listeners.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/listeners.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/listeners.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -142,7 +142,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="intro"><strong>14. Introduction to listeners</strong></a></font>
+<a name="intro"><strong>14. Introduction to listeners</strong></a><a class="sectionlink" href="#intro" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -175,7 +175,11 @@ CSV files are much smaller than XML file
 </p>
 <p>
 
-
+The file name can be specified using either a relative or an absolute path name.
+Relative paths are resolved relative to the current working directory (which defaults to the bin/ directory).
+Versions of JMeter after 2.4 also support paths relative to the directory containing the current test plan (JMX file).
+If the path name begins with "~/" (or whatever is in the jmeter.save.saveservice.base_prefix JMeter property),
+then the path is assumed to be relative to the JMX file location. 
 
 </p>
 <p>
@@ -193,7 +197,7 @@ The same filename can be used by multipl
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="defaults"><strong>14.1 Default Configuration</strong></a></font>
+<a name="defaults"><strong>14.1 Default Configuration</strong></a><a class="sectionlink" href="#defaults" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -354,6 +358,9 @@ sampleresult.timestamp.start=true
 # Optional xml processing instruction for line 2 of the file:
 #jmeter.save.saveservice.xml_pi=&lt;?xml-stylesheet type="text/xsl" href="sample.xsl"?>
 
+# Prefix used to identify filenames that are relative to the current base
+#jmeter.save.saveservice.base_prefix=~/
+
 </pre>
 
 
@@ -362,7 +369,7 @@ sampleresult.timestamp.start=true
 <p>
 
 The date format to be used for the timestamp_format is described in 
-<a HREF="http://java.sun.com/j2se/1.5/docs/api/java/text/SimpleDateFormat.html">
+<a HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/text/SimpleDateFormat.html">
 
 
 <b>
@@ -378,7 +385,7 @@ in later for viewing purposes.
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="sample_variables"><strong>14.1.1 Sample Variables</strong></a>
-</font>
+<a class="sectionlink" href="#sample_variables" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -402,7 +409,7 @@ and as additional attributes in XML file
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="sample_configuration"><strong>14.1.2 Sample Result Save Configuration</strong></a>
-</font>
+<a class="sectionlink" href="#sample_configuration" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -442,7 +449,7 @@ Note that cookies, method and the query 
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="batch"><strong>14.2 non-GUI (batch) test runs</strong></a></font>
+<a name="batch"><strong>14.2 non-GUI (batch) test runs</strong></a><a class="sectionlink" href="#batch" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -498,7 +505,7 @@ This can be used to generate a unique na
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="resources"><strong>14.3 Resource usage</strong></a></font>
+<a name="resources"><strong>14.3 Resource usage</strong></a><a class="sectionlink" href="#resources" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -576,7 +583,7 @@ To minimise the amount of memory needed,
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="csvlogformat"><strong>14.4 CSV Log format</strong></a></font>
+<a name="csvlogformat"><strong>14.4 CSV Log format</strong></a><a class="sectionlink" href="#csvlogformat" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -704,7 +711,7 @@ Variables, if specified
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="xmlformat2.1"><strong>14.5 XML Log format 2.1</strong></a></font>
+<a name="xmlformat2.1"><strong>14.5 XML Log format 2.1</strong></a><a class="sectionlink" href="#xmlformat2.1" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -812,7 +819,7 @@ Note that the sample node name may be ei
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="xmlformat2.2"><strong>14.6 XML Log format 2.2</strong></a></font>
+<a name="xmlformat2.2"><strong>14.6 XML Log format 2.2</strong></a><a class="sectionlink" href="#xmlformat2.2" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -829,7 +836,7 @@ The format of the JTL files is identical
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="attributes"><strong>14.7 Sample Attributes</strong></a></font>
+<a name="attributes"><strong>14.7 Sample Attributes</strong></a><a class="sectionlink" href="#attributes" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1097,7 +1104,7 @@ Sample variables
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="saving"><strong>14.8 Saving response data</strong></a></font>
+<a name="saving"><strong>14.8 Saving response data</strong></a><a class="sectionlink" href="#saving" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1126,7 +1133,7 @@ The data will be retrieved from the file
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="loading"><strong>14.9 Loading (reading) response data</strong></a></font>
+<a name="loading"><strong>14.9 Loading (reading) response data</strong></a><a class="sectionlink" href="#loading" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1164,7 +1171,7 @@ use the menu item Run/Clear (Ctrl+Shift+
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="screencap"><strong>14.10 Saving Listener GUI data</strong></a></font>
+<a name="screencap"><strong>14.10 Saving Listener GUI data</strong></a><a class="sectionlink" href="#screencap" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1211,7 +1218,7 @@ e.g. a spreadsheet or text editor.
 </td></tr>
 <tr><td colspan="2">
 <div align="center"><font color="#525D76" size="-1"><em>
-Copyright &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -1254,3 +1261,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -142,7 +142,7 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="regex"><strong>20. Regular Expressions</strong></a></font>
+<a name="regex"><strong>20. Regular Expressions</strong></a><a class="sectionlink" href="#regex" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -150,7 +150,7 @@ style="border-width:0; float: left" fram
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="overview"><strong>20.1 Overview</strong></a>
-</font>
+<a class="sectionlink" href="#overview" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -256,7 +256,7 @@ Placement of modifiers
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="examples"><strong>20.2 Examples</strong></a>
-</font>
+<a class="sectionlink" href="#examples" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -520,7 +520,7 @@ These variables can be referred to later
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="line_mode"><strong>20.3 Line mode</strong></a>
-</font>
+<a class="sectionlink" href="#line_mode" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -567,7 +567,7 @@ and the '$' metacharacter matches at the
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="meta_chars"><strong>20.4 Meta characters</strong></a>
-</font>
+<a class="sectionlink" href="#meta_chars" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -626,6 +626,77 @@ Here is a list of the meta characters an
 Please note that ORO does not support the \Q and \E meta-characters.
 [In other RE engines, these can be used to quote a portion of an RE so that the meta-characters stand for themselves.]
 </p>
+<p>
+
+The following Perl5 extended regular expressions are supported by ORO.
+
+
+<dl>
+
+
+<dt>
+(?#text)
+</dt>
+
+
+<dd>
+An embedded comment causing text to be ignored.
+</dd>
+
+
+<dt>
+(?:regexp)
+</dt>
+
+
+<dd>
+Groups things like "()" but doesn't cause the group match to be saved.
+</dd>
+
+
+<dt>
+(?=regexp)
+</dt>
+
+
+<dd>
+A zero-width positive lookahead assertion. For example, \w+(?=\s) matches a word followed by whitespace, without including whitespace in the MatchResult.
+</dd>
+
+
+<dt>
+(?!regexp)
+</dt>
+
+
+<dd>
+A zero-width negative lookahead assertion. For example foo(?!bar) matches any occurrence of "foo" that isn't followed by "bar". Remember that this is a zero-width assertion, which means that a(?!b)d will match ad because a is followed by a character that is not b (the d) and a d follows the zero-width assertion.
+</dd>
+
+
+<dt>
+(?imsx)
+</dt>
+
+
+<dd>
+One or more embedded pattern-match modifiers. i enables case insensitivity, m enables multiline treatment of the input, s enables single line treatment of the input, and x enables extended whitespace comments.
+</dd>
+
+
+</dl>
+
+
+<b>
+Note that 
+<code>
+(?<=regexp)
+</code>
+ - lookbehind - is not supported.
+</b>
+
+
+</p>
 </blockquote>
 </td></tr>
 <tr><td><br></td></tr>
@@ -634,7 +705,7 @@ Please note that ORO does not support th
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="placement"><strong>20.5 Placement of modifiers</strong></a>
-</font>
+<a class="sectionlink" href="#placement" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -675,7 +746,7 @@ Match ExAct case or (?i)ArBiTrARY(?-i) c
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="testing_expressions"><strong>20.6 Testing Regular Expressions</strong></a></font>
+<a name="testing_expressions"><strong>20.6 Testing Regular Expressions</strong></a><a class="sectionlink" href="#testing_expressions" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -722,7 +793,7 @@ without needing to access any external s
 </td></tr>
 <tr><td colspan="2">
 <div align="center"><font color="#525D76" size="-1"><em>
-Copyright &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -765,3 +836,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/remote-test.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/remote-test.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/remote-test.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -339,7 +339,7 @@ The command-line client will exit when a
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="detail_instructions"><strong>15.1 Doing it Manually</strong></a>
-</font>
+<a class="sectionlink" href="#detail_instructions" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -407,7 +407,7 @@ Steps 2 and 3 remain the same.
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="tips"><strong>15.2 Tips</strong></a>
-</font>
+<a class="sectionlink" href="#tips" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -481,7 +481,7 @@ Also create a policy file and add [compu
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="portchange"><strong>15.3 Using a different port</strong></a>
-</font>
+<a class="sectionlink" href="#portchange" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -541,7 +541,7 @@ The chosen port will be logged in the se
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="batchmode"><strong>15.4 Using sample batching</strong></a>
-</font>
+<a class="sectionlink" href="#batchmode" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -687,7 +687,7 @@ time_threshold - number of milliseconds 
 </td></tr>
 <tr><td colspan="2">
 <div align="center"><font color="#525D76" size="-1"><em>
-Copyright &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -730,3 +730,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/docs/usermanual/test_plan.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/test_plan.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/test_plan.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/test_plan.html Sun Jul 31 19:18:54 2011
@@ -63,9 +63,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
-<li><a href="../known_bugs.html">Known Bugs</a>
+<li><a href="../issues.html">Issues</a>
 </li>
-<li><a href="../license.html">License</a>
+<li><a href="http://www.apache.org/licenses/">License</a>
 </li>
 <li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
 </li>
@@ -165,7 +165,7 @@ You can also use the Configuration butto
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="thread_group"><strong>4.1 ThreadGroup</strong></a>
-</font>
+<a class="sectionlink" href="#thread_group" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -246,7 +246,7 @@ Alternatively, one can use the relative 
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="controllers"><strong>4.2 Controllers</strong></a>
-</font>
+<a class="sectionlink" href="#controllers" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -286,7 +286,7 @@ Logical Controllers
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="samplers"><strong>4.2.1 Samplers</strong></a>
-</font>
+<a class="sectionlink" href="#samplers" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -380,7 +380,7 @@ JMeter's built-in samplers
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="logic_controller"><strong>4.2.2 Logic Controllers</strong></a>
-</font>
+<a class="sectionlink" href="#logic_controller" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -557,8 +557,38 @@ Logic Controllers
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="test_fragments"><strong>4.2.3 Test Fragments</strong></a>
+<a class="sectionlink" href="#test_fragments" title="Link to here">&para;</a></font>
+</td></tr>
+<tr><td>
+<blockquote>
+<p>
+The Test Fragment element is a special type of 
+<a href="#controllers">
+controller
+</a>
+ that
+exists on the Test Plan tree at the same level as the Thread Group element.  It is distinguished
+from a Thread Group in that it is not executed unless it is 
+referenced by either a 
+<a href="../usermanual/component_reference.html#Module_Controller">Module Controller</a>
+ or an 
+<a href="../usermanual/component_reference.html#Include_Controller">Include_Controller</a>
+.
+
+</p>
+<p>
+This element is purely for code re-use within Test Plans and was introduced in Version 2.5
+</p>
+</blockquote>
+</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="listeners"><strong>4.3 Listeners</strong></a>
-</font>
+<a class="sectionlink" href="#listeners" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -605,7 +635,7 @@ that come with JMeter.
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="timers"><strong>4.4 Timers</strong></a>
-</font>
+<a class="sectionlink" href="#timers" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -649,7 +679,7 @@ To provide a pause at a single place in 
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="assertions"><strong>4.5 Assertions</strong></a>
-</font>
+<a class="sectionlink" href="#assertions" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -694,7 +724,7 @@ and will count towards the error %age fo
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="config_elements"><strong>4.6 Configuration Elements</strong></a>
-</font>
+<a class="sectionlink" href="#config_elements" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -740,7 +770,7 @@ For simplicity, it is suggested that the
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="preprocessors"><strong>4.7 Pre-Processor Elements</strong></a>
-</font>
+<a class="sectionlink" href="#preprocessors" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -764,7 +794,7 @@ scoping rules
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="postprocessors"><strong>4.8 Post-Processor Elements</strong></a>
-</font>
+<a class="sectionlink" href="#postprocessors" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -788,7 +818,7 @@ scoping rules
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="executionorder"><strong>4.9 Execution order</strong></a>
-</font>
+<a class="sectionlink" href="#executionorder" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -934,7 +964,7 @@ Assertion 1
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="scoping_rules"><strong>4.10 Scoping Rules</strong></a>
-</font>
+<a class="sectionlink" href="#scoping_rules" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1001,7 +1031,7 @@ which
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="properties"><strong>4.11 Properties and Variables</strong></a>
-</font>
+<a class="sectionlink" href="#properties" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1098,7 +1128,7 @@ These are global to the test plan, so ca
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="using_variables"><strong>4.12 Using Variables to parameterise tests</strong></a>
-</font>
+<a class="sectionlink" href="#using_variables" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -1187,7 +1217,7 @@ jmeter ... -Jhost=www3.example.org -Jloo
 </td></tr>
 <tr><td colspan="2">
 <div align="center"><font color="#525D76" size="-1"><em>
-Copyright &copy; 1999-2010, Apache Software Foundation
+Copyright &copy; 1999-2011, Apache Software Foundation
 </em></font></div>
 </td></tr>
 <tr><td colspan="2">
@@ -1230,3 +1260,4 @@ trademarks of the Apache Software Founda
 
 
 
+

Modified: jakarta/jmeter/trunk/xdocs/overview.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/overview.html?rev=1152618&r1=1152617&r2=1152618&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/overview.html (original)
+++ jakarta/jmeter/trunk/xdocs/overview.html Sun Jul 31 19:18:54 2011
@@ -18,7 +18,7 @@
 <!-- This file is copied into the Javadoc overview -->
 <html>
 <body>
-This is the documentation for Apache JMeter version 2.4 API.
-@version 2.4
+This is the documentation for Apache JMeter version 2.5 API.
+@version 2.5
 </body>
 </html>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org