Author: sebb
Date: Wed Sep 21 12:59:53 2011
New Revision: 1173610

URL: http://svn.apache.org/viewvc?rev=1173610&view=rev
Log:
Synch web-site docs

Modified:
    jakarta/jmeter/trunk/docs/changes.html
    jakarta/jmeter/trunk/docs/changes_history.html
    jakarta/jmeter/trunk/docs/usermanual/build-web-test-plan.html
    jakarta/jmeter/trunk/docs/usermanual/build-ws-test-plan.html
    jakarta/jmeter/trunk/docs/usermanual/component_reference.html
    jakarta/jmeter/trunk/docs/usermanual/get-started.html
    jakarta/jmeter/trunk/docs/usermanual/glossary.html
    jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html

Modified: jakarta/jmeter/trunk/docs/changes.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/changes.html?rev=1173610&r1=1173609&r2=1173610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/changes.html (original)
+++ jakarta/jmeter/trunk/docs/changes.html Wed Sep 21 12:59:53 2011
@@ -157,7 +157,7 @@ History of Previous Changes
 </table>
 </p>
 <h1>
-Version 2.5
+Version 2.5.1
 </h1>
 <h2>
 Summary of main changes
@@ -166,72 +166,31 @@ Summary of main changes
 
 
 <li>
-The HTTP implementation can now be selected at run-time, and JMeter now also 
supports Apache HttpComponents HttpClient 4.x.
-Note that Commons HttpClient 3.1 is no longer actively developed, and support 
may be removed from JMeter in a future release.
-
-</li>
-
-
-<li>
-The HTTP sampler now allows concurrent downloads of embedded resources in an 
HTML page
-</li>
-
-
-<li>
-The HTTP Sampler can now report the size of a request before decompression.
-</li>
-
-
-<li>
-The JMS and Mail samplers have been improved.
+HttpClient4 sampler now re-uses connections properly (previously it would use 
one per sample, which could quickly cause resource exhaustion).
 </li>
 
 
 <li>
-The new Test Fragment Test Element makes using Include Controllers easier
+Various fixes to JMS samplers
 </li>
 
 
 <li>
-There are various improvements to the View Results Tree Listener
+Functions are no longer spuriously invoked when used with a Configuration 
element
 </li>
 
 
 <li>
-Bug 30563 - Thread Group should have a start next loop option on Sample Error
+WebService sampler GUI has been re-organized for better design and more 
user-friendliness. Some improments on WSDL configuration assistant
 </li>
 
 
 <li>
-There are two new Thread Group types - setUp and tearDown - which are run 
before and after the main Thread groups.
-</li>
-
-
-<li>
-Client-Server mode now supports external stop/shutdown via UDP
-<br>
-</br>
- 
-multiple JMeter server instances can be started on the same host without 
needing to change the port property.
-</li>
-
-
-<li>
-Bug 50516 - "Host" header in HTTP Header Manager is not included in generated 
HTTP request
+Better handling of test shutdown. System.exit now only called if there is no 
other option; even this can be disabled.
 </li>
 
 
 </ul>
-<p>
-
-
-<ul>
-
-
-</ul>
-
-
-</p>
 <h2>
 Known bugs
 </h2>
@@ -242,10 +201,17 @@ In particular, it can cause a NullPointe
 
 </p>
 <p>
-Once Only controller behaves correctly under a Thread Group or Loop Controller,
+The Once Only controller behaves correctly under a Thread Group or Loop 
Controller,
 but otherwise its behaviour is not consistent (or clearly specified).
 </p>
 <p>
+The If Controller may cause an infinite loop if the condition is always false 
from the first iteration. 
+A workaround is to add a sampler at the same level as (or superior to) the If 
Controller.
+For example a Test Action sampler with 0 wait time (which doesn't generate a 
sample),
+or a Debug Sampler with all fields set to False (to reduce the sample size).
+
+</p>
+<p>
 
 The menu item Options / Choose Language does not change all the displayed text 
to the new language.
 [The behaviour has improved, but language change is still not fully working]
@@ -257,19 +223,13 @@ Incompatible changes
 </h2>
 <p>
 
-Unsupported methods are no longer converted to GET by the Commons HttpClient 
sampler.
-
-</p>
-<p>
-
-Removed method public static long currentTimeInMs().
-This has been replaced by the instance method public long 
currentTimeInMillis().
-
-</p>
-<p>
-
-ProxyControl.getSamplerTypeName() now returns a String rather than an int.
-This is internal to the workings of the JMeter Proxy & its GUI, so should not 
affect any user code.
+The HttpClient4 sampler as implemented in version 2.5 used a retry count of 3.
+As this can hide server errors, JMeter now sets the retry count to 0 to 
prevent any automatic retries.
+This can be overridden by setting the JMeter property 
+<b>
+httpclient4.retrycount
+</b>
+.
 
 </p>
 <h2>
@@ -282,44 +242,37 @@ HTTP Samplers and Proxy
 
 
 <li>
-Bug 50178 - HeaderManager added as child of Thread Group can create 
concatenated HeaderManager names and OutOfMemoryException
-</li>
-
-
-<li>
-Bug 50392 - value is trimmed when sending the request in Multipart
+Fix HttpClient 4 sampler so it reuses HttpClient instances and connections 
where possible.
 </li>
 
 
 <li>
-Bug 50686 - HeaderManager logging too verbose when merging instances
+Bug 51750 - Retrieve all embedded resources doesn't follow IFRAME
 </li>
 
 
 <li>
-Bug 50963 - AjpSampler throws java.lang.StringIndexOutOfBoundsException
+Change the default so the HttpClient 4 sampler does not retry
 </li>
 
 
 <li>
-Bug 50516 - "Host" header in HTTP Header Manager is not included in generated 
HTTP request
+Bug 51752 - HTTP Cache is broken when using "Retrieve all embedded resources" 
with concurrent pool
 </li>
 
 
 <li>
-Bug 50544 - In Apache Common Log the HEAD requests cause problems.
+Bug 39219 - HTTP Server: You can't stop it after File->Open
 </li>
 
 
 <li>
-Bug 51268 - HTTPS request through an invalid proxy causes NullPointerException 
and does not show in result tree.
-Rather than delegating to the JMeter thread handler for "unexpected" failures, 
ensure all Exceptions generate a sample error.
-
+Bug 51775 - Port number duplicates in Host header when capturing by HttpClient 
(3.1 and 4.x)
 </li>
 
 
 <li>
-Bug 51275 - Cookie Panel clearGui() sets incorrect default policy in Java 1.6
+Bug 50617 - Monitor Results legend show "dead" server although values from the 
server are retrieved
 </li>
 
 
@@ -331,64 +284,74 @@ Other Samplers
 
 
 <li>
-Bug 50173 - JDBCSampler discards ResultSet from a PreparedStatement
+Bug 50424 - Web Methods drop down list box inconsistent
 </li>
 
 
 <li>
-Ensure JSR223 Sampler has access to the current SampleResult
+Bug 43293 - Java Request fields not cleared when creating new sampler
 </li>
 
 
 <li>
