You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/09/28 17:08:33 UTC

svn commit: r580381 - in /jakarta/jmeter/trunk/docs: ./ images/screenshots/ images/screenshots/webtest/ localising/ usermanual/

Author: sebb
Date: Fri Sep 28 08:08:32 2007
New Revision: 580381

URL: http://svn.apache.org/viewvc?rev=580381&view=rev
Log:
Synch doc tree

Modified:
    jakarta/jmeter/trunk/docs/changes.html
    jakarta/jmeter/trunk/docs/images/screenshots/proxy_control.png
    jakarta/jmeter/trunk/docs/images/screenshots/sample_result_config.png
    jakarta/jmeter/trunk/docs/images/screenshots/table_results.png
    jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request.png
    jakarta/jmeter/trunk/docs/localising/index.html
    jakarta/jmeter/trunk/docs/usermanual/component_reference.html
    jakarta/jmeter/trunk/docs/usermanual/functions.html
    jakarta/jmeter/trunk/docs/usermanual/get-started.html
    jakarta/jmeter/trunk/docs/usermanual/listeners.html
    jakarta/jmeter/trunk/docs/usermanual/remote-test.html

Modified: jakarta/jmeter/trunk/docs/changes.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/changes.html?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/changes.html (original)
+++ jakarta/jmeter/trunk/docs/changes.html Fri Sep 28 08:08:32 2007
@@ -144,6 +144,11 @@
 						</li>
 									
 
+												<li	>
+								Bug 43430 - Count of active threads is incorrect for remote samples
+						</li>
+									
+
 						</ul>
 							  									 				<h4	>
 								Improvements
@@ -171,6 +176,11 @@
 						</li>
 									
 
+												<li	>
+								New functions: __eval() and __evalVar()
+						</li>
+									
+
 						</ul>
 							  									 				<h3	>
 								Version 2.3
@@ -209,6 +219,21 @@
 						</li>
 									
 
+												<li	>
+								Bug 43364 - option to revert If Controller to pre 2.3RC3 behaviour
+						</li>
+									
+
+												<li	>
+								Bug 43449 - Statistical Remote mode does not handle Latency
+						</li>
+									
+
+												<li	>
+								Bug 43450 (partial fix) - Allow SampleCount and ErrorCount to be saved to/restored from files
+						</li>
+									
+
 						</ul>
 							  									 				<h4	>
 								Improvements
@@ -236,6 +261,11 @@
 						</li>
 									
 
+												<li	>
+								Look for user.properties and system.properties in JMeter bin directory if not found locally
+						</li>
+									
+
 						</ul>
 							  									 				<h4	>
 								Fixes since 2.3RC3
@@ -593,7 +623,7 @@
 						</p>
 							  									 				<p	>
 								
-Bug 41104: JMeterThread behaviour was changed so that PostProcessors are run in forward order
+Bug 41140: JMeterThread behaviour was changed so that PostProcessors are run in forward order
 (as they appear in the test plan) rather than reverse order as previously.
 The original behaviour can be restored by setting the following JMeter property:
 
@@ -1126,6 +1156,11 @@
 									
 
 												<li	>
+								Bug 41140 - Post-processors are run in reverse order
+						</li>
+									
+
+												<li	>
 								Bug 41277 - add Latency and Encoding to CSV output
 						</li>
 									
@@ -1383,7 +1418,7 @@
 									
 
 												<li	>
-								Bug 41612 - Loop nested in IF behaves erratically
+								Bug 41612 - Loop nested in If Controller behaves erratically
 						</li>
 									
 

Modified: jakarta/jmeter/trunk/docs/images/screenshots/proxy_control.png
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/proxy_control.png?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/docs/images/screenshots/sample_result_config.png
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/sample_result_config.png?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/docs/images/screenshots/table_results.png
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/table_results.png?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request.png
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request.png?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/docs/localising/index.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/localising/index.html?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/localising/index.html (original)
+++ jakarta/jmeter/trunk/docs/localising/index.html Fri Sep 28 08:08:32 2007
@@ -212,11 +212,11 @@
 						</a>
 									
 stating your intention. Surely one of the project contributors will be very happy to grab the current texts
