Prepare next release 2.11: update docs tree and overview (RC1)

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1554529 13f79535-47bb-0310-9956-ffa450edef68

docs/changes.html

@@ -254,8 +254,108 @@ Thanks
 </ul>
 <br/><br/><table width="100%" cellpadding="3" cellspacing="2" bgcolor="#525D76" border="0">
 <tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big><big><a name="New and Noteworthy">New and Noteworthy</a></big></big></b></font></td></tr></table><br/>
-<br/><br/><table width="90%" cellpadding="2" cellspacing="2" bgcolor="#828DA6" border="0">
+<br/><table width="80%" cellpadding="1" cellspacing="2" bgcolor="#828DA6" border="0">
-<tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big>Core Improvements</big></b></font></td></tr></table><br/>
+<tr><td><font color="white" face="Helvetica, Arial, sans-serif">HTTP(S) Test Script Recorder improvements</font></td></tr></table>
+<p>
+
+Following improvements have been made since major changes introduced in JMeter 2.10 on HTTP(S) Test Script Recorder:
+
+<ul>
+
+
+<li>
+Better detection of missing or invalid configuration of keytool utility
+</li>
+
+
+<li>
+New system property keytool.directory (see system.properties) lets you configure directory containing keytool in case on non-standard installation
+</li>
+
+
+</ul>
+
+
+</p>
+<br/><table width="80%" cellpadding="1" cellspacing="2" bgcolor="#828DA6" border="0">
+<tr><td><font color="white" face="Helvetica, Arial, sans-serif">JMS Publisher/Point to Point : Add ability to set typed values in JMS header properties</font></td></tr></table>
+<p>
+In the samplers JMS Publisher and JMS Point-to-Point, you can now set up the class of values for the JMS header properties. Previously only String was possible.
+</p>
+<p>
+
+
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='928' height='796' src="./images/screenshots/changes/2.11/01_jms_properties_typed_values.png"/><br>
+<font size="-1"></font></td></tr></table></p>
+
+
+</p>
+<br/><table width="80%" cellpadding="1" cellspacing="2" bgcolor="#828DA6" border="0">
+<tr><td><font color="white" face="Helvetica, Arial, sans-serif">View Results Tree : Add an XPath Tester </font></td></tr></table>
+<p>
+In View Results Tree listener, a new XPath tester can be used to test XPATH expressions.
+</p>
+<p>
+
+
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='990' height='765' src="./images/screenshots/changes/2.11/03_xpath_tester.png"/><br>
+<font size="-1"></font></td></tr></table></p>
+
+
+</p>
+<br/><table width="80%" cellpadding="1" cellspacing="2" bgcolor="#828DA6" border="0">
+<tr><td><font color="white" face="Helvetica, Arial, sans-serif">Ability to choose the client alias for the cert key in JsseSslManager such that Mutual SSL auth testing can be made more flexible</font></td></tr></table>
+<p>
+When testing client based certificate authentications you have now better control on certificate you use through a new field "Variable name holding certificate alias", this 
+field lets you select the certificate you want to send to server to authenticate. You can use a CSV Data Set as a holder for the variable value.
+</p>
+<p>
+
+
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='471' height='189' src="./images/screenshots/changes/2.11/07_keystore_config.png"/><br>
+<font size="-1"></font></td></tr></table></p>
+
+
+</p>
+<br/><table width="80%" cellpadding="1" cellspacing="2" bgcolor="#828DA6" border="0">
+<tr><td><font color="white" face="Helvetica, Arial, sans-serif">Add a "Save as Test Fragment" option </font></td></tr></table>
+<p>
+In the file menu, a new option allow to save a group of elements as a Test fragment.
+</p>
+<p>
+
+
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='295' height='242' src="./images/screenshots/changes/2.11/05_save_as_fragement.png"/><br>
+<font size="-1"></font></td></tr></table></p>
+
+
+</p>
+<br/><table width="80%" cellpadding="1" cellspacing="2" bgcolor="#828DA6" border="0">
+<tr><td><font color="white" face="Helvetica, Arial, sans-serif">Summariser is be enabled by default in Non GUI mode</font></td></tr></table>
+<p>
+When you run JMeter from command line, now JMeter displays some statistics from the Summariser mode.
+</p>
+<p>
+
+
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='1287' height='386' src="./images/screenshots/changes/2.11/06_summariser.png"/><br>
+<font size="-1"></font></td></tr></table></p>
+
+
+</p>
+<br/><table width="80%" cellpadding="1" cellspacing="2" bgcolor="#828DA6" border="0">
+<tr><td><font color="white" face="Helvetica, Arial, sans-serif">Transaction Controller:Change default property "Include duration of timer..." for newly created element</font></td></tr></table>
+<p>
+Starting from 2.11, Transaction Controller is configured by default to exclude processing time of pre/post processors as long as timers pause.
+</p>
+<p>
+
+
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='628' height='140' src="./images/screenshots/changes/2.11/02_transaction_controller.png"/><br>
+<font size="-1"></font></td></tr></table></p>
+
+
+</p>
 <br/><br/><table width="100%" cellpadding="3" cellspacing="2" bgcolor="#525D76" border="0">
 <tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big><big><a name="Known bugs">Known bugs</a></big></big></b></font></td></tr></table><br/>
 <ul>