-Bug 50977 - Unable to set TCP Sampler for individual samples
+Bug 51830 - Webservice Soap Request triggers too many popups when Webservice 
WSDL URL is down
 </li>
 
 
-</ul>
-<h3>
-Controllers
-</h3>
-<ul>
+<li>
+WebService(SOAP) request - add a connect timeout to get the wsdl used to 
populate Web Methods when server doesn't response
+</li>
 
 
 <li>
-Bug 50032 - Last_Sample_Ok along with other controllers doesnt work correctly 
when the threadgroup has multiple loops
+Bug 51841 - JMS : If an error occurs in ReceiveSubscriber constructor or 
Publisher, then Connections will stay open
 </li>
 
 
 <li>
-Bug 50080 - Transaction controller incorrectly creates samples including timer 
duration
+Bug 51691 - Authorization does not work for JMS Publisher and JMS Subscriber
 </li>
 
 
 <li>
-Bug 50134 - TransactionController : Reports bad response time when it contains 
other TransactionControllers
+Bug 51840 - JMS : Cache of InitialContext has some issues
+</li>
+
+
+<li>
+Bug 47888 - JUnit Sampler re-uses test object
 </li>
 
 
 </ul>
 <h3>
-Listeners
+Controllers
 </h3>
 <ul>
 
 
 <li>
-Bug 50367 - Clear / Clear all in View results tree does not clear selected 
element
+If Controller - Fixed two regressions introduced by bug 50032 (see bug 50618 
too)
+</li>
+
+
+<li>
+If Controller - Catches a StackOverflowError when a condition returns always 
false (after at least one iteration with return true) See bug 50618
 </li>
 
 
 </ul>
 <h3>
-Assertions
+Listeners
 </h3>
 <ul>
 
 
-<li>
-Bug 51488 - Assertion: Variable name scope is shared among all assertions (and 
Bug 51255)
-</li>
+</ul>
+<h3>
+Assertions
+</h3>
+<ul>
 
 
 </ul>
@@ -399,7 +362,7 @@ Functions
 
 
 <li>
-Bug 50568 - Function __FileToString(): Could not read file when encoding 
option is blank/empty
+Bug 48943 - Functions are invoked additional times when used in combination 
with a Config Element
 </li>
 
 
@@ -411,7 +374,7 @@ I18N
 
 
 <li>
-Bug 50811 - Incomplete Spanish translation
+WebService(SOAP) request - add I18N for some labels
 </li>
 
 
@@ -423,79 +386,32 @@ General
 
 
 <li>
-Bug 49734 - Null pointer exception on stop Threads command (Run>Stop)
+Bug 51831 - Cannot disable UDP server or change the maximum UDP port
 </li>
 
 
 <li>
-Bug 49666 - CSV Header read as data after EOF
+Bug 51821 - Add short-cut for Enabling / Disabling (sub)tree or branches in 
test plan.
 </li>
 
 
 <li>
-Bug 45703 - Synchronizing Timer
+Bug 47921 - Variables not released for GC after JMeterThread exits.
 </li>
 
 
 <li>
-Bug 50088 - fix getAvgPageBytes in SamplingStatCalculator so it returns what 
it should
+Bug 51839 - "... end of run" printed prematurely
 </li>
 
 
 <li>
-Bug 50203 Cannot set property "jmeter.save.saveservice.default_delimiter=\t"
+Bug 51847 - Some Junit tests are Locale sensitive and fail if Locale is 
different from US
 </li>
 
 
 <li>
-mirror-server.sh - fix classpath to use : separator (not ;)
-</li>
-
-
-<li>
-Bug 50286 - URL Re-writing Modifier: extracted jsessionid value is incorrect 
when is between XML tags
-</li>
-
-
-<li>
-
-System.nanoTime() tends to drift relative to System.currentTimeMillis().
-Change SampleResult to recalculate offset each time.
-Also enable reversion to using System.currentTimeMillis() only.
-
-</li>
-
-
-<li>
-Bug 50425 - Remove thread groups from Controller add menu
-</li>
-
-
-<li>
-
-Bug 50675 - CVS Data Set Config incompatible with Remote Start
-Fixed RMI startup to provide location of JMX file relative to user.dir.
-
-</li>
-
-
-<li>
-Bug 50221 - Renaming elements in the tree does not resize label
-</li>
-
-
-<li>
-Bug 51002 - Stop Thread if CSV file is not available. JMeter now treats 
IOError as EOF.
-</li>
-
-
-<li>
-Define sun.net.http.allowRestrictedHeaders=true by default. This fixes Bug 
51238.
-</li>
-
-
-<li>
-Bug 51645 - CSVDataSet does not read UTF-8 files when file.encoding is UTF-8
+Bug 51855 - Parent samples may have slightly inaccurate elapsed times
 </li>
 
 
@@ -510,35 +426,7 @@ HTTP Samplers
 
 
 <li>
-AJP Sampler now implements Interruptible
-</li>
-
-
-<li>
-Allow HTTP implementation to be selected at run-time
-</li>
-
-
-<li>
-Bug 50684 - Optionally disable Content-Type and Transfer-Encoding in Multipart 
POST
-</li>
-
-
-<li>
-Bug 50943 - Allowing concurrent downloads of embedded resources in html page
-</li>
-
-
-<li>
-Bug 50170 - Bytes reported by http sampler is after GUnZip
-<br>
-</br>
-Add optional properties to allow change the method to get response size
-</li>
-
-
-<li>
-Hiding the proxy password on HTTP Sampler (just on GUI, not in JMX file)
+Bug 51380 - Control reuse of cached SSL Context from iteration to iteration
 </li>
 
 
@@ -550,52 +438,17 @@ Other samplers
 
 
 <li>
-Bug 49622 - Allow sending messages without a subject (SMTP Sampler)
-</li>
-
-
-<li>
-Bug 49603 - Allow accepting expired certificates on Mail Reader Sampler
+Beanshell Sampler now supports Interruptible interface
 </li>
 
 
 <li>
-Bug 49775 - Allow sending messages without a body
+Bug 51605 - WebService(SOAP) Request - WebMethod field value changes 
surreptitiously for all the requests when a value is selected in a request
 </li>
 
 
 <li>
-Bug 49862 - Improve SMTPSampler Request output.
-</li>
-
-
-<li>
-Bug 50268 - Adds static and dynamic destinations to JMS Publisher
-</li>
-
-
-<li>
-JMS Subscriber - Add dynamic destination
-</li>
-
-
-<li>
-Bug 50666 - JMSSubscriber: support for durable subscriptions
-</li>
-
-
-<li>
-Bug 50937 - TCP Sampler does not provide for / honor connect timeout
-</li>
-
-
-<li>
-Bug 50569 - Jdbc Request Sampler to optionally store result set object data
-</li>
-
-
-<li>
-Bug 51011 - Mail Reader: upon authentication failure, tell what you tried
+WebService(SOAP) Request - Reorganized GUI for better design and more 
user-friendliness
 </li>
 
 