-from CVS and send them to you. You'll receive a jar, zip, tar or tgz file that you'll need to unpack in your
+from SVN and send them to you. You'll receive a jar, zip, tar or tgz file that you'll need to unpack in your
 local disk.
 						</p>
 							  									 				<p	>
-								If you are familiar with CVS or you're brave, feel free to anonymously connect to the Jakarta CVS server
+								If you are familiar with SVN or you're brave, feel free to anonymously connect to the Jakarta SVN server
 and obtain the JMeter source yourself, as described in
 
 												<a	 href="http://jakarta.apache.org/site/cvsindex.html">
@@ -244,7 +244,7 @@
 		<tr><td>
 		  <blockquote>
 		  									 				<p	>
-								If you have access to JMeter's CVS repository and you want to pack the files necessary for localisation
+								If you have access to JMeter's SVN repository and you want to pack the files necessary for localisation
 for sending to a translator, just go to the directory above the project root and issue the following command:
 												<br	>
 						</br>
@@ -437,7 +437,7 @@
 									
 
 												<li	>
-								Close i18nEdit and commit to CVS as usual (remember to Refresh your project if you're using Eclipse).
+								Close i18nEdit and commit to SVN as usual (remember to Refresh your project if you're using Eclipse).
 						</li>
 									
 

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Fri Sep 28 08:08:32 2007
@@ -595,7 +595,7 @@
 									
 
 														<p><b>Control Panel</b></p>
-						<div align="center"><img width='558' height='600' src="../images/screenshots/webtest/http-request.png"></div>
+						<div align="center"><img width='688' height='592' src="../images/screenshots/webtest/http-request.png"></div>
 											  									 			 <p>
 	<b>Parameters</b>
 	<table border="1" cellspacing="0" cellpadding="2">
@@ -696,6 +696,16 @@
 								</td>
 		</tr>
 			<tr>
+			<td>Use multipart/form-data for HTTP POST</td>
+			<td>						
+        Use a multipart/form-data or application/x-www-form-urlencoded post request
+        
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+			<tr>
 			<td>Path</td>
 			<td>						The path to resource (for example, /servlets/myServlet). If the
 resource requires query string parameters, add them below in the
@@ -1775,7 +1785,7 @@
 						</p>
 									 
 														<p><b>Control Panel</b></p>
-						<div align="center"><img width='594' height='309' src="../images/screenshots/ldapext_request.png"></div>
+						<div align="center"><img width='595' height='542' src="../images/screenshots/ldapext_request.png"></div>
 											  									 				<p	>
 								There are nine test operations defined. These operations are given below:
 						</p>
@@ -2632,7 +2642,7 @@
 									
 			
 												<li	>
-								vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3");
+								vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3"); vars.putObject("OBJ1",new Object());
 						</li>
 									
 		
@@ -2837,7 +2847,7 @@
 									
 
 												<li	>
-								vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3");
+								vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3"); vars.putObject("OBJ1",new Object());
 						</li>
 									
 
@@ -4499,6 +4509,16 @@
 								The If Controller allows the user to control whether the test elements below it (its children) are run or not.
 						</p>
 									
+		
+												<p	>
+								
+		Prior to JMeter 2.3RC3, the condition was evaluated for every runnable element contained in the controller.
+		This sometimes caused unexpected behaviour, so 2.3RC3 was changed to evaluate the condition only once on initial entry.
+		However, the original behaviour is also useful, so versions of JMeter after 2.3RC4 have an additional
+		option to select the original behaviour.
+		
+						</p>
+									
 	
 														<p><b>Control Panel</b></p>
 						<div align="center"><img width='358' height='131' src="../images/screenshots/ifcontroller.png"></div>
@@ -4525,6 +4545,17 @@
 											Yes
 								</td>
 		</tr>
+			<tr>
+			<td>Evaluate for all children</td>
+			<td>						
+	Should condition be evaluated for all children?
+	If not checked, then the condition is only evaluated on entry.
+	
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
 		</table>
 	</p>
 							  									 				<p	>
@@ -4544,7 +4575,7 @@
 									
 			
 												<li	>
-								"${JMeterThread.last_sample_ok}" == "true" (check if last sample succeeded)
+								${JMeterThread.last_sample_ok} (check if last sample succeeded)
 						</li>
 									
 		
@@ -5252,7 +5283,7 @@
 The saving and reading of test results is generic.  The various
 listeners have a panel whereby one can specify the file to
 which the results will be written (or read from).
-By default, the results are stored as CSV
+By default, the results are stored as XML
 files, typically with a ".jtl" extension.  Storing as CSV is the most efficient option, but is less detailed than XML (the other available option).
 						</p>
 									
@@ -5266,10 +5297,10 @@
 
 												<p	>
 								Results can be read from XML or CSV format files.
-When reading from CSV results files, the header (if present) is ignored.
+When reading from CSV results files, the header (if present) is used to determine which fields are present.
 
 												<b	>
-								In order to interpret a CSV file correctly, the appropriate properties must be set in jmeter.properties.
+								In order to interpret a header-less CSV file correctly, the appropriate properties must be set in jmeter.properties.
 						</b>
 									
 
@@ -5333,12 +5364,7 @@
 									
 
 												<p	>
-								jmeter.save.saveservice.output_format=csv
-						</p>
-									
-
-												<p	>
-								Change "csv" to "xml" for greater detail.
+								jmeter.save.saveservice.output_format=
 						</p>
 									
 
@@ -5353,8 +5379,7 @@
 
 												<p	>
 								
-One can get a more selective set of information my modifying the
-jmeter.properties file.  The following example indicates how to set
+The following example indicates how to set
 properties to get a vertical bar ("|") delimited format that will
 output results like:.
 						</p>
@@ -5399,40 +5424,62 @@
 
 												<pre	>
 								
-    #---------------------------------------------------------------------------
-    # Results file configuration
-    #---------------------------------------------------------------------------
-    
-    # This section helps determine how result data will be saved.
-    # The commented out values are the defaults.
-    
-    # legitimate values: xml, csv, db.  Only xml and csv are currently supported.
-    jmeter.save.saveservice.output_format=csv
-    
-    # true when field should be saved; false otherwise
-    
-    # assertion_results_failure_message only affects CSV output
-    jmeter.save.saveservice.assertion_results_failure_message=true
-    jmeter.save.saveservice.data_type=true
-    jmeter.save.saveservice.label=true
-    jmeter.save.saveservice.response_code=true
-    jmeter.save.saveservice.response_data=false
-    jmeter.save.saveservice.response_message=false
-    jmeter.save.saveservice.successful=true
-    jmeter.save.saveservice.thread_name=true
-    jmeter.save.saveservice.time=true
-    
-    # legitimate values: none, ms, or a format suitable for SimpleDateFormat
-    #jmeter.save.saveservice.timestamp_format=ms
-    jmeter.save.saveservice.timestamp_format=MM/dd/yy HH:mm:ss
-    
-    # legitimate values: none, first, all
-    jmeter.save.saveservice.assertion_results=first
-    
-    # For use with Comma-separated value (CSV) files or other formats
-    # where the fields' values are separated by specified delimiters.
-    jmeter.save.saveservice.default_delimiter=|
-    jmeter.save.saveservice.print_field_names=true
+#---------------------------------------------------------------------------
+# Results file configuration
+#---------------------------------------------------------------------------
+
+# This section helps determine how result data will be saved.
+# The commented out values are the defaults.
+
+# legitimate values: xml, csv, db.  Only xml and csv are currently supported.
+#jmeter.save.saveservice.output_format=xml
+
+
+# true when field should be saved; false otherwise
+
+# assertion_results_failure_message only affects CSV output
+#jmeter.save.saveservice.assertion_results_failure_message=false
+#
+#jmeter.save.saveservice.data_type=true
+#jmeter.save.saveservice.label=true
+#jmeter.save.saveservice.response_code=true
+# response_data is not currently supported for CSV output
+#jmeter.save.saveservice.response_data=false
+# Save ResponseData for failed samples
+#jmeter.save.saveservice.response_data.on_error=false
+#jmeter.save.saveservice.response_message=true
+#jmeter.save.saveservice.successful=true
+#jmeter.save.saveservice.thread_name=true
+#jmeter.save.saveservice.time=true
+#jmeter.save.saveservice.subresults=true
+#jmeter.save.saveservice.assertions=true
+#jmeter.save.saveservice.latency=true
+#jmeter.save.saveservice.samplerData=false
+#jmeter.save.saveservice.responseHeaders=false
+#jmeter.save.saveservice.requestHeaders=false
+#jmeter.save.saveservice.encoding=false
+#jmeter.save.saveservice.bytes=true
+#jmeter.save.saveservice.url=false
+#jmeter.save.saveservice.filename=false
+#jmeter.save.saveservice.thread_counts=false
+#jmeter.save.saveservice.sample_count=false
+
+# Timestamp format
+# legitimate values: none, ms, or a format suitable for SimpleDateFormat
+#jmeter.save.saveservice.timestamp_format=ms
+#jmeter.save.saveservice.timestamp_format=MM/dd/yy HH:mm:ss
+
+# Put the start time stamp in logs instead of the end
+sampleresult.timestamp.start=true
+
+
+# legitimate values: none, first, all
+#jmeter.save.saveservice.assertion_results=none
+
+# For use with Comma-separated value (CSV) files or other formats
+# where the fields' values are separated by specified delimiters.
+#jmeter.save.saveservice.default_delimiter=,
+#jmeter.save.saveservice.print_field_names=false
 
 						</pre>
 									
@@ -5507,22 +5554,22 @@
 								
 
 												<li	>
-								 t - elapsed time (ms)
+								by - bytes in responses
 						</li>
 									
 
 												<li	>
-								lt - latency = time to initial response (ms)
+								de - data encoding
 						</li>
 									
 
 												<li	>
-								ts - timestamp (ms since 1970)
+								dt - data type
 						</li>
 									
 
 												<li	>
-								 s - successful (true/false)
+								ec - error count (0 or 1, unless multiple samples are aggregated)
 						</li>
 									
 
@@ -5532,6 +5579,21 @@
 									
 
 												<li	>
+								lt - latency = time to initial response (ms)
+						</li>
+									
+
+												<li	>
+								na - number of active threads in all thread groups
+						</li>
+									
+
+												<li	>
+								ng - number of active threads in current thread group
+						</li>
+									
+
+												<li	>
 								rc - response code (e.g. 200)
 						</li>
 									
@@ -5542,17 +5604,27 @@
 									
 
 												<li	>
-								tn - thread name
+								 s - successful (true/false)
 						</li>
 									
 
 												<li	>
-								dt - data type
+								sc - sample count (1, unless multiple samples are aggregated)
 						</li>
 									
 
 												<li	>
-								de - data encoding
+								 t - elapsed time (ms)
+						</li>
+									
+
+												<li	>
+								tn - thread name
+						</li>
+									
+
+												<li	>
+								ts - timestamp (ms since 1970)
 						</li>
 									
 
@@ -5560,7 +5632,7 @@
 									
 
 														<p><b>Control Panel</b></p>
-						<div align="center"><img width='767' height='252' src="../images/screenshots/sample_result_config.png"></div>
+						<div align="center"><img width='767' height='276' src="../images/screenshots/sample_result_config.png"></div>
 											  		</td></tr>
 		<tr><td><br></td></tr>
 	 </table>
@@ -5867,14 +5939,13 @@
 		  </font>
 		</td></tr>
 				<tr><td>
-		  															This visualizer creates a row for every sample result.  Each sample result's URL,
-time in milliseconds, success/failure is displayed.  Like the 
+		  															This visualizer creates a row for every sample result.  
+Like the 
 												<a href="../usermanual/component_reference.html#View_Results_Tree">View Results Tree</a>
-									,
-this visualizer uses a lot of memory. The last column shows the number of bytes for the
-response from the server.
+									, this visualizer uses a lot of memory.
+
 														<p><b>Control Panel</b></p>
-						<div align="center"><img width='643' height='678' src="../images/screenshots/table_results.png"></div>
+						<div align="center"><img width='658' height='700' src="../images/screenshots/table_results.png"></div>
 											  		</td></tr>
 		<tr><td><br></td></tr>
 	 </table>
@@ -5888,7 +5959,11 @@
 				<tr><td>
 		  															This listener can record results to a file
 but not to the UI.  It is meant to provide an efficient means of
-recording data by eliminating GUI overhead.
+recording data by eliminating GUI overhead.
+When running in non-GUI mode, the -l flag can be used to create a data file.
+The fields to save are defined by JMeter properties.
+See the jmeter.properties file for details.
+
 														<p><b>Control Panel</b></p>
 						<div align="center"><img width='649' height='157' src="../images/screenshots/simpledatawriter.png"></div>
 											  		</td></tr>
@@ -6224,7 +6299,7 @@
 									
 
 												<li	>
-								vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val)
+								vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
 						</li>
 									
 
@@ -6911,7 +6986,7 @@
 									
 
 														<p><b>Control Panel</b></p>
-						<div align="center"><img width='689' height='464' src="../images/screenshots/proxy_control.png"></div>
+						<div align="center"><img width='960' height='650' src="../images/screenshots/proxy_control.png"></div>
 											  									 			 <p>
 	<b>Parameters</b>
 	<table border="1" cellspacing="0" cellpadding="2">
@@ -6933,38 +7008,6 @@
 								</td>
 		</tr>
 			<tr>
-			<td>Capture HTTP Headers</td>
-			<td>						Should headers be added to the plan?
-			</td>
-			<td>
-											Yes
-								</td>
-		</tr>
-			<tr>
-			<td>Set Keep-Alive</td>
-			<td>						Automatically set Keep-Alive in the generated samplers?
-			</td>
-			<td>
-											Yes
-								</td>
-		</tr>
-			<tr>
-			<td>Add Assertions</td>
-			<td>						Add a blank assertion to each sampler?
-			</td>
-			<td>
-											Yes
-								</td>
-		</tr>
-			<tr>
-			<td>Regex Matching</td>
-			<td>						Use Regex Matching when replacing variables?
-			</td>
-			<td>
-											Yes
-								</td>
-		</tr>
-			<tr>
 			<td>Attempt https Spoofing</td>
 			<td>						
           When you enable https spoofing, the following  happens:
@@ -7052,6 +7095,76 @@
 								</td>
 		</tr>
 			<tr>
+			<td>Capture HTTP Headers</td>
+			<td>						Should headers be added to the plan?
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+			<tr>
+			<td>Add Assertions</td>
+			<td>						Add a blank assertion to each sampler?
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+			<tr>
+			<td>Regex Matching</td>
+			<td>						Use Regex Matching when replacing variables?
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+			<tr>
+			<td>Redirect Automatically</td>
+			<td>						Set Redirect Automatically in the generated samplers?
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+			<tr>
+			<td>Follow Redirects</td>
+			<td>						Set Follow Redirects in the generated samplers?
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+			<tr>
+			<td>Use Keep-Alive</td>
+			<td>						Set Use Keep-Alive in the generated samplers?
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+			<tr>
+			<td>Retrieve all Embedded Resources</td>
+			<td>						Set Retrieve all Embedded Resources in the generated samplers?
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+			<tr>
+			<td>Content Type filter</td>
+			<td>						
+		Filter the requests based on the content-type - e.g. "text/html [;charset=utf-8 ]".
+		The fields are regular expressions which are checked to see if they are contained in the content-type.
+		[Does not have to match the entire field].
+		The include filter is checked first, then the exclude filter.
+		Samples which are filtered out will not be stored.
+		
+			</td>
+			<td>
+											No
+								</td>
+		</tr>
+			<tr>
 			<td>Patterns to Include</td>
 			<td>						Regular expressions that are matched against the full URL that is sampled.  Allows filtering of requests that are recorded.  All requests pass through, but only
         those that meet the requirements of the Include/Exclude fields are 
@@ -8598,7 +8711,7 @@
 									
 	
 												<li	>
-								vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value");
+								vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.putObject("OBJ1",new Object());
 						</li>
 									
 
@@ -9373,7 +9486,7 @@
 									
 
 												<li	>
-								vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val)
+								vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
 						</li>
 									
 