@@ -280,21 +380,11 @@ or a Debug Sampler with all fields set to False (to reduce the sample size).
 
 
 
-<li>
-Webservice sampler does not consider the HTTP response status to compute the status of a response, thus a response 500 containing a non empty body will be considered as successful, see 
-<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=54006">Bug 54006</a>
-.
-To workaround this issue, ensure you always read the response and add a Response Assertion checking text inside the response.
-
-</li>
-
-
-
 <li>
 
 The numbers that appear to the left of the green box are the number of active threads / total number of threads, 
-these only apply to a locally run test; they do not include any threads started on remote systems when using client-server mode, (see 
+the total number of threads only applies to a locally run test, otherwise it will show 0 (see 
-<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=54152">Bug 54152</a>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55510">Bug 55510</a>
 ).
 
 </li>
@@ -356,6 +446,23 @@ A workaround is to use a Java 7 update 40 runtime which fixes this issue.
 
 
 <li>
+When creating a new Transaction Controller, property "Include duration of timer and pre-post processors in generated sample" will be unchecked starting from version 2.11
+</li>
+
+
+<li>
+In Non GUI mode, since 2.11 summariser is enabled with a 30 seconds frequency
+</li>
+
+
+<li>
+JMeter is more lenient with redirect handling and relaxes on RFC2616 by allowing relative locations. See property "jmeter.httpclient.strict_rfc2616" in jmeter.properties to change this behaviour, see 
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55717">Bug 55717</a>
+</li>
+
+
+<li>
+When creating a new Response Assertion, property "Pattern Matching Rules" now defaults to Substring starting from version 2.11
 </li>
 
 
@@ -363,11 +470,23 @@ A workaround is to use a Java 7 update 40 runtime which fixes this issue.
 <br/><br/><table width="100%" cellpadding="3" cellspacing="2" bgcolor="#525D76" border="0">
 <tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big><big><a name="Bug fixes">Bug fixes</a></big></big></b></font></td></tr></table><br/>
 <h3>
-HTTP Samplers and Proxy
+HTTP Samplers and Test Script Recorder
 </h3>
 <ul>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55815">Bug 55815</a>
+ - Proxy#getDomainMatch does not handle wildcards correctly
+</li>
+
+
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55717">Bug 55717</a>
+ - Bad handling of Redirect when URLs are in relative format by HttpClient4 and HttpClient3.1
+</li>
+
+
 </ul>
 <h3>
 Other Samplers
@@ -388,6 +507,12 @@ Controllers
 <ul>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55816">Bug 55816</a>
+ - Transaction Controller with "Include duration of timer..." unchecked does not ignore processing time of last child sampler
+</li>
+
+
 </ul>
 <h3>
 Listeners
@@ -395,6 +520,12 @@ Listeners
 <ul>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55826">Bug 55826</a>
+ - Unsynchronised concurrent accesses to list in field RespTimeGraphVisualizer.internalList 
+</li>
+
+
 </ul>
 <h3>
 Timers, Assertions, Config, Pre- & Post-Processors
@@ -404,7 +535,7 @@ Timers, Assertions, Config, Pre- & Post-Processors
 
 <li>
 <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55694">Bug 55694</a>
- - java.lang.NullPointerException if Apply to is set to a missing JMeter variable
+ - Assertions and Extractors : Avoid NullPointerException when scope is variable and variable is missing
 </li>
 
 
@@ -421,6 +552,12 @@ Functions
 <ul>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55871">Bug 55871</a>
+ - Wrong result with intSum() function when a space character is present before/after the number. Contributed by Milamber based on a proposal by James Liang.
+</li>
+
+
 </ul>
 <h3>
 I18N
@@ -435,6 +572,12 @@ General
 <ul>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55739">Bug 55739</a>
+ - Remote Test : Total threads in GUI mode shows invalid total number of threads
+</li>
+
+
 </ul>
 <br/><br/><table width="100%" cellpadding="3" cellspacing="2" bgcolor="#525D76" border="0">
 <tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big><big><a name="Improvements">Improvements</a></big></big></b></font></td></tr></table><br/>
@@ -451,6 +594,12 @@ Other samplers
 <ul>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55589">Bug 55589</a>
+ - JMS Publisher/Point to Point : Add ability to set typed values in JMS header properties.
+</li>
+
+
 </ul>
 <h3>
 Controllers
@@ -458,6 +607,12 @@ Controllers
 <ul>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55854">Bug 55854</a>
+ - Transaction Controller:Change default property "Include duration of timer..." for newly created element
+</li>
+
+
 </ul>
 <h3>
 Listeners
@@ -465,6 +620,12 @@ Listeners
 <ul>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55610">Bug 55610</a>
+ - View Results Tree : Add an XPath Tester
+</li>
+
+
 </ul>
 <h3>
 Timers, Assertions, Config, Pre- & Post-Processors
@@ -472,6 +633,18 @@ Timers, Assertions, Config, Pre- & Post-Processors
 <ul>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55908">Bug 55908</a>
+ - Response assertion : Change Pattern Matching Rules default to Substring on creation for better performances
+</li>
+
+
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=54977">Bug 54977</a>
+ - Ability to choose the client alias for the cert key in JsseSslManager such that Mutual SSL auth testing can be made more flexible. Contributed by UBIK Load Pack (support at ubikloadpack.com)
+</li>
+
+
 </ul>
 <h3>
 Functions
@@ -499,17 +672,101 @@ General
 </li>
 
 
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55753">Bug 55753</a>
+ - Improve FilePanel behaviour to start from the value set in Filename field if any. Contributed by UBIK Load Pack (support at ubikloadpack.com)
+</li>
+
+
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55756">Bug 55756</a>
+ - HTTP Mirror Server : Add ability to set Headers
+</li>
+
+
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55852">Bug 55852</a>
+ - Be more lenient in parsing when charset value is surrounded with single quotes
+</li>
+
+
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55857">Bug 55857</a>
+ - Performance : AbstractProperty should test for emptiness to avoid Exception throwing
+</li>
+
+
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55858">Bug 55858</a>
+ - Startup Performance : On Startup, BeanInfoSupport should test for key availability instead of throwing
+</li>
+
+
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55865">Bug 55865</a>
+ - Performance :Disable stale check by default in HttpClient 4 and 3.1
+</li>
+
+
+<li>
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55512">Bug 55512</a>
+ - Summariser should be enabled by default in Non GUI mode
+</li>
+
+
 </ul>
 <br/><br/><table width="100%" cellpadding="3" cellspacing="2" bgcolor="#525D76" border="0">
 <tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big><big><a name="Non-functional changes">Non-functional changes</a></big></big></b></font></td></tr></table><br/>
 <ul>
 
 
+<li>
+Updated to rsyntaxtextarea-2.5.1.jar (from 2.5.0)
+</li>
+
+
+<li>
+Updated to jodd-core-3.4.9.jar from (3.4.8) and jodd-lagarto-3.4.9.jar (from 3.4.9)
+</li>
+
+
+<li>
+Updated to jsoup-1.7.3.jar (from 1.7.2)
+</li>
+
+
+<li>
+Updated to mail-1.5.0-b01 (from 1.4.4)
+</li>
+
+
+<li>
+Updated to mongo-java-driver-2.11.3 (from 2.11.2)
+</li>
+
+
 </ul>
 <br/><br/><table width="100%" cellpadding="3" cellspacing="2" bgcolor="#525D76" border="0">
 <tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big><big><a name="Thanks">Thanks</a></big></big></b></font></td></tr></table><br/>
 <p>
-We thank all contributors mentioned in bug and improvement sections above.
+We thank all contributors mentioned in bug and improvement sections above:
+
+<ul>
+
+
+<li>
+James Liang (jliang at andera.com)
+</li>
+
+
+<li>
+UBIK Load Pack (support at ubikloadpack.com)
+</li>
+
+
+</ul>
+
+
 <br>
 
 
@@ -523,7 +780,12 @@ For this release we want to give special thanks to the following reporters for t
 
 
 <li>
-Firstname Name (email at gmail.com)
+John Natsioulas (john_natsioulas at yahoo.com.au)
+</li>
+
+
+<li>
+Antonio Gomes Rodrigues (ra0077 at gmail.com)
 </li>
 
 

docs/changes_history.html

@@ -1970,7 +1970,69 @@ Re-organised and simplified NOTICE and LICENSE files.
 <br/><br/><table width="100%" cellpadding="3" cellspacing="2" bgcolor="#525D76" border="0">
 <tr><td><font color="white" face="Helvetica, Arial, sans-serif"><b><big><big><a name="Thanks">Thanks</a></big></big></b></font></td></tr></table><br/>
 <p>
-We thank all contributors mentioned in bug and improvement sections above.
+We thank all contributors mentioned in bug and improvement sections above:
+
+<ul>
+
+
+<li>
+Bruno Antunes (b.m.antunes at gmail.com)
+</li>
+
+
+<li>
+Emmanuel Bourg (ebourg at apache.org)
+</li>
+
+
+<li>
+Scott Emmons
+</li>
+
+
+<li>
+Mikhail Epikhin (epihin-m at yandex.ru)
+</li>
+
+
+<li>
+Dzmitry Kashlach (dzmitrykashlach at gmail.com)
+</li>
+
+
+<li>
+Luca Maragnani (luca.maragnani at gmail.com)
+</li>
+
+
+<li>
+Milamber
+</li>
+
+
+<li>
+Adrian Nistor (nistor1 at illinois.edu)
+</li>
+
+
+<li>
+Antonio Gomes Rodrigues (ra0077 at gmail.com)
+</li>
+
+
+<li>
+UBIK Load Pack (support at ubikloadpack.com)
+</li>
+
+
+<li>
+Benoit Wiart (benoit.wiart at gmail.com)
+</li>
+
+
+</ul>
+
+
 <br>
 
 
@@ -2011,6 +2073,7 @@ Shmuel Krakower (shmulikk at gmail.com)
 </ul>
 
 
+
 Apologies if we have omitted anyone else.
  
 </p>

docs/download_jmeter.html

@@ -293,7 +293,7 @@ KEYS
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<strong>Apache JMeter 2.10 (Requires Java 6 or later)</strong></font>
+<strong>Apache JMeter 2.11 (Requires Java 6 or later)</strong></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -309,34 +309,34 @@ KEYS
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="[preferred]/jmeter/binaries/apache-jmeter-2.10.tgz">apache-jmeter-2.10.tgz</a>
+<a href="[preferred]/jmeter/binaries/apache-jmeter-2.11.tgz">apache-jmeter-2.11.tgz</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.10.tgz.md5">md5</a>
+<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.11.tgz.md5">md5</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.10.tgz.asc">pgp</a>
+<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.11.tgz.asc">pgp</a>
 </font>
 </td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="[preferred]/jmeter/binaries/apache-jmeter-2.10.zip">apache-jmeter-2.10.zip</a>
+<a href="[preferred]/jmeter/binaries/apache-jmeter-2.11.zip">apache-jmeter-2.11.zip</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.10.zip.md5">md5</a>
+<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.11.zip.md5">md5</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.10.zip.asc">pgp</a>
+<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.11.zip.asc">pgp</a>
 </font>
 </td>
 </tr>
@@ -357,34 +357,34 @@ KEYS
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="[preferred]/jmeter/source/apache-jmeter-2.10_src.tgz">apache-jmeter-2.10_src.tgz</a>
+<a href="[preferred]/jmeter/source/apache-jmeter-2.11_src.tgz">apache-jmeter-2.11_src.tgz</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.10_src.tgz.md5">md5</a>
+<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.11_src.tgz.md5">md5</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.10_src.tgz.asc">pgp</a>
+<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.11_src.tgz.asc">pgp</a>
 </font>
 </td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="[preferred]/jmeter/source/apache-jmeter-2.10_src.zip">apache-jmeter-2.10_src.zip</a>
+<a href="[preferred]/jmeter/source/apache-jmeter-2.11_src.zip">apache-jmeter-2.11_src.zip</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.10_src.zip.md5">md5</a>
+<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.11_src.zip.md5">md5</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.10_src.zip.asc">pgp</a>
+<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.11_src.zip.asc">pgp</a>
 </font>
 </td>
 </tr>

docs/index.html

@@ -243,6 +243,11 @@ Mail - SMTP(S), POP3(S) and IMAP(S)
 </li>
 
         
+<li>
+MongoDB (NoSQL)
+</li>
+
+        
 <li>
 Native commands or shell scripts
 </li>

docs/usermanual/build-db-test-plan.html

@@ -186,8 +186,8 @@ In this section, you will learn how to create a basic
 Test Plan
 </a>
  to test a database server.
-You will create ten users that send five SQL requests to the database server.
+You will create fifty users that send 2 SQL requests to the database server.
-Also, you will tell the users to run their tests three times. So, the total number
+Also, you will tell the users to run their tests 100 times. So, the total number
 of requests is (50 users) x (2 requests) x (repeat 100 times) = 10'000 JDBC requests.
 To construct the Test Plan, you will use the following elements:
 

docs/usermanual/component_reference.html

@@ -4664,7 +4664,7 @@ No
 
     
 <p><b>Control Panel</b></p>
-<div align="center"><img width='790' height='702' src="../images/screenshots/jmspublisher.png"/></div>
+<div align="center"><img width='946' height='776' src="../images/screenshots/jmspublisher.png"/></div>
 <p>
 <b>Parameters</b>
 <a name="JMS_Publisher_parms"/>
@@ -4806,6 +4806,7 @@ No
 <td>JMS Properties</td>
 <td>
       The JMS Properties are properties specific for the underlying messaging system.
+      You can setup the name, the value and the class (type) of value. Default type is String.
       For example: for WebSphere 5.1 web services you will need to set the JMS Property targetService to test
       webservices through JMS.
   
@@ -5325,7 +5326,7 @@ JMSSampler.useSecurity.properties=false
 
     
 <p><b>Control Panel</b></p>
-<div align="center"><img width='746' height='662' src="../images/screenshots/jms/JMS_Point-to-Point.png"/></div>
+<div align="center"><img width='924' height='797' src="../images/screenshots/jms/JMS_Point-to-Point.png"/></div>
 <p>
 <b>Parameters</b>
 <a name="JMS_Point-to-Point_parms"/>
@@ -5541,6 +5542,7 @@ No
 <td>JMS Properties</td>
 <td>
       The JMS Properties are properties specific for the underlying messaging system.
+      You can setup the name, the value and the class (type) of value. Default type is String.
       For example: for WebSphere 5.1 web services you will need to set the JMS Property targetService to test
       webservices through JMS.
   
@@ -8321,7 +8323,9 @@ the contents are used to prefix the pathname.
 <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.
+When using IncludeController and including the same JMX file, ensure you name the IncludeController differently to avoid facing known issue 
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=50898">Bug 50898</a>
+.
 
 </td></tr>
 </table>
@@ -8372,12 +8376,21 @@ Yes
 
         The Transaction Controller generates an additional
         sample which measures the overall time taken to perform the nested test elements.
-        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>
 
         
+<p>
+<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
+<tr><td>
+        Note: when the check box "Include duration of timer and pre-post processors in generated sample" is checked,
+        the time includes all processing within the controller scope, not just the samples.
+        
+</td></tr>
+</table>
+</p>
+
+        
 <p>
 
         For JMeter versions after 2.3, there are two modes of operation
@@ -8444,7 +8457,7 @@ The generated sample is only regarded as successful if all its sub-samples are s
 
     
 <p><b>Control Panel</b></p>
-<div align="center"><img width='378' height='129' src="../images/screenshots/transactioncontroller.png"/></div>
+<div align="center"><img width='622' height='140' src="../images/screenshots/transactioncontroller.png"/></div>
 <p>
 <b>Parameters</b>
 <a name="Transaction_Controller_parms"/>
@@ -8473,8 +8486,7 @@ Yes
 <td>Include duration of timer and pre-post processors in generated sample</td>
 <td>
     Whether to include timer, pre- and post-processing delays in the generated sample.
-    Default is true to be compatible with the behaviour in previous versions of JMeter.
+    Default is false (since JMeter 2.11, in previous versions the default value is true).
-    Setting it to false is a better option to get only response time of the sample.
     
 </td>
 <td>
@@ -9266,6 +9278,21 @@ video/
 The <i>XML view</i> will show response in tree style. 
 Any DTD nodes or Prolog nodes will not show up in tree; however, response may contain those nodes.
 <br />
+</font>
+</td>
+</tr>
+<tr>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+<b>XPath Tester</b>
+</font>
+</td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+The <i>XPath Tester</i> only works for text responses. It shows the plain text in the upper panel.
+The "Test" button allows the user to apply the XPath query to the upper panel and the results
+will be displayed in the lower panel.<br />
+
 </font>
 </td>
 </tr>
@@ -11083,9 +11110,7 @@ test${__threadNum}.csv
     As this is after configuration processing is completed,
     they cannot be used for some configuration items - such as JDBC Config - 
     that process their contents at configuration time (see 
-<a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40934">
+<a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=40394">Bug 40394</a>
-Bug 40394 
-</a>
 )
     However the variables do work in the HTTP Auth Manager, as the username etc are processed at run-time.
     
@@ -12705,7 +12730,7 @@ Then reference the keystore file through the 2 JVM properties (or add them in sy
 
 
 <p><b>Control Panel</b></p>
-<div align="center"><img width='530' height='171' src="../images/screenshots/keystore_config.png"/></div>
+<div align="center"><img width='441' height='189' src="../images/screenshots/keystore_config.png"/></div>
 <p>
 <b>Parameters</b>
 <a name="Keystore_Configuration_parms"/>
@@ -12721,13 +12746,21 @@ No
 </tr>
 <tr>
 <td>Preload</td>
-<td>Wether or not to preload Keystore.
+<td>Wether or not to preload Keystore. Setting is to true is usually the best option.
 </td>
 <td>
 Yes
 </td>
 </tr>
 <tr>
+<td>Variable name holding certificate alias</td>
+<td>Variable name that will contain the alias to use for authentication by client certificate. Variable value will be filled from CSV Data Set for example. In the screenshot, "certificat_ssl" will also be a variable in CSV Data Set.
+</td>
+<td>
+False
+</td>
+</tr>
+<tr>
 <td>Alias Start Index</td>
 <td>The index of the first key to use in Keystore, 0-based.
 </td>
@@ -12737,7 +12770,7 @@ Yes
 </tr>
 <tr>
 <td>Alias End Index</td>
-<td>The index of the last key to use in Keystore, 0-based.
+<td>The index of the last key to use in Keystore, 0-based. When using "Variable name holding certificate alias" ensure it is large enough so that all keys are loaded at startup.
 </td>
 <td>
 Yes
@@ -19147,7 +19180,7 @@ directly into your test plan as you go (so you can view samples interactively wh
 <br>
 
 
-Ensure your read this 
+Ensure you read this 
 <a href="https://wiki.apache.org/jmeter/TestRecording210">
 wiki page
 </a>
@@ -19234,6 +19267,29 @@ This has the advantage that even embedded HTTPS resources can be intercepted, an
 </p>
 
 
+<p>
+Unless a keystore is provided (and you define the property 
+<code>
+proxy.cert.alias
+</code>
+),
+JMeter needs to use the keytool application to create the keystore entries. 
+Versions of JMeter after 2.10 include code to check that keytool is available by looking in various standard places.
+If JMeter is unable to find the keytool application, it will report an error.
+If necessary, the systen property 
+<code>
+keytool.directory
+</code>
+ can be used to tell JMeter where to find keytool.
+This should be defined in the file 
+<code>
+system.properties
+</code>
+.
+
+</p>
+
+
 <p>
 
 The JMeter certificates are generated (if necessary) when the Start button is pressed.
@@ -19253,6 +19309,17 @@ below
 </p>
 
 
+<p>
+
+If necessary, you can force JMeter to regenerate the keystore (and the exported certificates - ApacheJMeterTemporaryRootCA[.usr|.crt]) by deleting the keystore file 
+<code>
+proxyserver.jks
+</code>
+ from the JMeter directory.
+
+</p>
+
+
 <p>
 
 With versions of JMeter up to 2.9, it used a single certificate for all target servers.
@@ -19606,7 +19673,17 @@ Yes
 <tr>
 <td>HTTPS Domains</td>
 <td>List of domain (or host) names for HTTPS. Use this to pre-generate certificates for all servers you wish to record.
-        For example, *.apache.org
+        
+<br>
+
+
+        For example, *.apache.org,*.incubator.apache.org
+        
+<br>
+
+
+        Note that wildcard domains only apply to one level,
+        i.e. podling.incubator.apache.org matches *.incubator.apache.org but not *.apache.org
         
 </td>
 <td>
@@ -20269,7 +20346,7 @@ No
 <td>X-ResponseStatus</td>
 <td>Response status, see 
 <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html">
-HTTP Stauts responses
+HTTP Status responses
 </a>
 , example 200 OK, 500 Internal Server Error ....
 </td>
@@ -20280,6 +20357,23 @@ No
 <tr>
 <td>X-ResponseLength</td>
 <td>Size of response, this enable returning only a substring of Request content
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>X-SetHeaders</td>
+<td>Pipe separator list of headers, example:
+<br>
+
+ 
+        
+<code>
+headerA=valueA|headerB=valueB
+</code>
+ would set headerA to valueA and headerB to valueB.        
+        
 </td>
 <td>
 No
@@ -20530,6 +20624,16 @@ Yes
 </tr>
 </table>
 </p>
+<p>
+<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
+<tr><td>
+When using Test Fragment with 
+<a href="../usermanual/component_reference.html#Module_Controller">Module Controller</a>
+, ensure you disable the Test Fragment to avoid the execution of Test Fragment itself.
+
+</td></tr>
+</table>
+</p>
 </td></tr>
 <tr><td><br></td></tr>
 </table>

src/core/org/apache/jmeter/util/JMeterVersion.java

@@ -49,7 +49,7 @@ public final class JMeterVersion {
      * This ensures that JMeterUtils always gets the correct
      * version, even if JMeterUtils is not re-compiled during the build.
      */
-    private static final String VERSION = "2.11-SNAPSHOT";
+    private static final String VERSION = "2.11";
 
     private static final String IMPLEMENTATION;
     

xdocs/download_jmeter.xml

@@ -18,7 +18,7 @@
 
 <!DOCTYPE document
 [
-<!ENTITY release '2.10'>
+<!ENTITY release '2.11'>
 ]>
     
 <document>   

xdocs/overview.html

@@ -18,7 +18,7 @@
 <!-- This file is copied into the Javadoc overview -->
 <html>
 <body>
-This is the documentation for Apache JMeter version ${jmeter.version} API.
+This is the documentation for Apache JMeter version 2.11 API.
-@version ${jmeter.version}
+@version 2.11
 </body>
 </html>