@@ -606,11 +459,6 @@ Controllers
 <ul>
 
 
-<li>
-Bug 50475 - Introduction of a Test Fragment Test Element for a better Include 
flow
-</li>
-
-
 </ul>
 <h3>
 Listeners
@@ -619,27 +467,12 @@ Listeners
 
 
 <li>
-View Results Tree - Add a dialog's text box on "Sampler result tab > Parsed" 
to display the long value with a double click on cell
-</li>
-
-
-<li>
-Bug 37156 - Formatted view of Request in Results Tree
-</li>
-
-
-<li>
-Bug 49365 - Allow result set to be written to file in a path relative to the 
loaded script
-</li>
-
-
-<li>
-Bug 50579 - Error count is long, sample count is int. Changed sample count to 
long.
+Bug 42246 - Need for a 'auto-scroll' option in "View Results Tree" and 
"Assertion Results"
 </li>
 
 
 <li>
-View Results Tree - Add new size fields: response headers and response body 
(in bytes) - derived from Bug 43363
+View Results Tree: Regexp Tester - little improvements on user interface
 </li>
 
 
@@ -650,21 +483,6 @@ Timers, Assertions, Config, Pre- & Post-
 <ul>
 
 
-<li>
-Bug 48015 - Proposal new icons for pre-processor, post-processor and assertion 
elements
-</li>
-
-
-<li>
-Bug 50962 - SizeAssertionGui validation prevents the use of variables for the 
size
-</li>
-
-
-<li>
-Size Assertion - Add response size scope (full, headers, body, code, message) 
- derived from Bug 43363
-</li>
-
-
 </ul>
 <h3>
 Functions
@@ -672,11 +490,6 @@ Functions
 <ul>
 
 
-<li>
-Bug 49975 - New function returning the name of the current sampler
-</li>
-
-
 </ul>
 <h3>
 I18N
@@ -684,11 +497,6 @@ I18N
 <ul>
 
 
-<li>
-Add French translation for the new labels and reduce size for some labels (by 
abbreviation) on HTTP Sample
-</li>
-
-
 </ul>
 <h3>
 General
@@ -697,53 +505,7 @@ General
 
 
 <li>
-Bug 30563 - Thread Group should have a start next loop option on Sample Error
-</li>
-
-
-<li>
-Bug 50347 - Eclipse setup instructions should remind user to download 
dependent jars
-</li>
-
-
-<li>
-Bug 50490 - Setup and Post Thread Group enhancements for better test flow.
-</li>
-
-
-<li>
-All BeansShell test elements now have the script variables "prev" and "Label" 
defined.
-</li>
-
-
-<li>
-Bug 50708 - Classpath jar order in NewDriver not alphabetically
-</li>
-
-
-<li>
-Bug 50659 - JMeter server does not support concurrent tests - prevent client 
from starting another
-</li>
-
-
-<li>
-Added remote shutdown functionality
-</li>
-
-
-<li>
-Client JMeter engine now supports external stop/shutdown via UDP
-</li>
-
-
-<li>
-UDP shutdown can now use a range of ports, from jmeterengine.nongui.port=4445 
to jmeterengine.nongui.maxport=4455,
-allowing multiple JMeter instances on the same host without needing to change 
the port property.
-</li>
-
-
-<li>
-Updated to httpcore 4.1.3 and httpclient 4.1.2
+Bug 51822 - (part 1) save 1 invocation of GuiPackage#getCurrentGui
 </li>
 
 
@@ -755,27 +517,12 @@ Non-functional changes
 
 
 <li>
-Bug 50008 - Allow BatchSampleSender to be subclassed
-</li>
-
-
-<li>
-Bug 50450 - use System.array copy in jacobi solver as, being native, is more 
performant.
-</li>
-
-
-<li>
-Bug 50487 - runSerialTest verifies objects that never need persisting
-</li>
-
-
-<li>
-Use Thread.setDefaultUncaughtExceptionHandler() instead of private ThreadGroup
+Bug 49976 - FormCharSetFinder visibility is default instead of public. 
 </li>
 
 
 <li>
-Update to Commons Net 3.0
+Bug 50917 - Property CookieManager.save.cookies not honored when set from test 
plan
 </li>
 
 

Modified: jakarta/jmeter/trunk/docs/changes_history.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/changes_history.html?rev=1173610&r1=1173609&r2=1173610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/changes_history.html (original)
+++ jakarta/jmeter/trunk/docs/changes_history.html Wed Sep 21 12:59:53 2011
@@ -163,6 +163,630 @@ Changes sections are chronologically ord
 </b>
 </p>
 <h1>