@@ -10083,7 +10196,7 @@
 									
 
 												<li	>
-								vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val)
+								vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
 						</li>
 									
 
@@ -10819,7 +10932,7 @@
 									
 
 												<li	>
-								vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val)
+								vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());
 						</li>
 									
 

Modified: jakarta/jmeter/trunk/docs/usermanual/functions.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/functions.html?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/functions.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/functions.html Fri Sep 28 08:08:32 2007
@@ -2224,6 +2224,96 @@
 		<tr><td><br></td></tr>
 	 </table>
 	<hr>
+							  									 					<table border="0" cellspacing="0" cellpadding="2">
+		<tr><td>
+		  <font face="arial,helvetica,sanserif">
+			 <a name="__evalVar"><h3>19.5.20 __evalVar</h3></a>
+		  </font>
+		</td></tr>
+				<tr><td>
+		  															
+	
+												<p	>
+								The eval function returns the result of evaluating an expression stored in a variable.
+	
+						</p>
+									
+	
+												<p	>
+								
+	This allows one to read a string from a file, and process any variable references in it.
+	For example, if the variable "query" contains "select ${column} from ${table}" 
+	and "column" and "table" contain "name" and "customers", then ${__evalVar(query)}
+	will evaluate as "select name from customers". 
+	
+						</p>
+									
+	
+														  									 			 <p>
+	<b>Parameters</b>
+	<table border="1" cellspacing="0" cellpadding="2">
+	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
+			<tr>
+			<td>Variable name</td>
+			<td>						
+        The variable to be evaluated. 
+        
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+		</table>
+	</p>
+							  		</td></tr>
+		<tr><td><br></td></tr>
+	 </table>
+	<hr>
+							  									 					<table border="0" cellspacing="0" cellpadding="2">
+		<tr><td>
+		  <font face="arial,helvetica,sanserif">
+			 <a name="__eval"><h3>19.5.21 __eval</h3></a>
+		  </font>
+		</td></tr>
+				<tr><td>
+		  															
+	
+												<p	>
+								The eval function returns the result of evaluating an expression.
+	
+						</p>
+									
+	
+												<p	>
+								
+	This allows one to interpolate variable and function references in a string.
+	For example, if "column" and "table" contain "name" and "customers", 
+	then ${__eval(select ${column} from ${table})}
+	will evaluate as "select name from customers". 
+	
+						</p>
+									
+	
+														  									 			 <p>
+	<b>Parameters</b>
+	<table border="1" cellspacing="0" cellpadding="2">
+	<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
+			<tr>
+			<td>Variable name</td>
+			<td>						
+        The variable to be evaluated. 
+        
+			</td>
+			<td>
+											Yes
+								</td>
+		</tr>
+		</table>
+	</p>
+							  		</td></tr>
+		<tr><td><br></td></tr>
+	 </table>
+	<hr>
 							  		  </blockquote>
 		</td></tr>
 		<tr><td><br></td></tr>

