jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1340502 [2/2] - in /jmeter/trunk/docs: ./ localising/ usermanual/
Date Sat, 19 May 2012 15:32:56 GMT
Modified: jmeter/trunk/docs/usermanual/build-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/build-test-plan.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/build-test-plan.html (original)
+++ jmeter/trunk/docs/usermanual/build-test-plan.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

Modified: jmeter/trunk/docs/usermanual/build-web-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/build-web-test-plan.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/build-web-test-plan.html (original)
+++ jmeter/trunk/docs/usermanual/build-web-test-plan.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
@@ -262,7 +264,7 @@ leave the Control Panel (for example, wh
 <p>
 See Figure 5.2 for the completed JMeter Users Thread Group.
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='791' height='358' src="../images/screenshots/webtest/threadgroup2.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1040' height='335' src="../images/screenshots/webtest/threadgroup2.png"><br>
 <font size="-1">
 Figure 5.2. JMeter Users Thread Group
 </font></td></tr></table></p>
@@ -290,7 +292,7 @@ to get the Add menu, and then select Add
 Defaults. Then, select this new element to view its Control Panel (see Figure 5.3).
 
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1077' height='767' src="../images/screenshots/webtest/http-defaults1.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1037' height='511' src="../images/screenshots/webtest/http-defaults1.png"><br>
 <font size="-1">
 Figure 5.3. HTTP Request Defaults
 </font></td></tr></table></p>
@@ -320,7 +322,7 @@ HTTP Request elements use.
 <p>
 See Figure 5.4 for the completed HTTP Request Defaults element
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1077' height='767' src="../images/screenshots/webtest/http-defaults2.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1036' height='513' src="../images/screenshots/webtest/http-defaults2.png"><br>
 <font size="-1">
 Figure 5.4. HTTP Defaults for our Test Plan
 </font></td></tr></table></p>
@@ -413,7 +415,7 @@ element.
 
 
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1077' height='767' src="../images/screenshots/webtest/http-request1.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1164' height='677' src="../images/screenshots/webtest/http-request1.png"><br>
 <font size="-1">
 Figure 5.5. HTTP Request for JMeter Home Page
 </font></td></tr></table></p>
@@ -438,7 +440,7 @@ Set the Path field to "/changes.html".
 
 
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1077' height='767' src="../images/screenshots/webtest/http-request2.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1164' height='676' src="../images/screenshots/webtest/http-request2.png"><br>
 <font size="-1">
 Figure 5.6. HTTP Request for JMeter Changes Page
 </font></td></tr></table></p>

Modified: jmeter/trunk/docs/usermanual/build-ws-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/build-ws-test-plan.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/build-ws-test-plan.html (original)
+++ jmeter/trunk/docs/usermanual/build-ws-test-plan.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

Modified: jmeter/trunk/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/component_reference.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jmeter/trunk/docs/usermanual/component_reference.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
@@ -169,6 +171,7 @@ style="border-width:0; float: left" fram
 <li><a href="#Mail_Reader_Sampler">Mail Reader Sampler</a></li>
 <li><a href="#Test_Action">Test Action</a></li>
 <li><a href="#SMTP_Sampler">SMTP Sampler</a></li>
+<li><a href="#OS_Process_Sampler">OS Process Sampler</a></li>
 </ul>
 <li><a href="#logic_controllers">18.2 Logic Controllers</a></li>
 <ul>
@@ -192,7 +195,6 @@ style="border-width:0; float: left" fram
 <li><a href="#listeners">18.3 Listeners</a></li>
 <ul>
 <li><a href="#Sample_Result_Save_Configuration">Sample Result Save Configuration</a></li>
-<li><a href="#Graph_Full_Results">Graph Full Results</a></li>
 <li><a href="#Graph_Results">Graph Results</a></li>
 <li><a href="#Spline_Visualizer">Spline Visualizer</a></li>
 <li><a href="#Assertion_Results">Assertion Results</a></li>
@@ -297,15 +299,6 @@ style="border-width:0; float: left" fram
 <li><a href="#setUp_Thread_Group">setUp Thread Group</a></li>
 <li><a href="#tearDown_Thread_Group">tearDown Thread Group</a></li>
 </ul>
-<li><a href="#Reports">18.10 Reports</a></li>
-<ul>
-<li><a href="#Report_Plan">Report Plan</a></li>
-<li><a href="#Report_Table">Report Table</a></li>
-<li><a href="#HTML_Report_Writer">HTML Report Writer</a></li>
-<li><a href="#Report_Page">Report Page</a></li>
-<li><a href="#Line_Graph">Line Graph</a></li>
-<li><a href="#Bar_Chart">Bar Chart</a></li>
-</ul>
 </ul>
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
@@ -394,7 +387,7 @@ Latency is set to the time it takes to l
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='499' height='292' src="../images/screenshots/ftptest/ftp-request.png"></div>
+<div align="center"><img width='519' height='289' src="../images/screenshots/ftptest/ftp-request.png"></div>
 <p>
 <b>Parameters</b>
 <a name="FTP_Request_parms"/>
@@ -1369,6 +1362,24 @@ sampleresult.getbytes.headers_size=true
 </ul>
 
 
+
+<p>
+<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
+<tr><td>
+The Java and HttpClient3 inplementations do not include transport overhead such as
+chunk headers in the response body size.
+<br>
+
+
+The HttpClient4 implementation does include the overhead in the response body size,
+so the value may be greater than the number of bytes in the response content.
+
+</td></tr>
+</table>
+</p>
+
+
+
 <p>
 <table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
 <tr><td>Versions of JMeter before 2.5 returns only data response size (uncompressed if request uses gzip/defate mode).
@@ -1486,6 +1497,17 @@ the additional variables for rows 4, 5 a
 </p>
 
 
+<p>
+
+
+<b>
+Note:
+</b>
+ The latency time is set from the time it took to acquire a connection.
+
+</p>
+
+
 <p><b>Control Panel</b></p>
 <div align="center"><img width='466' height='334' src="../images/screenshots/jdbctest/jdbc-request.png"></div>
 <p>
@@ -1683,7 +1705,10 @@ Yes, if a prepared or callable statement
 </tr>
 <tr>
 <td>Variable Names</td>
-<td>Comma-separated list of variable names to hold values returned by Select statements
+<td>Comma-separated list of variable names to hold values returned by Select statements, Prepared Select Statements or CallableStatement. 
+        Note that when used with CallableStatement, list of variables must be in the same sequence as the OUT parameters returned by the call.
+        If there are less variable names than OUT parameters only as many results shall be stored in the thread-context variables as variable names were supplied. 
+        If more variable names than OUT parameters exist, the additional variables will be ignored
 </td>
 <td>
 No
@@ -1769,7 +1794,7 @@ The fields allow variables to be used, s
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='406' height='307' src="../images/screenshots/java_request.png"></div>
+<div align="center"><img width='563' height='347' src="../images/screenshots/java_request.png"></div>
 <p>
 <table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
 <tr><td>The Add/Delete buttons don't serve any purpose at present.
@@ -3107,7 +3132,7 @@ StandardGenerator and TCLogParser.
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='582' height='301' src="../images/screenshots/accesslogsampler.png"></div>
+<div align="center"><img width='613' height='318' src="../images/screenshots/accesslogsampler.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Access_Log_Sampler_parms"/>
@@ -3234,7 +3259,7 @@ The interrupt() method can be defined in
 
 	
 <p><b>Control Panel</b></p>
-<div align="center"><img width='592' height='303' src="../images/screenshots/beanshellsampler.png"></div>
+<div align="center"><img width='1034' height='505' src="../images/screenshots/beanshellsampler.png"></div>
 <p>
 <b>Parameters</b>
 <a name="BeanShell_Sampler_parms"/>
@@ -3395,12 +3420,16 @@ ctx - JMeterContext
 
 			
 <li>
-vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3"); vars.putObject("OBJ1",new Object());
+vars - 
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3"); vars.putObject("OBJ1",new Object());
 </li>
 
             
 <li>
-props - JMeterProperties - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - JMeterProperties (class java.util.Properties)- e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 		
@@ -3652,12 +3681,16 @@ ctx - JMeterContext
 
 
 <li>
-vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3"); vars.putObject("OBJ1",new Object());
+vars - 
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3"); vars.putObject("OBJ1",new Object());
 </li>
 
 
 <li>
-props - JMeterProperties - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - JMeterProperties  (class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -3863,6 +3896,11 @@ TCPClientImpl
 tcp.eolByte
 </b>
 , otherwise until the end of the input stream.
+        You can control charset encoding by setting 
+<b>
+tcp.charset
+</b>
+, which will default to Platform default encoding.
         
 </p>
 
@@ -4107,7 +4145,7 @@ No
 
 	
 <p><b>Control Panel</b></p>
-<div align="center"><img width='636' height='628' src="../images/screenshots/jmspublisher.png"></div>
+<div align="center"><img width='802' height='735' src="../images/screenshots/jmspublisher.png"></div>
 <p>
 <b>Parameters</b>
 <a name="JMS_Publisher_parms"/>
@@ -4213,6 +4251,28 @@ Yes
 Yes
 </td>
 </tr>
+<tr>
+<td>Use non-persistent delivery mode?</td>
+<td>
+      Whether to set DeliveryMode.NON_PERSISTENT (defaults to false)
+  
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>JMS Properties</td>
+<td>
+      The JMS Properties are properties specific for the underlying messaging system.
+      For example: for WebSphere 5.1 web services you will need to set the JMS Property targetService to test
+      webservices through JMS.
+  
+</td>
+<td>
+No
+</td>
+</tr>
 </table>
 </p>
 <p>
@@ -4258,10 +4318,38 @@ This is a very simple implementation; it
 <p>
 
 
-<b>
-Note: 
-</b>
- the Object message type is not implemented yet.
+<p>
+<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
+<tr><td> 
+The Object message is implemented since 2.7 and works as follow:
+
+<ul>
+
+
+<li>
+Put the JAR that contain you object and its dependencies in jmeter_home/lib/ folder 
+</li>
+
+
+<li>
+Serialize your object as XML using XStream
+</li>
+
+
+<li>
+Either put result in a file suffixed with .txt or .obj or put XML content direclty in Text Area
+</li>
+  
+
+</ul>
+
+Note that if message is in an file, replacement of properties will not occur while it will happen if you use Text Area.
+
+</td></tr>
+</table>
+</p>
+
+
 
 </p>
 <p>
@@ -5434,7 +5522,7 @@ jmeterengine.threadstop.wait
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='330' height='158' src="../images/screenshots/test_action.png"></div>
+<div align="center"><img width='467' height='184' src="../images/screenshots/test_action.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Test_Action_parms"/>
@@ -5767,6 +5855,139 @@ 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="OS_Process_Sampler">18.1.20 OS Process Sampler</a>
+<a class="sectionlink" href="#OS_Process_Sampler" title="Link to here">&para;</a></h3>
+</font>
+</td></tr>
+<tr><td>
+
+
+<p>
+
+The OS Process Sampler is a sampler that can be used to execute commands on the local machine.
+<br>
+
+
+It should allow execution of any command that can be run from the command line.
+<br>
+
+
+Validation of the return code can be enabled, and the expected return code can be specified.
+<br>
+
+
+
+</p>
+
+
+<p>
+
+Note that OS shells generally provide command-line parsing. 
+This varies between OSes, but generally the shell will split parameters on white-space.
+Some shells expand wild-card file names; some don't.
+The quoting mechanism also varies between OSes.
+The sampler deliberately does not do any parsing or quote handling.
+The command and its parameters must be provided in the form expected by the executable.
+This means that the sampler settings will not be portable between OSes.
+
+</p>
+
+
+<p>
+
+Many OSes have some built-in commands which are not provided as separate executables. 
+For example the Windows DIR command is part of the command interpreter (CMD.EXE).
+These built-ins cannot be run as independent programs, but have to be provided as arguments to the appropriate command interpreter.
+
+<br>
+
+
+For example, the Windows command-line: 
+<b>
+<code>
+DIR C:\TEMP
+</code>
+</b>
+ needs to be specified as follows:
+
+<pre>
+
+command:   CMD
+Param 1:   /C
+Param 2:   DIR
+Param 3:   C:\TEMP
+
+</pre>
+
+
+</p>
+
+
+<p><b>Control Panel</b></p>
+<div align="center"><img width='656' height='465' src="../images/screenshots/os_process_sampler.png"></div>
+<p>
+<b>Parameters</b>
+<a name="OS_Process_Sampler_parms"/>
+<a class="sectionlink" href="#OS_Process_Sampler_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>Check Return Code</td>
+<td>If checked, sampler will compare return code with Expected Return Code.
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>Expected Return Code</td>
+<td>Expected return code for System Call, required if "Check Return Code" is checked.
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>Directory</td>
+<td>Directory from which command will be executed, defaults to folder referenced by "user.dir" System property
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>Command</td>
+<td>The System command or shell to execute.
+</td>
+<td>
+Yes
+</td>
+</tr>
+<tr>
+<td>OS Process Parameters</td>
+<td>Parameters passed to process.
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>Environment Parameters</td>
+<td>Key/Value pairs added to environment when running command.
+</td>
+<td>
+No
+</td>
+</tr>
+</table>
+</p>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
+<hr>
 <a href="#">
 ^
 </a>
@@ -7258,6 +7479,16 @@ the contents are used to prefix the path
 
 
 <p>
+<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
+<tr><td>
+When using IncludeController and including the same JMX file, ensure you name the IncludeController differently to avoid facing known issue 50898.
+
+</td></tr>
+</table>
+</p>
+
+
+<p>
 
 If the file cannot be found at the location given by prefix+filename, then the controller
 attempts to open the fileName relative to the JMX launch directory (versions of JMeter after 2.3.4).
@@ -7301,8 +7532,8 @@ Yes
 
 	    The Transaction Controller generates an additional
 	    sample which measures the overall time taken to perform the nested test elements.
-	    Note that this time includes all processing within the controller scope, not just
-	    the samples.
+	    Note that this time by default includes all processing within the controller scope, not just
+	    the samples, this can be changed by unchecking "Include duration of timer and pre-post processors in generated sample".
 	    
 </p>
 
@@ -7705,7 +7936,7 @@ by using the -l command-line flag.
 
 	The figure below shows an example of the result file configuration panel
 
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='786' height='145' src="../images/screenshots/simpledatawriter.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='741' height='141' src="../images/screenshots/simpledatawriter.png"><br>
 <font size="-1">Result file configuration panel
 </font></td></tr></table></p>
 
@@ -7811,22 +8042,6 @@ Note that cookies, method and the query 
 <tr><td>
 <font face="arial,helvetica,sanserif">
 <h3>
-<a name="Graph_Full_Results">18.3.2 Graph Full Results</a>
-<a class="sectionlink" href="#Graph_Full_Results" title="Link to here">&para;</a></h3>
-</font>
-</td></tr>
-<tr><td>
-No Description
-<p><b>Control Panel</b></p>
-<div align="center"><img width='672' height='316' src="../images/screenshots/graphfullresults.png"></div>
-</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="Graph_Results">18.3.3 Graph Results</a>
 <a class="sectionlink" href="#Graph_Results" title="Link to here">&para;</a></h3>
 </font>
@@ -8510,7 +8725,7 @@ The aggregate graph is similar to the ag
 difference is the aggregate graph provides an easy way to generate bar graphs and save
 the graph as a PNG file.
 <p><b>Control Panel</b></p>
-<div align="center"><img width='905' height='657' src="../images/screenshots/aggregate_graph.png"></div>
+<div align="center"><img width='914' height='684' src="../images/screenshots/aggregate_graph.png"></div>
 <div align="center">
 
 
@@ -8518,7 +8733,7 @@ the graph as a PNG file.
 
     The figure below shows an example of settings to draw this graph.
 
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='903' height='653' src="../images/screenshots/aggregate_graph_settings.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='913' height='443' src="../images/screenshots/aggregate_graph_settings.png"><br>
 <font size="-1">Aggregate graph settings
 </font></td></tr></table></p>
 
@@ -8545,7 +8760,7 @@ The mailer visualizer can be set up to s
 failed responses from the server.
 </p>
 <p><b>Control Panel</b></p>
-<div align="center"><img width='645' height='345' src="../images/screenshots/mailervisualizer.png"></div>
+<div align="center"><img width='860' height='463' src="../images/screenshots/mailervisualizer.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Mailer_Visualizer_parms"/>
@@ -8576,25 +8791,30 @@ Yes
 </td>
 </tr>
 <tr>
-<td>SMTP Host</td>
-<td>IP address or host name of SMTP (email redirector)
-        server.
+<td>Success Subject</td>
+<td>Email subject line for success messages.
 </td>
 <td>
 No
 </td>
 </tr>
 <tr>
-<td>Failure Subject</td>
-<td>Email subject line for fail messages.
+<td>Success Limit</td>
+<td>Once this number of successful responses is exceeded
+        
+<strong>
+after previously reaching the failure limit
+</strong>
+, a success email
+        is sent.  The mailer will thus only send out messages in a sequence of failed-succeeded-failed-succeeded, etc.
 </td>
 <td>
-No
+Yes
 </td>
 </tr>
 <tr>
-<td>Success Subject</td>
-<td>Email subject line for success messages.
+<td>Failure Subject</td>
+<td>Email subject line for fail messages.
 </td>
 <td>
 No
@@ -8610,17 +8830,44 @@ Yes
 </td>
 </tr>
 <tr>
-<td>Success Limit</td>
-<td>Once this number of successful responses is exceeded
-        
-<strong>
-after previously reaching the failure limit
-</strong>
-, a success email
-        is sent.  The mailer will thus only send out messages in a sequence of failed-succeeded-failed-succeeded, etc.
+<td>Host</td>
+<td>IP address or host name of SMTP server (email redirector)
+        server.
 </td>
 <td>
-Yes
+No
+</td>
+</tr>
+<tr>
+<td>Port</td>
+<td>Port of SMTP server (defaults to 25).
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>Login</td>
+<td>Login used to authenticate.
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>Password</td>
+<td>Password used to authenticate.
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>Connection security</td>
+<td>Type of encryption for SMTP authentication (SSL, TLS or none).
+</td>
+<td>
+No
 </td>
 </tr>
 <tr>
@@ -8779,12 +9026,16 @@ ctx - (JMeterContext) - gives access to 
 
 
 <li>
-vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
+vars - (
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
 </li>
 
 
 <li>
-props - (JMeterProperties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - (JMeterProperties - class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -9186,12 +9437,16 @@ ctx - (JMeterContext) - gives access to 
 
 
 <li>
-vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object()); vars.getObject("OBJ2");
+vars - (
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object()); vars.getObject("OBJ2");
 </li>
 
 
 <li>
-props - (JMeterProperties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - (JMeterProperties - class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -9438,8 +9693,20 @@ Yes
     
 <p>
 
-	Versions of JMeter after 2.3.1 allow variables to be quoted; this allows the value to contain a delimiter.
+	Versions of JMeter after 2.3.1 allow values to be quoted; this allows the value to contain a delimiter.
 	Previously it was necessary to choose a delimiter that was not used in any values.
+    If "allow quoted data" is enabled, a value may be enclosed in double-quotes.
+    These are removed. To include double-quotes within a quoted field, use two double-quotes.
+    For example:
+<pre>
+
+1,"2,3","4""5" =>
+1
+2,3
+4"5
+
+</pre>
+
 	
 </p>
 
@@ -9532,7 +9799,7 @@ csvdataset.eofstring
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='396' height='301' src="../images/screenshots/csvdatasetconfig.png"></div>
+<div align="center"><img width='433' height='281' src="../images/screenshots/csvdatasetconfig.png"></div>
 <p>
 <b>Parameters</b>
 <a name="CSV_Data_Set_Config_parms"/>
@@ -9598,6 +9865,12 @@ Yes
 <tr>
 <td>Allow quoted data?</td>
 <td>Should the CSV file allow values to be quoted?
+  If enabled, then values can be enclosed in 
+<code>
+"
+</code>
+ - double-quote - allowing values to contain a delimeter.
+  
 </td>
 <td>
 Yes
@@ -9674,7 +9947,7 @@ Yes
 </td></tr>
 <tr><td>
 <p><b>Control Panel</b></p>
-<div align="center"><img width='490' height='198' src="../images/screenshots/ftp-config/ftp-request-defaults.png"></div>
+<div align="center"><img width='520' height='202' src="../images/screenshots/ftp-config/ftp-request-defaults.png"></div>
 </td></tr>
 <tr><td><br></td></tr>
 </table>
@@ -9750,7 +10023,7 @@ These can be set up using a 
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='490' height='253' src="../images/screenshots/http-config/http-auth-manager.png"></div>
+<div align="center"><img width='439' height='238' src="../images/screenshots/http-config/http-auth-manager.png"></div>
 <p>
 <b>Parameters</b>
 <a name="HTTP_Authorization_Manager_parms"/>
@@ -9883,7 +10156,7 @@ to "/secret/index.html" and "/secret/ind
 </font></td></tr></table></p>
 
 
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='553' height='253' src="../images/screenshots/http-config/auth-manager-example1b.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='539' height='241' src="../images/screenshots/http-config/auth-manager-example1b.png"><br>
 <font size="-1">Figure 11 - Authorization Manager Control Panel
 </font></td></tr></table></p>
 
@@ -10097,7 +10370,7 @@ Note also that the cookie name must be u
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='445' height='328' src="../images/screenshots/http-config/http-cookie-manager.png"></div>
+<div align="center"><img width='506' height='329' src="../images/screenshots/http-config/http-cookie-manager.png"></div>
 <p>
 <b>Parameters</b>
 <a name="HTTP_Cookie_Manager_parms"/>
@@ -10949,6 +11222,30 @@ Yes
 </tr>
 </table>
 </p>
+<p>
+<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
+<tr><td>
+To make JMeter use more than one certificate you need to ensure that:
+
+<ul>
+
+
+<li>
+https.use.cached.ssl.context=false is set in jmeter.properties or user.properties
+</li>
+
+
+<li>
+You use either HTTPClient 3.1 or 4 implementations for HTTP Request
+</li>
+
+
+</ul>
+
+
+</td></tr>
+</table>
+</p>
 </td></tr>
 <tr><td><br></td></tr>
 </table>
@@ -12356,12 +12653,16 @@ ctx - JMeterContext
 
 	
 <li>
-vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.putObject("OBJ1",new Object());
+vars - 
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.putObject("OBJ1",new Object());
 </li>
 
     
 <li>
-props - JMeterProperties - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - JMeterProperties (class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -12864,12 +13165,16 @@ ctx - (JMeterContext) - gives access to 
 
 
 <li>
-vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object()); vars.getObject("OBJ2");
+vars - (
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object()); vars.getObject("OBJ2");
 </li>
 
 
 <li>
-props - (JMeterProperties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - (JMeterProperties - class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -13629,12 +13934,16 @@ ctx - (JMeterContext) - gives access to 
 
 
 <li>
-vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
+vars - (
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
 </li>
 
 
 <li>
-props - (JMeterProperties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - (JMeterProperties - class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -13767,12 +14076,16 @@ ctx - (JMeterContext) - gives access to 
 
 
 <li>
-vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
+vars - (
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
 </li>
 
 
 <li>
-props - (JMeterProperties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - (JMeterProperties - class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -14350,7 +14663,7 @@ See the file BeanShellListeners.bshrc fo
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='597' height='303' src="../images/screenshots/beanshell_preprocessor.png"></div>
+<div align="center"><img width='568' height='325' src="../images/screenshots/beanshell_preprocessor.png"></div>
 <p>
 <b>Parameters</b>
 <a name="BeanShell_PreProcessor_parms"/>
@@ -14441,12 +14754,16 @@ ctx - (JMeterContext) - gives access to 
 
 
 <li>
-vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
+vars - (
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
 </li>
 
 
 <li>
-props - (JMeterProperties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - (JMeterProperties - class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -14600,12 +14917,16 @@ ctx - (JMeterContext) - gives access to 
 
 
 <li>
-vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object()); vars.getObject("OBJ2");
+vars - (
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object()); vars.getObject("OBJ2");
 </li>
 
 
 <li>
-props - (JMeterProperties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - (JMeterProperties - class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -15426,7 +15747,7 @@ Tidy homepage
 This test element allows the user to stop the thread or the whole test if the relevant sampler failed.
    
 <p><b>Control Panel</b></p>
-<div align="center"><img width='435' height='146' src="../images/screenshots/resultstatusactionhandler.png"></div>
+<div align="center"><img width='493' height='140' src="../images/screenshots/resultstatusactionhandler.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Result_Status_Action_Handler_parms"/>
@@ -15530,7 +15851,7 @@ See the file BeanShellListeners.bshrc fo
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='597' height='303' src="../images/screenshots/beanshell_postprocessor.png"></div>
+<div align="center"><img width='655' height='306' src="../images/screenshots/beanshell_postprocessor.png"></div>
 <p>
 <b>Parameters</b>
 <a name="BeanShell_PostProcessor_parms"/>
@@ -15621,12 +15942,16 @@ ctx - (JMeterContext) - gives access to 
 
 
 <li>
-vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
+vars - (
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
 </li>
 
 
 <li>
-props - (JMeterProperties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - (JMeterProperties - class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -15783,12 +16108,16 @@ ctx - (JMeterContext) - gives access to 
 
 
 <li>
-vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object()); vars.getObject("OBJ2");
+vars - (
+<a href="../../docs/api/org/apache/jmeter/threads/JMeterVariables.html">
+JMeterVariables
+</a>
+) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object()); vars.getObject("OBJ2");
 </li>
 
 
 <li>
-props - (JMeterProperties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+props - (JMeterProperties - class java.util.Properties) - e.g. props.get("START.HMS"); props.put("PROP1","1234");
 </li>
 
 
@@ -15990,7 +16319,7 @@ In jmeter.properties, edit "user.classpa
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='529' height='422' src="../images/screenshots/testplan.png"></div>
+<div align="center"><img width='559' height='435' src="../images/screenshots/testplan.png"></div>
 </td></tr>
 <tr><td><br></td></tr>
 </table>
@@ -16571,7 +16900,7 @@ Yes
 </tr>
 <tr>
 <td>Regex Matching</td>
-<td>Use Regex Matching when replacing variables?
+<td>Use Regex Matching when replacing variables? If checked replacement will use word boundaries, ie it will only replace word matching values of variable, not part of a word. A word boundary follows Perl5 definition and is equivalent to \b.
 </td>
 <td>
 Yes
@@ -16976,6 +17305,20 @@ One solution is to ensure that any files
 either by copying the files there or by starting JMeter in the directory containing the files.
 
 </p>
+<p>
+<b>
+Recording HTTP Based Non Textual Protocols not natively available in JMeter
+</b>
+</p>
+<p>
+
+You may have to record an HTTP protocol that is not handled by default by JMeter (Custom Binary Protocol, Adobe Flex, Microsoft Silverlight... ).
+Although JMeter does not provide a native proxy implementation to record these protocols, you have the ability to
+record these protocols by implementing a custom SamplerCreator. This Sampler Creator will translate the binary format into a HTTPSamplerBase subclass
+that can be added to the JMeter Test Case.
+For more details see "Extending JMeter".
+
+</p>
 </td></tr>
 <tr><td><br></td></tr>
 </table>
@@ -17085,7 +17428,7 @@ It is available only on the WorkBench.
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='776' height='502' src="../images/screenshots/property_display.png"></div>
+<div align="center"><img width='804' height='508' src="../images/screenshots/property_display.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Property_Display_parms"/>
@@ -17133,7 +17476,7 @@ The values can be seen in the 
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='355' height='172' src="../images/screenshots/debug_sampler.png"></div>
+<div align="center"><img width='431' height='172' src="../images/screenshots/debug_sampler.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Debug_Sampler_parms"/>
@@ -17365,119 +17708,6 @@ Yes
 </td></tr>
 <tr><td><br></td></tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr><td bgcolor="#525D76">
-<font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="Reports"><strong>18.10 Reports</strong></a><a class="sectionlink" href="#Reports" title="Link to here">&para;</a></font>
-</td></tr>
-<tr><td>
-<blockquote>
-<description>
-
-		
-<br>
-
-
-
-</description>
-<table border="0" cellspacing="0" cellpadding="2">
-<tr><td>
-<font face="arial,helvetica,sanserif">
-<h3>
-<a name="Report_Plan">18.10.1 Report Plan</a>
-<a class="sectionlink" href="#Report_Plan" title="Link to here">&para;</a></h3>
-</font>
-</td></tr>
-<tr><td>
-<p>
-</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="Report_Table">18.10.2 Report Table</a>
-<a class="sectionlink" href="#Report_Table" title="Link to here">&para;</a></h3>
-</font>
-</td></tr>
-<tr><td>
-<p>
-</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="HTML_Report_Writer">18.10.3 HTML Report Writer</a>
-<a class="sectionlink" href="#HTML_Report_Writer" title="Link to here">&para;</a></h3>
-</font>
-</td></tr>
-<tr><td>
-<p>
-</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="Report_Page">18.10.4 Report Page</a>
-<a class="sectionlink" href="#Report_Page" title="Link to here">&para;</a></h3>
-</font>
-</td></tr>
-<tr><td>
-<p>
-</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="Line_Graph">18.10.5 Line Graph</a>
-<a class="sectionlink" href="#Line_Graph" title="Link to here">&para;</a></h3>
-</font>
-</td></tr>
-<tr><td>
-<p>
-</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="Bar_Chart">18.10.6 Bar Chart</a>
-<a class="sectionlink" href="#Bar_Chart" title="Link to here">&para;</a></h3>
-</font>
-</td></tr>
-<tr><td>
-<p>
-</p>
-</td></tr>
-<tr><td><br></td></tr>
-</table>
-<hr>
-<a href="#">
-^
-</a>
-</blockquote>
-</p>
-</td></tr>
-<tr><td><br></td></tr>
-</table>
 <table>
 <tr>
 <td bgcolor="#525D76">

Modified: jmeter/trunk/docs/usermanual/functions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/functions.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/functions.html (original)
+++ jmeter/trunk/docs/usermanual/functions.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
@@ -247,6 +249,11 @@ Name
 Comment
 </font>
 </td>
+<td bgcolor="#039acc"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+Since
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -264,6 +271,11 @@ Information
 get thread number
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.X
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -281,6 +293,11 @@ Information
 get the sampler name (label)
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.5
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -298,6 +315,11 @@ Information
 get the local machine IP address
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.6
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -315,6 +337,11 @@ Information
 get the local machine name
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.X
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -332,6 +359,11 @@ Information
 return current time in various formats
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.2
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -349,6 +381,11 @@ Information
 log (or display) a message (and return the value)
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.2
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -366,6 +403,11 @@ Information
 log (or display) a message (empty return value)
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.2
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -383,6 +425,11 @@ Input
 read a line from a file
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.9
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -400,6 +447,11 @@ Input
 read an entire file
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.4
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -417,6 +469,11 @@ Input
 read from CSV delimited file
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.9
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -434,6 +491,11 @@ Input
 Use an XPath expression to read from a file
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.0.3
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -451,6 +513,11 @@ Calculation
 generate an incrementing number
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.X
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -468,6 +535,11 @@ Calculation
 add int numbers
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.8.1
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -485,6 +557,11 @@ Calculation
 add long numbers
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.3.2
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -502,6 +579,11 @@ Calculation
 generate a random number
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.9
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -519,6 +601,11 @@ Calculation
 generate a random string
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.6
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -536,6 +623,11 @@ Scripting
 run a BeanShell script
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.X
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -553,6 +645,11 @@ Scripting
 process JavaScript (Mozilla Rhino)
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.9
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -570,6 +667,11 @@ Scripting
 evaluate a Commons Jexl expression
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+jexl(2.2), jexl2(2.6)
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -587,6 +689,11 @@ Properties
 read a property
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.0
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -604,6 +711,11 @@ Properties
 read a property (shorthand method)
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.0
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -621,6 +733,11 @@ Properties
 set a JMeter property
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.1
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -638,6 +755,11 @@ Variables
 Split a string into variables
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.0.2
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -655,6 +777,11 @@ Variables
 evaluate a variable name
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.3RC3
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -672,6 +799,11 @@ Variables
 evaluate a variable expression
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.3.1
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -689,6 +821,11 @@ Variables
 evaluate an expression stored in a variable
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.3.1
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -706,6 +843,11 @@ String
 parse previous response using a regular expression
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+1.X
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -723,6 +865,11 @@ String
 generate Unicode char values from a list of numbers
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.3.3
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -740,6 +887,11 @@ String
 Process strings containing Java escapes (e.g. \n &amp; \t)
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.3.3
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -757,6 +909,11 @@ String
 Decode HTML-encoded strings
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.3.3
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -774,6 +931,11 @@ String
 Encode strings using HTML encoding
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.3.3
+</font>
+</td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
@@ -791,6 +953,11 @@ String
 Return name of current test plan
 </font>
 </td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.6
+</font>
+</td>
 </tr>
 </table>
 <p>
@@ -3539,7 +3706,7 @@ ${__char(13,10)} = ${__char(0xD,0xA)} = 
 <br>
 
 
-${__char(165)} = � (yen)
+${__char(165)} = ¥ (yen)
  
 </p>
 </td></tr>

Modified: jmeter/trunk/docs/usermanual/get-started.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/get-started.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jmeter/trunk/docs/usermanual/get-started.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
@@ -596,22 +598,22 @@ Note: there can be problems (especially 
 </p>
 <p>
 
-The installation directory structure should look something like this (for version 2.3.1):
+The installation directory structure should look something like this (for version 2.7):
 
 <pre>
 
-jakarta-jmeter-2.3.1
-jakarta-jmeter-2.3.1/bin
-jakarta-jmeter-2.3.1/docs
-jakarta-jmeter-2.3.1/extras
-jakarta-jmeter-2.3.1/lib/
-jakarta-jmeter-2.3.1/lib/ext
-jakarta-jmeter-2.3.1/lib/junit
-jakarta-jmeter-2.3.1/printable_docs
+apache-jmeter-2.7
+apache-jmeter-2.7/bin
+apache-jmeter-2.7/docs
+apache-jmeter-2.7/extras
+apache-jmeter-2.7/lib/
+apache-jmeter-2.7/lib/ext
+apache-jmeter-2.7/lib/junit
+apache-jmeter-2.7/printable_docs
 
 </pre>
 
-You can rename the parent directory (i.e. jakarta-jmeter-2.3.1) if you want, but do not change any of the sub-directory names.
+You can rename the parent directory (i.e. apache-jmeter-2.7) if you want, but do not change any of the sub-directory names.
 
 </p>
 </blockquote>
@@ -1131,6 +1133,23 @@ jmeter.log
 </p>
 <p>
 
+		Since JMeter 2.6, menu 
+<b>
+Options > Log Viewer
+</b>
+ displays the log file in a bottom pane on main JMeter window. 
+		
+</p>
+<p>
+
+		Since JMeter 2.7 (GUI mode), the number of error/fatal messages logged in the log file is displayed at top-right. 
+		
+</p>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  src="../images/screenshots/log_errors_counter.png"><br>
+<font size="-1">Error/fatal counter
+</font></td></tr></table></p>
+<p>
+
 		JMeter versions after 2.2 added a new command-line option, -j jmeterlogfile. 
 		This is processed after the initial properties file is read,
 		and before any further properties are processed. 

Modified: jmeter/trunk/docs/usermanual/glossary.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/glossary.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/glossary.html (original)
+++ jmeter/trunk/docs/usermanual/glossary.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

Modified: jmeter/trunk/docs/usermanual/hints_and_tips.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/hints_and_tips.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/hints_and_tips.html (original)
+++ jmeter/trunk/docs/usermanual/hints_and_tips.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
@@ -287,13 +289,13 @@ Regexp : Is text to search a regexp, if 
 <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>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='948' height='706' 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>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='948' height='706' 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>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='948' height='706' src="../images/screenshots/searching/regexp-search-result.png"><br>
 <font size="-1">Figure 4 - Result in TreeView
 </font></td></tr></table></p>
 </blockquote>

Modified: jmeter/trunk/docs/usermanual/index.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/index.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/index.html (original)
+++ jmeter/trunk/docs/usermanual/index.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

Modified: jmeter/trunk/docs/usermanual/intro.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/intro.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/intro.html (original)
+++ jmeter/trunk/docs/usermanual/intro.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

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

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

Modified: jmeter/trunk/docs/usermanual/ldapanswer_xml.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapanswer_xml.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/ldapanswer_xml.html (original)
+++ jmeter/trunk/docs/usermanual/ldapanswer_xml.html Sat May 19 15:32:55 2012
@@ -65,6 +65,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

Modified: jmeter/trunk/docs/usermanual/ldapops_tutor.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapops_tutor.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/ldapops_tutor.html (original)
+++ jmeter/trunk/docs/usermanual/ldapops_tutor.html Sat May 19 15:32:55 2012
@@ -65,6 +65,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

Modified: jmeter/trunk/docs/usermanual/listeners.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/listeners.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/listeners.html (original)
+++ jmeter/trunk/docs/usermanual/listeners.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

Modified: jmeter/trunk/docs/usermanual/regular_expressions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/regular_expressions.html (original)
+++ jmeter/trunk/docs/usermanual/regular_expressions.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

Modified: jmeter/trunk/docs/usermanual/remote-test.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/remote-test.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jmeter/trunk/docs/usermanual/remote-test.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>

Modified: jmeter/trunk/docs/usermanual/test_plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/test_plan.html?rev=1340502&r1=1340501&r2=1340502&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/test_plan.html (original)
+++ jmeter/trunk/docs/usermanual/test_plan.html Sat May 19 15:32:55 2012
@@ -63,6 +63,8 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../changes.html">Changes</a>
 </li>
+<li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
+</li>
 <li><a href="../issues.html">Issues</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>



Mime
View raw message