+Version 2.5
+</h1>
+<h2>
+Summary of main changes
+</h2>
+<ul>
+
+
+<li>
+The HTTP implementation can now be selected at run-time, and JMeter now also 
supports Apache HttpComponents HttpClient 4.x.
+Note that Commons HttpClient 3.1 is no longer actively developed, and support 
may be removed from JMeter in a future release.
+
+</li>
+
+
+<li>
+The HTTP sampler now allows concurrent downloads of embedded resources in an 
HTML page
+</li>
+
+
+<li>
+The HTTP Sampler can now report the size of a request before decompression.
+</li>
+
+
+<li>
+The JMS and Mail samplers have been improved.
+</li>
+
+
+<li>
+The new Test Fragment Test Element makes using Include Controllers easier
+</li>
+
+
+<li>
+There are various improvements to the View Results Tree Listener
+</li>
+
+
+<li>
+Bug 30563 - Thread Group should have a start next loop option on Sample Error
+</li>
+
+
+<li>
+There are two new Thread Group types - setUp and tearDown - which are run 
before and after the main Thread groups.
+</li>
+
+
+<li>
+Client-Server mode now supports external stop/shutdown via UDP
+<br>
+</br>
+ 
+multiple JMeter server instances can be started on the same host without 
needing to change the port property.
+</li>
+
+
+<li>
+Bug 50516 - "Host" header in HTTP Header Manager is not included in generated 
HTTP request
+</li>
+
+
+</ul>
+<p>
+
+
+<ul>
+
+
+</ul>
+
+
+</p>
+<h2>
+Known bugs
+</h2>
+<p>
+
+The Include Controller has some problems in non-GUI mode. 
+In particular, it can cause a NullPointerException if there are two include 
controllers with the same name.
+
+</p>
+<p>
+Once Only controller behaves correctly under a Thread Group or Loop Controller,
+but otherwise its behaviour is not consistent (or clearly specified).
+</p>
+<p>
+
+The menu item Options / Choose Language does not change all the displayed text 
to the new language.
+[The behaviour has improved, but language change is still not fully working]
+To override the default local language fully, set the JMeter property 
"language" before starting JMeter. 
+
+</p>
+<h2>
+Incompatible changes
+</h2>
+<p>
+
+Unsupported methods are no longer converted to GET by the Commons HttpClient 
sampler.
+
+</p>
+<p>
+
+Removed method public static long currentTimeInMs().
+This has been replaced by the instance method public long 
currentTimeInMillis().
+
+</p>
+<p>
+
+ProxyControl.getSamplerTypeName() now returns a String rather than an int.
+This is internal to the workings of the JMeter Proxy & its GUI, so should not 
affect any user code.
+
+</p>
+<h2>
+Bug fixes
+</h2>
+<h3>
+HTTP Samplers and Proxy
+</h3>
+<ul>
+
+
+<li>
+Bug 50178 - HeaderManager added as child of Thread Group can create 
concatenated HeaderManager names and OutOfMemoryException
+</li>
+
+
+<li>
+Bug 50392 - value is trimmed when sending the request in Multipart
+</li>
+
+
+<li>
+Bug 50686 - HeaderManager logging too verbose when merging instances
+</li>
+
+
+<li>
+Bug 50963 - AjpSampler throws java.lang.StringIndexOutOfBoundsException
+</li>
+
+
+<li>
+Bug 50516 - "Host" header in HTTP Header Manager is not included in generated 
HTTP request
+</li>
+
+
+<li>
+Bug 50544 - In Apache Common Log the HEAD requests cause problems.
+</li>
+
+
+<li>
+Bug 51268 - HTTPS request through an invalid proxy causes NullPointerException 
and does not show in result tree.
+Rather than delegating to the JMeter thread handler for "unexpected" failures, 
ensure all Exceptions generate a sample error.
+
+</li>
+
+
+<li>
+Bug 51275 - Cookie Panel clearGui() sets incorrect default policy in Java 1.6
+</li>
+
+
+</ul>
+<h3>
+Other Samplers
+</h3>
+<ul>
+
+
+<li>
+Bug 50173 - JDBCSampler discards ResultSet from a PreparedStatement
+</li>
+
+
+<li>
+Ensure JSR223 Sampler has access to the current SampleResult
+</li>
+
+
+<li>
+Bug 50977 - Unable to set TCP Sampler for individual samples
+</li>
+
+
+</ul>
+<h3>
+Controllers
+</h3>
+<ul>
+
+
+<li>
+Bug 50032 - Last_Sample_Ok along with other controllers doesnt work correctly 
when the threadgroup has multiple loops
+</li>
+
+
+<li>
+Bug 50080 - Transaction controller incorrectly creates samples including timer 
duration
+</li>
+
+
+<li>
+Bug 50134 - TransactionController : Reports bad response time when it contains 
other TransactionControllers
+</li>
+
+
+</ul>
+<h3>
+Listeners
+</h3>
+<ul>
+
+
+<li>
+Bug 50367 - Clear / Clear all in View results tree does not clear selected 
element
+</li>
+
+
+</ul>
+<h3>
+Assertions
+</h3>
+<ul>
+
+
+<li>
+Bug 51488 - Assertion: Variable name scope is shared among all assertions (and 
Bug 51255)
+</li>
+
+
+</ul>
+<h3>
+Functions
+</h3>
+<ul>
+
+
+<li>
+Bug 50568 - Function __FileToString(): Could not read file when encoding 
option is blank/empty
+</li>
+
+
+</ul>
+<h3>
+I18N
+</h3>
+<ul>
+
+
+<li>
+Bug 50811 - Incomplete Spanish translation
+</li>
+
+
+</ul>
+<h3>
+General
+</h3>
+<ul>
+
+
+<li>
+Bug 49734 - Null pointer exception on stop Threads command (Run>Stop)
+</li>
+
+
+<li>
+Bug 49666 - CSV Header read as data after EOF
+</li>
+
+
+<li>
+Bug 45703 - Synchronizing Timer
+</li>
+
+
+<li>
+Bug 50088 - fix getAvgPageBytes in SamplingStatCalculator so it returns what 
it should
+</li>
+
+
+<li>
+Bug 50203 Cannot set property "jmeter.save.saveservice.default_delimiter=\t"
+</li>
+
+
+<li>
+mirror-server.sh - fix classpath to use : separator (not ;)
+</li>
+
+
+<li>
+Bug 50286 - URL Re-writing Modifier: extracted jsessionid value is incorrect 
when is between XML tags
+</li>
+
+
+<li>
+
+System.nanoTime() tends to drift relative to System.currentTimeMillis().
+Change SampleResult to recalculate offset each time.
+Also enable reversion to using System.currentTimeMillis() only.
+
+</li>
+
+
+<li>
+Bug 50425 - Remove thread groups from Controller add menu
+</li>
+
+
+<li>
+
+Bug 50675 - CVS Data Set Config incompatible with Remote Start
+Fixed RMI startup to provide location of JMX file relative to user.dir.
+
+</li>
+
+
+<li>
+Bug 50221 - Renaming elements in the tree does not resize label
+</li>
+
+
+<li>
+Bug 51002 - Stop Thread if CSV file is not available. JMeter now treats 
IOError as EOF.
+</li>
+
+
+<li>
+Define sun.net.http.allowRestrictedHeaders=true by default. This fixes Bug 
51238.
+</li>
+
+
+<li>
+Bug 51645 - CSVDataSet does not read UTF-8 files when file.encoding is UTF-8
+</li>
+
+
+</ul>
+<h2>
+Improvements
+</h2>
+<h3>
+HTTP Samplers
+</h3>
+<ul>
+
+
+<li>
+AJP Sampler now implements Interruptible
+</li>
+
+
+<li>
+Allow HTTP implementation to be selected at run-time
+</li>
+
+
+<li>
+Bug 50684 - Optionally disable Content-Type and Transfer-Encoding in Multipart 
POST
+</li>
+
+
+<li>
+Bug 50943 - Allowing concurrent downloads of embedded resources in html page
+</li>
+
+
+<li>
+Bug 50170 - Bytes reported by http sampler is after GUnZip
+<br>
+</br>
+Add optional properties to allow change the method to get response size
+</li>
+
+
+<li>
+Hiding the proxy password on HTTP Sampler (just on GUI, not in JMX file)
+</li>
+
+
+</ul>
+<h3>
+Other samplers
+</h3>
+<ul>
+
+
+<li>
+Bug 49622 - Allow sending messages without a subject (SMTP Sampler)
+</li>
+
+
+<li>
+Bug 49603 - Allow accepting expired certificates on Mail Reader Sampler
+</li>
+
+
+<li>
+Bug 49775 - Allow sending messages without a body
+</li>
+
+
+<li>
+Bug 49862 - Improve SMTPSampler Request output.
+</li>
+
+
+<li>
+Bug 50268 - Adds static and dynamic destinations to JMS Publisher
+</li>
+
+
+<li>
+JMS Subscriber - Add dynamic destination
+</li>
+
+
+<li>
+Bug 50666 - JMSSubscriber: support for durable subscriptions
+</li>
+
+
+<li>
+Bug 50937 - TCP Sampler does not provide for / honor connect timeout
+</li>
+
+
+<li>
+Bug 50569 - Jdbc Request Sampler to optionally store result set object data
+</li>
+
+
+<li>
+Bug 51011 - Mail Reader: upon authentication failure, tell what you tried
+</li>
+
+
+</ul>
+<h3>
+Controllers
+</h3>
+<ul>
+
+
+<li>
+Bug 50475 - Introduction of a Test Fragment Test Element for a better Include 
flow
+</li>
+
+
+</ul>
+<h3>
+Listeners
+</h3>
+<ul>
+
+
+<li>
+View Results Tree - Add a dialog's text box on "Sampler result tab > Parsed" 
to display the long value with a double click on cell
+</li>
+
+
+<li>
+Bug 37156 - Formatted view of Request in Results Tree
+</li>
+
+
+<li>
+Bug 49365 - Allow result set to be written to file in a path relative to the 
loaded script
+</li>
+
+
+<li>
+Bug 50579 - Error count is long, sample count is int. Changed sample count to 
long.
+</li>
+
+
+<li>
+View Results Tree - Add new size fields: response headers and response body 
(in bytes) - derived from Bug 43363
+</li>
+
+
+</ul>
+<h3>
+Timers, Assertions, Config, Pre- & Post-Processors
+</h3>
+<ul>
+
+
+<li>
+Bug 48015 - Proposal new icons for pre-processor, post-processor and assertion 
elements
+</li>
+
+
+<li>
+Bug 50962 - SizeAssertionGui validation prevents the use of variables for the 
size
+</li>
+
+
+<li>
+Size Assertion - Add response size scope (full, headers, body, code, message) 
- derived from Bug 43363
+</li>
+
+
+</ul>
+<h3>
+Functions
+</h3>
+<ul>
+
+
+<li>
+Bug 49975 - New function returning the name of the current sampler
+</li>
+
+
+</ul>
+<h3>
+I18N
+</h3>
+<ul>
+
+
+<li>
+Add French translation for the new labels and reduce size for some labels (by 
abbreviation) on HTTP Sample
+</li>
+
+
+</ul>
+<h3>
+General
+</h3>
+<ul>
+
+
+<li>
+Bug 30563 - Thread Group should have a start next loop option on Sample Error
+</li>
+
+
+<li>
+Bug 50347 - Eclipse setup instructions should remind user to download 
dependent jars
+</li>
+
+
+<li>
+Bug 50490 - Setup and Post Thread Group enhancements for better test flow.
+</li>
+
+
+<li>
+All BeansShell test elements now have the script variables "prev" and "Label" 
defined.
+</li>
+
+
+<li>
+Bug 50708 - Classpath jar order in NewDriver not alphabetically
+</li>
+
+
+<li>
+Bug 50659 - JMeter server does not support concurrent tests - prevent client 
from starting another
+</li>
+
+
+<li>
+Added remote shutdown functionality
+</li>
+
+
+<li>
+Client JMeter engine now supports external stop/shutdown via UDP
+</li>
+
+
+<li>
+UDP shutdown can now use a range of ports, from jmeterengine.nongui.port=4445 
to jmeterengine.nongui.maxport=4455,
+allowing multiple JMeter instances on the same host without needing to change 
the port property.
+</li>
+
+
+<li>
+Updated to httpcore 4.1.3 and httpclient 4.1.2
+</li>
+
+
+</ul>
+<h2>
+Non-functional changes
+</h2>
+<ul>
+
+
+<li>
+Bug 50008 - Allow BatchSampleSender to be subclassed
+</li>
+
+
+<li>
+Bug 50450 - use System.array copy in jacobi solver as, being native, is more 
performant.
+</li>
+
+
+<li>
+Bug 50487 - runSerialTest verifies objects that never need persisting
+</li>
+
+
+<li>
+Use Thread.setDefaultUncaughtExceptionHandler() instead of private ThreadGroup
+</li>
+
+
+<li>
+Update to Commons Net 3.0
+</li>
+
+
+</ul>
+<h1>
 Version 2.4
 </h1>
 <h2>