Modified: jakarta/jmeter/trunk/docs/usermanual/get-started.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/get-started.html?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/get-started.html Fri Sep 28 08:08:32 2007
@@ -1186,7 +1186,8 @@
 								user.properties
 						</b>
 									.
-  The file will be automatically loaded if it is found in the current directory.
+  The file will be automatically loaded if it is found in the current directory
+  or if it is found in the JMeter bin directory.
   Similarly, 
 												<b	>
 								system.properties

Modified: jakarta/jmeter/trunk/docs/usermanual/listeners.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/listeners.html?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/listeners.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/listeners.html Fri Sep 28 08:08:32 2007
@@ -673,13 +673,6 @@
 </td>
 		  	 </tr>
 		  	 </table>
-							  									 				<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
-		<tr><td>						
-The active thread counts are always zero for remote tests.
-This is a restriction of the current implementation.
-
-			</td></tr>
-	</table></p>
 							  									 				<p	>
 								
 Versions 2.1 and 2.1.1 of JMeter saved the Response Code as "rs", but read it back expecting to find "rc".

Modified: jakarta/jmeter/trunk/docs/usermanual/remote-test.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/remote-test.html?rev=580381&r1=580380&r2=580381&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/remote-test.html Fri Sep 28 08:08:32 2007
@@ -432,6 +432,7 @@
 								
 In both cases, the script starts rmiregistry on the specified port, 
 and then starts JMeter in server mode, having defined the "server_port" property.
+
 
 						</p>
 							  									 				<p	>
@@ -439,6 +440,112 @@
 The chosen port will be logged in the server jmeter.log file (rmiregistry does not create a log file).
 
 						</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="batchmode"><strong>15.4 Using sample batching</strong></a>
+		  </font>
+		</td></tr>
+		<tr><td>
+		  <blockquote>
+		  									 				<p	>
+								
+Listeners in the test plan send their results back to the client JMeter which writes the results to the specified files
+By default, samples are sent back as they are generated. This can place a large load on the network and the JMeter client.
+There are some JMeter properties that can be set to alter this behaviour.
+
+						</p>
+							  									 				<ul	>
+								
+
+												<li	>
+								mode - sample sending mode - default is Standard
+						</li>
+									
+    
+												<ul	>
+								
+    
+												<li	>
+								Standard - send samples as soon as they are generated
+						</li>
+									
+    
+												<li	>
+								Hold - hold samples in an array until the end of a run. This may use a lot of memory on the server.
+						</li>
+									
+    
+												<li	>
+								Batch - send saved samples when either the count or time exceeds a threshold
+						</li>
+									
+    
+												<li	>
+								Statistical - send a summary sample when either the count or time exceeds a threshold. 
+    The samples are summarised by thread group name and sample label.
+    The following fields are accumulated:
+    
+												<ul	>
+								
+    
+												<li	>
+								elapsed time
+						</li>
+									
+    
+												<li	>
+								latency
+						</li>
+									
+    
+												<li	>
+								bytes
+						</li>
+									
+    
+												<li	>
+								sample count
+						</li>
+									
+    
+												<li	>
+								error count
+						</li>
+									
+    
+						</ul>
+									
+    Other fields that vary between samples are lost. 
+    
+						</li>
+									
+    
+						</ul>
+									
+
+						</ul>
+							  									 				<p	>
+								The following properties apply to the Batch and Statistical modes:
+						</p>
+							  									 				<ul	>
+								
+    
+												<li	>
+								num_sample_threshold - number of samples in a batch (default 100)
+						</li>
+									
+    
+												<li	>
+								time_threshold - number of milliseconds to wait (default 60 seconds)
+						</li>
+									
+    
+						</ul>
 							  		  </blockquote>
 		</td></tr>
 		<tr><td><br></td></tr>



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