Modified: jakarta/jmeter/trunk/docs/usermanual/build-web-test-plan.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/build-web-test-plan.html?rev=1173610&r1=1173609&r2=1173610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/build-web-test-plan.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/build-web-test-plan.html Wed Sep 21 
12:59:53 2011
@@ -218,7 +218,7 @@ in the tree, if you have not already sel
 Group Control Panel in the right section of the JMeter window (see Figure 5.1
 below)
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  
src="../images/screenshots/webtest/threadgroup.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='612' 
height='266' src="../images/screenshots/webtest/threadgroup.png"><br>
 <font size="-1">
 Figure 5.1. Thread Group with Default Values
 </font></td></tr></table></p>
@@ -258,7 +258,7 @@ leave the Control Panel (for example, wh
 <p>
 See Figure 5.2 for the completed Jakarta Users Thread Group.
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  
src="../images/screenshots/webtest/threadgroup2.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='791' 
height='321' src="../images/screenshots/webtest/threadgroup2.png"><br>
 <font size="-1">
 Figure 5.2. Jakarta Users Thread Group
 </font></td></tr></table></p>
@@ -286,7 +286,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  
src="../images/screenshots/webtest/http-defaults1.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='851' 
height='494' src="../images/screenshots/webtest/http-defaults1.png"><br>
 <font size="-1">
 Figure 5.3. HTTP Request Defaults
 </font></td></tr></table></p>
@@ -316,7 +316,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  
src="../images/screenshots/webtest/http-defaults2.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='851' 
height='494' 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>
@@ -409,7 +409,7 @@ element.
 
 
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  
src="../images/screenshots/webtest/http-request1.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='902' 
height='705' src="../images/screenshots/webtest/http-request1.png"><br>
 <font size="-1">
 Figure 5.5. HTTP Request for Jakarta Home Page
 </font></td></tr></table></p>
@@ -434,7 +434,7 @@ Set the Path field to "/site/guidelines.
 
 
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  
src="../images/screenshots/webtest/http-request2.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='902' 
height='705' src="../images/screenshots/webtest/http-request2.png"><br>
 <font size="-1">
 Figure 5.6. HTTP Request for Jakarta Project Guidelines Page
 </font></td></tr></table></p>
@@ -468,7 +468,7 @@ Select the Jakarta Users element and add
 output file.  You can either type it into the filename field, or select the
 Browse button and browse to a directory and then enter a filename.
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  
src="../images/screenshots/graph_results.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='853' 
height='453' src="../images/screenshots/graph_results.png"><br>
 <font size="-1">
 Figure 5.7. Graph Results Listener
 </font></td></tr></table></p>
@@ -508,7 +508,7 @@ Sometimes the login form contains additi
 These will need to be added as well.
 
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  
src="../images/screenshots/webtest/http_login.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='687' 
height='661' src="../images/screenshots/webtest/http_login.png"><br>
 <font size="-1">
 Figure 5.8. Sample HTTP login request
 </font></td></tr></table></p>

Modified: jakarta/jmeter/trunk/docs/usermanual/build-ws-test-plan.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/build-ws-test-plan.html?rev=1173610&r1=1173609&r2=1173610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/build-ws-test-plan.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/build-ws-test-plan.html Wed Sep 21 
12:59:53 2011
@@ -163,7 +163,7 @@ Thread Group
 </a>
 ,
 
-<a 
href="../usermanual/component_reference.html#WebService(SOAP)_Request_(Beta_Code)">WebService(SOAP)
 Request (Beta Code)</a>
+<a 
href="../usermanual/component_reference.html#WebService(SOAP)_Request">WebService(SOAP)
 Request</a>
 , and
 
 <a href="../usermanual/component_reference.html#Graph_Results">Graph 
Results</a>
@@ -293,10 +293,9 @@ get a better idea of the differences.
 </p>
 <p>
 Start by adding the sampler 
-<a 
href="../usermanual/component_reference.html#WebService(SOAP)_Request_(Beta_Code)">WebService(SOAP)
 Request (Beta Code)</a>
+<a 
href="../usermanual/component_reference.html#WebService(SOAP)_Request">WebService(SOAP)
 Request</a>
 
-to the Jakarta Users element (Add --> Sampler --> WebService(SOAP) Request
- (Beta Code) ).
+to the Jakarta Users element (Add --> Sampler --> WebService(SOAP) Request).
 Then, select the webservice Request element in the tree and edit the following 
properties
 (see Figure 10.5):
 
@@ -304,7 +303,7 @@ Then, select the webservice Request elem
 
 
 <li>
-Change the Name field to "WebService(SOAP) Request (Beta Code)".
+Change the Name field to "WebService(SOAP) Request".
 </li>
 
 
@@ -396,7 +395,7 @@ Select the Jakarta Users element and add
 output file.  You can either type it into the filename field, or select the
 Browse button and browse to a directory and then enter a filename.
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  
src="../images/screenshots/graph_results.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='853' 
height='453' src="../images/screenshots/graph_results.png"><br>
 <font size="-1">
 Figure 10.7. Graph Results Listener
 </font></td></tr></table></p>

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=1173610&r1=1173609&r2=1173610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Wed Sep 21 
12:59:53 2011
@@ -140,6 +140,9 @@ style="border-width:0; float: left" fram
 </table>
 <br>
 <ul>
+<li><a href="#introduction">18.0 Introduction</a></li>
+<ul>
+</ul>
 <li><a href="#samplers">18.1 Samplers</a></li>
 <ul>
 <li><a href="#FTP_Request">FTP Request</a></li>
@@ -300,6 +303,47 @@ style="border-width:0; float: left" fram
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="introduction"><strong>18.0 Introduction</strong></a><a 
class="sectionlink" href="#introduction" title="Link to here">&para;</a></font>
+</td></tr>
+<tr><td>
+<blockquote>
+<description>
+
+
+<p>
+
+
+
+</p>
+
+ 
+<p>
+<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" 
cellpadding="2">
+<tr><td>
+ Several test elements use JMeter properties to control their behaviour.
+ These properties are normally resolved when the class is loaded.
+ This generally occurs before the test plan starts, so it's not possible to 
change the settings by using the __setProperty() function.
+
+</td></tr>
+</table>
+</p>
+
+
+<p>
+
+
+</p>
+
+
+</description>
+</blockquote>
+</p>
+</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="samplers"><strong>18.1 Samplers</strong></a><a class="sectionlink" 
href="#samplers" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
@@ -497,7 +541,7 @@ external scripts
 
         
 <li>
-frames
+frames, iframes
 </li>
 
         
@@ -661,6 +705,17 @@ https.sessioncontext.shared=true
 
 </pre>
 
+        By default, the SSL context is retained for the duration of the test.
+        In versions of JMeter from 2.5.1, the SSL session can be optionally 
reset for each test iteration.
+        To enable this, set the JMeter property:
+
+<pre>
+
+https.use.cached.ssl.context=false
+
+</pre>
+
+        Note: this does not apply to the Java HTTP implementation.
         
 </p>
 
@@ -717,7 +772,7 @@ If the request uses a technique called "
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  src="../images/screenshots/http-request.png"></div>
+<div align="center"><img width='911' height='642' 
src="../images/screenshots/http-request.png"></div>
 <p>
 <b>Parameters</b>
 <a name="HTTP_Request_parms"/>
@@ -1267,6 +1322,24 @@ To return to settings before version 2.5
 
 
 </p>
+<p>
+
+
+<b>
+Retry handling
+</b>
+<br>
+</br>
+
+In version 2.5 of JMeter, the HttpClient4 sampler used the default retry 
count, which was 3.
+As this can hide server errors, JMeter now sets the retry count to 0 to 
prevent any automatic retries.
+This can be overridden by setting the JMeter property 
+<b>
+httpclient4.retrycount
+</b>
+.
+
+</p>
 <p><b>See Also:</b>
 <ul>
 <li><a href="test_plan.html#assertions">Assertion</a></li>
@@ -1878,7 +1951,7 @@ If this is zero, then the request is mar
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='460' height='781' 
src="../images/screenshots/webservice_sampler.png"></div>
+<div align="center"><img width='943' height='648' 
src="../images/screenshots/webservice_sampler.png"></div>
 <p>
 <b>Parameters</b>
 <a name="WebService(SOAP)_Request_parms"/>
@@ -1938,6 +2011,14 @@ Yes
 </td>
 </tr>
 <tr>
+<td>Timeout</td>
+<td>Connection timeout.
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
 <td>Path</td>
 <td>Path for the webservice.
 </td>
@@ -1970,8 +2051,8 @@ No
 </td>
 </tr>
 <tr>
-<td>Message Folder</td>
-<td>Folder containing soap files
+<td>Message(s) Folder</td>
+<td>Folder containing soap files. Files are choose randomly during test.
 </td>
 <td>
 No
@@ -1989,6 +2070,14 @@ Yes
 </td>
 </tr>
 <tr>
+<td>Read SOAP Response</td>
+<td>Read the SOAP reponse (consumes performance). Permit to have assertions or 
post-processors
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
 <td>Use HTTP Proxy</td>
 <td>Check box if http proxy should be used
 </td>
@@ -1997,7 +2086,7 @@ No
 </td>
 </tr>
 <tr>
-<td>Proxy Host</td>
+<td>Server Name or IP</td>
 <td>Proxy hostname
 </td>
 <td>
@@ -2005,7 +2094,7 @@ No
 </td>
 </tr>
 <tr>
-<td>Proxy Port</td>
+<td>Port Number</td>
 <td>Proxy host port
 </td>
 <td>
@@ -2042,7 +2131,7 @@ If you are going to send multiple reques
  also using for Login and password.
   
 <p><b>Control Panel</b></p>
-<div align="center"><img  src="../images/screenshots/ldap_request.png"></div>
+<div align="center"><img width='621' height='462' 
src="../images/screenshots/ldap_request.png"></div>
 <p>
 There are two ways to create test cases for testing an LDAP Server.
 </p>
@@ -2322,7 +2411,7 @@ If you are going to send multiple reques
 </p>
  
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/ldapext_request.png"></div>
+<div align="center"><img width='619' height='371' 
src="../images/screenshots/ldapext_request.png"></div>
 <p>
 There are nine test operations defined. These operations are given below:
 </p>
@@ -3056,12 +3145,20 @@ BeanShell website.
 
 <p>
 
-The test element supports the ThreadListener and TestListener methods.
-These should be defined in the initialisation file.
+The test element supports the ThreadListener and TestListener interface 
methods.
+These must be defined in the initialisation file.
 See the file BeanShellListeners.bshrc for example definitions.
 
 </p>
 
+
+<p>
+
+From JMeter version 2.5.1, the BeanShell sampler also supports the 
Interruptible interface.
+The interrupt() method can be defined in the script or the init file.
+
+</p>
+
        
 <p><b>Control Panel</b></p>
 <div align="center"><img width='592' height='303' 
src="../images/screenshots/beanshellsampler.png"></div>
@@ -3921,7 +4018,7 @@ No
 
        
 <p><b>Control Panel</b></p>
-<div align="center"><img  src="../images/screenshots/jmspublisher.png"></div>
+<div align="center"><img width='636' height='628' 
src="../images/screenshots/jmspublisher.png"></div>
 <p>
 <b>Parameters</b>
 <a name="JMS_Publisher_parms"/>
@@ -4232,7 +4329,7 @@ dynamicTopics/TOPICNAME
 
        
 <p><b>Control Panel</b></p>
-<div align="center"><img  src="../images/screenshots/jmssubscriber.png"></div>
+<div align="center"><img width='682' height='439' 
src="../images/screenshots/jmssubscriber.png"></div>
 <p>
 <b>Parameters</b>
 <a name="JMS_Subscriber_parms"/>
@@ -4706,6 +4803,7 @@ In versions of JMeter after 2.3.1, you c
 There are some important differences between standard JUnit test runners and 
JMeter's
 implementation. Rather than make a new instance of the class for each test, 
JMeter
 creates 1 instance per sampler and reuses it.
+This can be changed with checkbox "Create a new instance per sample".
 <br>
 </br>
 
@@ -4741,7 +4839,7 @@ Here are some general guidelines for wri
 5. Each sampler creates an instance of the test class, so write your test so 
the setup happens in oneTimeSetUp and oneTimeTearDown.
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='457' height='507' 
src="../images/screenshots/junit_sampler.png"></div>
+<div align="center"><img width='397' height='536' 
src="../images/screenshots/junit_sampler.png"></div>
 <p>
 <b>Parameters</b>
 <a name="JUnit_Request_parms"/>
@@ -4871,6 +4969,14 @@ Yes
 Yes
 </td>
 </tr>
+<tr>
+<td>Create a new Instance per sample</td>
+<td>Whether or not to create a new JUnit instance for each sample. Defaults to 
false, meaning JUnit TestCase is created one and reused.
+</td>
+<td>
+Yes
+</td>
+</tr>
 </table>
 </p>
 <p>
@@ -5199,7 +5305,7 @@ jmeterengine.threadstop.wait
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  src="../images/screenshots/test_action.png"></div>
+<div align="center"><img width='330' height='158' 
src="../images/screenshots/test_action.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Test_Action_parms"/>
@@ -5575,7 +5681,7 @@ storage device.
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/logic-controller/simple-controller.png"></div>
+<div align="center"><img width='330' height='77' 
src="../images/screenshots/logic-controller/simple-controller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Simple_Controller_parms"/>
@@ -5638,7 +5744,7 @@ count to three, JMeter will send a total
 
 </p>
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/logic-controller/loop-controller.png"></div>
+<div align="center"><img width='326' height='114' 
src="../images/screenshots/logic-controller/loop-controller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Loop_Controller_parms"/>
@@ -5751,7 +5857,7 @@ to login once to establish a session.
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/logic-controller/once-only-controller.png"></div>
+<div align="center"><img width='330' height='78' 
src="../images/screenshots/logic-controller/once-only-controller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Once_Only_Controller_parms"/>
@@ -5822,7 +5928,7 @@ other controllers for each loop iteratio
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/logic-controller/interleave-controller.png"></div>
+<div align="center"><img width='329' height='104' 
src="../images/screenshots/logic-controller/interleave-controller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Interleave_Controller_parms"/>
@@ -6085,7 +6191,7 @@ what results any given interaction will 
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/logic-controller/random-controller.png"></div>
+<div align="center"><img width='328' height='100' 
src="../images/screenshots/logic-controller/random-controller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Random_Controller_parms"/>
@@ -6123,7 +6229,7 @@ The Random Order Controller is much like
 
        
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/randomordercontroller.png"></div>
+<div align="center"><img width='328' height='76' 
src="../images/screenshots/randomordercontroller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Random_Order_Controller_parms"/>
@@ -6177,7 +6283,7 @@ setting is reset when a parent Loop Cont
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/throughput_controller.png"></div>
+<div align="center"><img width='329' height='167' 
src="../images/screenshots/throughput_controller.png"></div>
 <p>
 <table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" 
cellpadding="2">
 <tr><td>The Throughput Controller can yield very complex behavior when 
combined with other controllers - in particular with interleave or random 
controllers as parents (also very useful).
@@ -6245,7 +6351,7 @@ The Runtime Controller controls how long
 
        
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/runtimecontroller.png"></div>
+<div align="center"><img width='328' height='100' 
src="../images/screenshots/runtimecontroller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Runtime_Controller_parms"/>
@@ -6330,7 +6436,7 @@ ${__jexl(${VAR} == 23)}
 
        
 <p><b>Control Panel</b></p>
-<div align="center"><img  src="../images/screenshots/ifcontroller.png"></div>
+<div align="center"><img width='497' height='131' 
src="../images/screenshots/ifcontroller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="If_Controller_parms"/>
@@ -6534,7 +6640,7 @@ ${_P(property)} - where property is set 
 
        
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/whilecontroller.png"></div>
+<div align="center"><img width='362' height='102' 
src="../images/screenshots/whilecontroller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="While_Controller_parms"/>
@@ -6609,7 +6715,7 @@ If there is no default, then no element 
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/switchcontroller.png"></div>
+<div align="center"><img width='361' height='106' 
src="../images/screenshots/switchcontroller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Switch_Controller_parms"/>
@@ -6711,7 +6817,7 @@ This would be the case if the Regular Ex
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/logic-controller/foreach-controller.png"></div>
+<div align="center"><img width='380' height='152' 
src="../images/screenshots/logic-controller/foreach-controller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="ForEach_Controller_parms"/>
@@ -6916,7 +7022,7 @@ otherwise a duplicate may be accidentall
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/module_controller.png"></div>
+<div align="center"><img width='504' height='217' 
src="../images/screenshots/module_controller.png"></div>
 <p>
 <table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" 
cellpadding="2">
 <tr><td>The Module Controller should not be used with remote testing or 
non-gui testing in conjunction with Workbench components since the Workbench 
test elements are not part of test plan .jmx files.  Any such test will fail.
@@ -7016,7 +7122,7 @@ attempts to open the fileName relative t
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/includecontroller.png"></div>
+<div align="center"><img width='417' height='130' 
src="../images/screenshots/includecontroller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Include_Controller_parms"/>
@@ -7123,7 +7229,7 @@ The generated sample is only regarded as
 
        
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/transactioncontroller.png"></div>
+<div align="center"><img width='378' height='129' 
src="../images/screenshots/transactioncontroller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Transaction_Controller_parms"/>
@@ -7188,7 +7294,7 @@ be saved under the Recording Controller.
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/logic-controller/recording-controller.png"></div>
+<div align="center"><img width='420' height='79' 
src="../images/screenshots/logic-controller/recording-controller.png"></div>
 <p>
 <b>Parameters</b>
 <a name="Recording_Controller_parms"/>
@@ -7598,7 +7704,7 @@ that factored out delays and JMeter's pr
 number.
 </p>
 <p><b>Control Panel</b></p>
-<div align="center"><img width='605' height='435' 
src="../images/screenshots/graph_results.png"></div>
+<div align="center"><img width='853' height='453' 
src="../images/screenshots/graph_results.png"></div>
 <p>
 The following table briefly describes the items on the graph. 
 Further details on the precise meaning of the statistical terms can be found 
on the web
@@ -7745,7 +7851,7 @@ HTML
 
 
 <li>
-HTML (download embedded resources)
+HTML (download resources)
 </li>
 
 
@@ -7773,6 +7879,11 @@ XML
 
 
 <p>
+Scroll automatically? option permit to have last node display in tree selection
+</p>
+
+
+<p>
 
 Additional renderers can be created.
 The class must implement the interface 
@@ -7903,18 +8014,18 @@ See Figure 9b (below).
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='778' height='642' 
src="../images/screenshots/view_results_tree.png"></div>
+<div align="center"><img width='869' height='654' 
src="../images/screenshots/view_results_tree.png"></div>
 <p>
 
        The Control Panel (above) shows an example of an HTML display.
        Figure 9 (below) shows an example of an XML display.
 
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='751' 
height='461' src="../images/screenshots/view_results_tree_xml.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='873' 
height='653' src="../images/screenshots/view_results_tree_xml.png"><br>
 <font size="-1">Figure 9 Sample XML display
 </font></td></tr></table></p>
 
 
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='824' 
height='637' src="../images/screenshots/view_results_tree_regex.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='858' 
height='643' src="../images/screenshots/view_results_tree_regex.png"><br>
 <font size="-1">Figure 9a Sample Regexp Test display
 </font></td></tr></table></p>
 
@@ -8227,7 +8338,7 @@ know for sure is to use a profiling tool
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='655' height='501' 
src="../images/screenshots/distribution_graph.png"></div>
+<div align="center"><img width='819' height='626' 
src="../images/screenshots/distribution_graph.png"></div>
 </td></tr>
 <tr><td><br></td></tr>
 </table>
@@ -8982,7 +9093,25 @@ Generates a summary of the test run so f
 standard output. Both running and differential totals are shown.
 Output is generated every n seconds (default 3 minutes) on the appropriate
 time boundary, so that multiple test runs on the same time will be 
synchronised.
-The interval is defined by the property "summariser.interval" - see 
jmeter.properties.
+See jmeter.properties file for the summariser configuration items:
+
+<pre>
+
+# Define the following property to automatically start a summariser with that 
name
+# (applies to non-GUI mode only)
+#summariser.name=summary
+#
+# interval between summaries (in seconds) default 3 minutes
+#summariser.interval=180
+#
+# Write messages to log file
+#summariser.log=true
+#
+# Write messages to System.out
+#summariser.out=true
+
+</pre>
+
 This element is mainly intended for batch (non-GUI) runs.
 The output looks like the following:
 
@@ -9585,7 +9714,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='243' 
src="../images/screenshots/http-config/auth-manager-example1b.png"><br>
+<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>
 <font size="-1">Figure 11 - Authorization Manager Control Panel
 </font></td></tr></table></p>
 
@@ -9905,7 +10034,7 @@ JMeter 2.3 and later treat all port valu
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img  
src="../images/screenshots/http-config/http-request-defaults.png"></div>
+<div align="center"><img width='853' height='463' 
src="../images/screenshots/http-config/http-request-defaults.png"></div>
 <p>
 <b>Parameters</b>
 <a name="HTTP_Request_Defaults_parms"/>
@@ -11239,7 +11368,7 @@ prev.getSubResults()
 
     or the following
     
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='765' 
height='55' src="../images/screenshots/assertion/assertionscopevar.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='756' 
height='55' src="../images/screenshots/assertion/assertionscopevar.png"><br>
 <font size="-1">Assertion Scope
 </font></td></tr></table></p>
 

Modified: jakarta/jmeter/trunk/docs/usermanual/get-started.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/get-started.html?rev=1173610&r1=1173609&r2=1173610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/get-started.html Wed Sep 21 12:59:53 
2011
@@ -314,31 +314,19 @@ JMeter because of JRE implementation iss
 <p>
 JMeter is a 100% Java application and should run correctly on any system
 that has a compliant Java implementation.
-<br>
-</br>
-
-JMeter has been tested and works under:
-
 </p>
-<ul>
-
-
-<li>
-Unix (Solaris, Linux, etc)
-</li>
-
-
-<li>
-Windows (98, NT, XP, etc)
-</li>
-
-
-<li>
-OpenVMS Alpha 7.3+
-</li>
+<p>
+Operating systems tested with JMeter can be view on  
 
+<a 
href="http://wiki.apache.org/jakarta-jmeter/JMeterAndOperatingSystemsTested";>
+this page
+</a>
 
-</ul>
+on JMeter wiki.
+</p>
+<p>
+Even if your OS is not listed on the wiki page, JMeter should run on it 
provided that the JVM is compliant.
+</p>
 </blockquote>
 </td></tr>
 <tr><td><br></td></tr>

Modified: jakarta/jmeter/trunk/docs/usermanual/glossary.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/glossary.html?rev=1173610&r1=1173609&r2=1173610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/glossary.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/glossary.html Wed Sep 21 12:59:53 2011
@@ -236,6 +236,7 @@ See, for example: 
 Standard Deviation
 </a>
  entry at Wikipedia.
+JMeter calculates the population standard deviation (e.g. STDEVP function in 
spreadheets), not the sample standard deviation (e.g. STDEV).
 
 </p>
 <p>

Modified: jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=1173610&r1=1173609&r2=1173610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html Wed Sep 21 
12:59:53 2011
@@ -752,6 +752,16 @@ Match ExAct case or (?i)ArBiTrARY(?-i) c
 <blockquote>
 <p>
 
+Since JMeter 2.4, the listener 
+<a href="component_reference.html#View_Results_Tree">
+View Results Tree
+</a>
+
+include a RegExp Tester to test regular expressions directly on sampler 
response data. 
+
+</p>
+<p>
+
 There is a 
 <a href="http://jakarta.apache.org/oro/demo.html";>
 demo



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

Reply via email to