jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1853306 [3/3] - in /jmeter/trunk: docs/ docs/css/ docs/images/screenshots/templates/ docs/localising/ docs/usermanual/ src/core/org/apache/jmeter/util/ xdocs/
Date Sun, 10 Feb 2019 12:41:04 GMT
Modified: jmeter/trunk/docs/usermanual/build-web-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/build-web-test-plan.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/build-web-test-plan.html (original)
+++ jmeter/trunk/docs/usermanual/build-web-test-plan.html Sun Feb 10 12:41:03 2019
@@ -498,9 +498,6 @@ Figure 4.8. Sample HTTP login request</f
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -509,7 +506,7 @@ Figure 4.8. Sample HTTP login request</f
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/build-ws-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/build-ws-test-plan.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/build-ws-test-plan.html (original)
+++ jmeter/trunk/docs/usermanual/build-ws-test-plan.html Sun Feb 10 12:41:03 2019
@@ -412,9 +412,6 @@ You may also need to modify "<span class
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -423,7 +420,7 @@ You may also need to modify "<span class
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/component_reference.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jmeter/trunk/docs/usermanual/component_reference.html Sun Feb 10 12:41:03 2019
@@ -663,7 +663,7 @@
     
 <p>
     Samplers perform the actual work of JMeter.
-    Each sampler (except <a href="../usermanual/component_reference.html#Test_Action">Test Action</a>) generates one or more sample results.
+    Each sampler (except <a href="../usermanual/component_reference.html#Flow_Control_Action">Flow Control Action</a>) generates one or more sample results.
     The sample results have various attributes (success/fail, elapsed time, data size etc.) and can be viewed in the various listeners.
     </p>
 
@@ -882,16 +882,19 @@ Latency is set to the time it takes to l
 <li>The API is best suited to single-threaded usage - various settings
          are defined via system properties, and therefore apply to all connections.</li>
          
-<li>There is a bug in the handling of HTTPS via a Proxy (the <span class="code">CONNECT</span> is not handled correctly).
-         See Java bugs 6226610 and 6208335.
-         </li>
+<li>No support of Kerberos authentication</li>
+         
+<li>It does not support client based certificate testing with Keystore Config.</li>
+         
+<li>Better control of Retry mechanism</li>
          
 <li>It does not support virtual hosts.</li>
          
 <li>It supports only the following methods: <span class="code">GET</span>, <span class="code">POST</span>, <span class="code">HEAD</span>, <span class="code">OPTIONS</span>, <span class="code">PUT</span>, <span class="code">DELETE</span> and <span class="code">TRACE</span>
 </li>
          
-<li>It does not support client based certificate testing with Keystore Config.</li>
+<li>Better control on DNS Caching with <a href="../usermanual/component_reference.html#DNS_Cache_Manager">DNS Cache Manager</a>
+</li>
          
 </ul>
          
@@ -1741,6 +1744,13 @@ the additional variables for rows four,
 </div>
         
 <div class="property">
+<div class="name req-false">Query timeout(s)</div>
+<div class="description req-false">Set a timeout in seconds for query, empty value means 0 which is infinite. <span class="code">-1</span> means don't set any query timeout
+which might be needed for use case or when certain drivers don't support timeout. Defaults to 0.</div>
+<div class="required req-false">No</div>
+</div>
+        
+<div class="property">
 <div class="name req-false">Handle ResultSet</div>
 <div class="description req-false">Defines how ResultSet returned from callable statements be handled:
             <ul>
@@ -2645,10 +2655,7 @@ This will not have any impact on existin
 <div class="description">
 <p>AccessLogSampler was designed to read access logs and generate http requests.
 For those not familiar with the access log, it is the log the webserver maintains of every
-request it accepted. This means every image, CSS file, JavaScript file, html file, &hellip;
-The current implementation is complete, but some features have not been enabled. 
-There is a filter for the access log parser, but I haven't figured out how to link to the pre-processor. 
-Once I do, changes to the sampler will be made to enable that functionality.</p>
+request it accepted. This means every image, CSS file, JavaScript file, html file, &hellip;</p>
 
 <p>Tomcat uses the common format for access logs. This means any webserver that uses the
 common log format can use the AccessLogSampler. Server that use common log format include:
@@ -4662,6 +4669,9 @@ Relative paths are resolved against the
 </div>
 
 </div>
+<div class="clear"></div>
+<div class="note">You can pass mail related environment properties by adding to user.properties any of the properties described <a href="https://javaee.github.io/javamail/docs/api/com/sun/mail/pop3/package-summary.html">here</a>.</div>
+<div class="clear"></div>
 <p>
 Messages are stored as subsamples of the main sampler.
 Multipart message parts are stored as subsamples of the message.
@@ -4691,7 +4701,7 @@ The current implementation is quite basi
           </a><a class="sectionlink" href="#Flow_Control_Action" title="Link to here">&para;</a>
 </h2>
 <div class="description">
-The Test Action sampler is a sampler that is intended for use in a conditional controller.
+The Flow Control Action sampler is a sampler that is intended for use in a conditional controller.
 Rather than generate a sample, the test element either pauses or stops the selected target.
 <p>This sampler can also be useful in conjunction with the Transaction Controller, as it allows
 pauses to be included without needing to generate a sample. 
@@ -9988,6 +9998,18 @@ instead. (see figures 12 and 13).</p>
 </div>
         
 <div class="property">
+<div class="name req-true">Transaction isolation</div>
+<div class="description req-true">Transaction isolation level</div>
+<div class="required req-true">Yes</div>
+</div>
+        
+<div class="property">
+<div class="name req-false">Init SQL statements separated by new line</div>
+<div class="description req-false">A Collection of SQL statements that will be used to initialize physical connections when they are first created. These statements are executed only once - when the configured connection factory creates the connection. </div>
+<div class="required req-false">No</div>
+</div>
+        
+<div class="property">
 <div class="name req-true">Test While Idle</div>
 <div class="description req-true">Test idle connections of the pool, see <a href="https://commons.apache.org/proper/commons-dbcp/api-2.1.1/org/apache/commons/dbcp2/BasicDataSource.html#getTestWhileIdle--">BasicDataSource.html#getTestWhileIdle</a>. 
         Validation Query will be used to test it.</div>
@@ -10119,7 +10141,7 @@ instead. (see figures 12 and 13).</p>
 <dd>org.h2.Driver</dd>
               
 <dt>Firebird</dt>
-<dd>org.firebirdsql.jdbc.FBDrivery</dd>
+<dd>org.firebirdsql.jdbc.FBDriver</dd>
               
 <dt>Apache Derby</dt>
 <dd>org.apache.derby.jdbc.ClientDriver</dd>
@@ -10380,7 +10402,8 @@ This component is typically used in HTTP
   
 <div class="property">
 <div class="name req-false">Variable name holding certificate alias</div>
-<div class="description req-false">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, "<span class="code">certificat_ssl</span>" will also be a variable in CSV Data Set.</div>
+<div class="description req-false">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, "<span class="code">certificat_ssl</span>" will also be a variable in CSV Data Set. Defaults to <span class="code">clientCertAliasVarName</span>
+</div>
 <div class="required req-false">False</div>
 </div>
   
@@ -10392,7 +10415,7 @@ This component is typically used in HTTP
   
 <div class="property">
 <div class="name req-true">Alias End Index</div>
-<div class="description req-true">The index of the last key to use in Keystore, 0-based. When using "<span class="code">Variable name holding certificate alias</span>" ensure it is large enough so that all keys are loaded at startup.</div>
+<div class="description req-true">The index of the last key to use in Keystore, 0-based. When using "<span class="code">Variable name holding certificate alias</span>" ensure it is large enough so that all keys are loaded at startup. Default to -1 which means load all.</div>
 <div class="required req-true">Yes</div>
 </div>
 
@@ -12571,7 +12594,7 @@ please ensure that you select "<span cla
     To apply a timer to a single sampler, add the timer as a child element of the sampler.
     The timer will be applied before the sampler is executed.
     To apply a timer after a sampler, either add it to the next sampler, or add it as the
-    child of a <a href="../usermanual/component_reference.html#Test_Action">Test Action</a> Sampler.
+    child of a <a href="../usermanual/component_reference.html#Flow_Control_Action">Flow Control Action</a> Sampler.
     </div>
 <div class="clear"></div>
 
@@ -17225,9 +17248,6 @@ If Test Plan is stopped, tearDown will n
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -17236,7 +17256,7 @@ If Test Plan is stopped, tearDown will n
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/functions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/functions.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/functions.html (original)
+++ jmeter/trunk/docs/usermanual/functions.html Sun Feb 10 12:41:03 2019
@@ -229,7 +229,7 @@ ERROR - jmeter.functions.JavaScript: Err
  
 <span class="code">Math.max(2</span> and <span class="code">5)</span>
 <br>
- Other error messages are possible. 
+ Other error messages are possible.
 </p>
 
 <p>Variables are referenced as follows:
@@ -266,7 +266,7 @@ and need to be referenced using the <spa
 When using <span class="code">\</span> before a variable for a windows path for example <span class="code">C:\test\${test}</span>, ensure you escape the <span class="code">\</span>
 otherwise JMeter will not interpret the variable, example:
 <span class="code">C:\\test\\${test}</span>.
-<br> 
+<br>
 Alternatively, just use <span class="code">/</span> instead for the path separator - e.g. <span class="code">C:/test/${test}</span> - Windows JVMs will convert the separators as necessary.
 </div>
 <div class="clear"></div>
@@ -274,7 +274,7 @@ Alternatively, just use <span class="cod
 <p>List of functions, loosely grouped into types.</p>
 
 <table>
-        
+
         
 <tr>
 <th>Type of function</th><th>Name</th><th>Comment</th><th>Since</th>
@@ -484,7 +484,7 @@ Alternatively, just use <span class="cod
 <p>There are two kinds of functions: user-defined static values (or variables), and built-in functions.<br>
 User-defined static values allow the user to define variables to be replaced with their static value when
 a test tree is compiled and submitted to be run.  This replacement happens once at the beginning of the test
-run.  This could be used to replace the DOMAIN field of all HTTP requests, for example - making it a simple 
+run.  This could be used to replace the DOMAIN field of all HTTP requests, for example - making it a simple
 matter to change a test to target a different server with the same test.
 </p>
 
@@ -504,7 +504,7 @@ thread the function is in, the time, and
 request throughout the course of the test. </p>
 
 <div class="clear"></div>
-<div class="note">Functions are shared between threads. 
+<div class="note">Functions are shared between threads.
 Each occurrence of a function call in a test plan is handled by a separate function instance.</div>
 <div class="clear"></div>
 
@@ -517,16 +517,16 @@ Each occurrence of a function call in a
 
 <p>
 Functions and variables can be written into any field of any test component (apart from the TestPlan - see below).
-Some fields do not allow random strings 
+Some fields do not allow random strings
 because they are expecting numbers, and thus will not accept a function.  However, most fields will allow
 functions.
 </p>
 
 <p>
 Functions which are used on the Test Plan have some restrictions.
-JMeter thread variables will have not been fully set up when the functions are processed, 
-so variable names passed as parameters will not be set up, and variable references will not work, 
-so <span class="code">split()</span> and <span class="code">regex()</span> and the variable evaluation functions won't work. 
+JMeter thread variables will have not been fully set up when the functions are processed,
+so variable names passed as parameters will not be set up, and variable references will not work,
+so <span class="code">split()</span> and <span class="code">regex()</span> and the variable evaluation functions won't work.
 The <span class="code">threadNum()</span> function won't work (and does not make sense at test plan level).
 The following functions should work OK on the test plan:
 <ul>
@@ -616,15 +616,15 @@ This works well in conjunction with the
 </p>
 
 <p>
-Functions can reference variables and other functions, for example 
-<span class="code">${__XPath(${__P(xpath.file),${XPATH})}</span> 
+Functions can reference variables and other functions, for example
+<span class="code">${__XPath(${__P(xpath.file),${XPATH})}</span>
 will use the property "<span class="code">xpath.file</span>" as the file name
 and the contents of the variable <span class="code">XPATH</span> as the expression to search for.
 </p>
 
 <p>
 JMeter provides a tool to help you construct
-function calls for various built-in functions, which you can then copy-paste. 
+function calls for various built-in functions, which you can then copy-paste.
 It will not automatically escape values for you, since functions can be parameters to other functions, and you should only escape values you intend as literal.
 </p>
 
@@ -633,7 +633,7 @@ It will not automatically escape values
 If a string contains a backslash('<span class="code">\</span>') and also contains a function or variable reference, the backslash will be removed if
 it appears before '<span class="code">$</span>' or '<span class="code">,</span>' or '<span class="code">\</span>'.
 This behaviour is necessary to allow for nested functions that include commas or the string <span class="code">${</span>.
-Backslashes before '<span class="code">$</span>' or '<span class="code">,</span>' or '<span class="code">\</span>' are not removed if the string does not contain a function or variable reference. 
+Backslashes before '<span class="code">$</span>' or '<span class="code">,</span>' or '<span class="code">\</span>' are not removed if the string does not contain a function or variable reference.
 </div>
 <div class="clear"></div>
 
@@ -643,7 +643,7 @@ Backslashes before '<span class="code">$
 The <span class="code">__logn()</span> function reference can be used anywhere in the test plan after the variable has been defined.
 Alternatively, the Java Request sampler can be used to create a sample containing variable references;
 the output will be shown in the appropriate Listener.
-Note there is a <a href="../usermanual/component_reference.html#Debug_Sampler">Debug Sampler</a> 
+Note there is a <a href="../usermanual/component_reference.html#Debug_Sampler">Debug Sampler</a>
 that can be used to display the values of variables etc. in the Tree View Listener.
 </p>
 
@@ -802,7 +802,7 @@ replacement string") parsed by this func
         
 <div class="property">
 <div class="name req-false">Seventh argument</div>
-<div class="description req-false">Input variable name. 
+<div class="description req-false">Input variable name.
         If specified, then the value of the variable is used as the input instead of using the previous sample result.
         </div>
 <div class="required req-false">No</div>
@@ -828,7 +828,7 @@ counting how many times that request was
 
 <p>The counter uses an integer variable to hold the count, which therefore has a maximum of 2,147,483,647.</p>
 
-<p>The counter function instances are completely independent.  
+<p>The counter function instances are completely independent.
 The global counter - "<span class="code">FALSE</span>" - is separately maintained by each counter instance.
 </p>
 
@@ -883,9 +883,18 @@ If you want to have a count that increme
 </h2>
 <div class="description">
 <p>The thread number function simply returns the number of the thread currently
-being executed.  These numbers are independent of ThreadGroup, meaning thread #1 in one threadgroup
+being executed.  These numbers are only locally unique with respect to their ThreadGroup, meaning thread #1 in one threadgroup
 is indistinguishable from thread #1 in another threadgroup, from the point of view of this function.</p>
 
+<div class="clear"></div>
+<div class="note">The function returns a number between one and the max number of running threads. Note that if you're using
+JSR223 code with <a href="../api/org/apache/jmeter/threads/JMeterContext.html">JMeterContext</a> object (<span class="code">ctx</span> variable),
+the below code returns a number between zero and (max number of running threads minus one)
+<pre class="source">ctx.getThreadNum()</pre>
+
+</div>
+<div class="clear"></div>
+
 
 <p>There are no arguments for this function.</p>
 
@@ -917,7 +926,7 @@ being executed.</p>
 <p>There are no arguments for this function.</p>
 
 <p>Usage Example:
-<pre class="source">${__threadGroupName}</pre> 
+<pre class="source">${__threadGroupName}</pre>
 
 </p>
 
@@ -981,7 +990,7 @@ The reference name is optional, but it m
         
 <div class="property">
 <div class="name req-false">last argument</div>
-<div class="description req-false">A reference name for reusing the value computed by this function. 
+<div class="description req-false">A reference name for reusing the value computed by this function.
                 If specified, the reference name must contain at least one non-numeric character otherwise it will
                 be treated as another int value to be added.
         </div>
@@ -1007,7 +1016,7 @@ The reference name is optional, but it m
 <h2 id="__longSum">__longSum<a class="sectionlink" href="#__longSum" title="Link to here">&para;</a>
 </h2>
 <div class="description">
-<p>The longSum function can be used to compute the sum of two or more long values, use this instead of __intSum whenever you know your values will not 
+<p>The longSum function can be used to compute the sum of two or more long values, use this instead of __intSum whenever you know your values will not
 be in the interval -2147483648 to 2147483647.
 </p>
 </div>
@@ -1042,7 +1051,7 @@ be in the interval -2147483648 to 214748
         
 <div class="property">
 <div class="name req-false">last argument</div>
-<div class="description req-false">A reference name for reusing the value computed by this function. 
+<div class="description req-false">A reference name for reusing the value computed by this function.
                 If specified, the reference name must contain at least one non-numeric character otherwise it will
                 be treated as another long value to be added.
         </div>
@@ -1070,14 +1079,14 @@ be in the interval -2147483648 to 214748
 <div class="description">
     
 <p>
-    The StringFromFile function can be used to read strings from a text file. 
+    The StringFromFile function can be used to read strings from a text file.
     This is useful for running tests that require lots of variable data.
     For example when testing a banking application, 100s or 1000s of different account numbers might be required.
     </p>
     
 <p>
-    See also the 
-    <a href="component_reference.html#CSV_Data_Set_Config">CSV Data Set Config test element</a> 
+    See also the
+    <a href="component_reference.html#CSV_Data_Set_Config">CSV Data Set Config test element</a>
     which may be easier to use. However, that does not currently support multiple input files.
     </p>
 
@@ -1442,9 +1451,9 @@ the comma after <span class="code">7</sp
 <br>
 
 <pre class="source">${__javaScript(new Date(),MYDATE)}</pre> will return <span class="code">Sat Jan 09 2016 16:22:15 GMT+0100 (CET)</span> and store it under variable <span class="code">MYDATE</span>
-<br> 
+<br>
 
-<pre class="source">${__javaScript(Math.floor(Math.random()*(${maxRandom}+1)),MYRESULT)}</pre> will use maxRandom variable, return a random value between 0 and maxRandom and store it in MYRESULT  
+<pre class="source">${__javaScript(Math.floor(Math.random()*(${maxRandom}+1)),MYRESULT)}</pre> will use maxRandom variable, return a random value between 0 and maxRandom and store it in MYRESULT
 <pre class="source">${__javaScript(${minRandom}+Math.floor(Math.random()*(${maxRandom}-${minRandom}+1)),MYRESULT)}</pre> will use <span class="code">maxRandom</span> and <span class="code">minRandom</span> variables, return a random value between <span class="code">maxRandom</span> and <span class="code">minRandom</span> and store it under variable <span class="code">MYRESULT</span>
 
 <pre class="source">${__javaScript("${VAR}"=="abcd",MYRESULT)}</pre> will compare the value of <span class="code">VAR</span> variable with <span class="code">abcd</span>, return <span class="code">true</span> or <span class="code">false</span> and store the result in MYRESULT
@@ -1657,7 +1666,7 @@ The variables can be simple or multi-val
 
 </ul>
 
-Multi-value vars are the ones that are extracted when you set <span class="code">-1</span> for <span class="code">Match Numbers</span>. 
+Multi-value vars are the ones that are extracted when you set <span class="code">-1</span> for <span class="code">Match Numbers</span>.
 This leads to creation of match number variable called <span class="code">varName_matchNr</span> and for each value to the creation of variable <span class="code">varName_n</span> where n = 1, 2, 3 etc.
 
 </div>
@@ -1743,7 +1752,7 @@ This leads to creation of match number v
     </p>
     
 <p>
-<b>In most cases, the newer 
+<b>In most cases, the newer
     <a href="component_reference.html#CSV_Data_Set_Config">CSV Data Set Config element</a>
      is easier to use.</b>
 </p>
@@ -1847,7 +1856,7 @@ or <a href="#__StringFromFile">StringFro
 <h2 id="__property">__property<a class="sectionlink" href="#__property" title="Link to here">&para;</a>
 </h2>
 <div class="description">
-<p>The property function returns the value of a JMeter property. 
+<p>The property function returns the value of a JMeter property.
     If the property value cannot be found, and no default has been supplied, it returns the property name.
     When supplying a default value, there is no need to provide a function name - the parameter can be set to null, and it will be ignored.
     </p>For example:<p>
@@ -1918,7 +1927,7 @@ or <a href="#__StringFromFile">StringFro
 <p>This is a simplified property function which is
     intended for use with properties defined on the command line.
     Unlike the <span class="code">__property</span> function, there is no option to save the value in a variable,
-    and if no default value is supplied, it is assumed to be 1. 
+    and if no default value is supplied, it is assumed to be 1.
     The value of 1 was chosen because it is valid for common test variables such
     as loops, thread count, ramp up etc.
     </p>For example:<p>
@@ -1944,7 +1953,7 @@ Fetch the values:
 <br>
 
 </span>
-In the examples above, the first function call would return <span class="code">7</span>, 
+In the examples above, the first function call would return <span class="code">7</span>,
 the second would return <span class="code">1</span> and the last would return <span class="code">www.dummy.org</span>
 (unless those properties were defined elsewhere!)
 </p>
@@ -2024,7 +2033,7 @@ the second would return <span class="cod
         
 <div class="property">
 <div class="name req-false">Comment</div>
-<div class="description req-false">If present, it is displayed in the string. 
+<div class="description req-false">If present, it is displayed in the string.
         Useful for identifying what is being logged.</div>
 <div class="required req-false">No</div>
 </div>
@@ -2181,7 +2190,7 @@ The following variables are set before t
 <span class="code">SampleResult</span> - the current <a href="../api/org/apache/jmeter/samplers/SampleResult.html">SampleResult</a>, if any</li>
 
 </ul>
-(*) means that this is set before the init file, if any, is processed. 
+(*) means that this is set before the init file, if any, is processed.
 Other variables vary from invocation to invocation.
 </p>
 
@@ -2209,7 +2218,7 @@ Other variables vary from invocation to
                computed by this function.</div>
 <div class="required req-false">No</div>
 </div>
-        
+
 
 </div>
 <p>
@@ -2252,7 +2261,7 @@ Remember to include any necessary quotes
 </p>
 
 <p>
-If the property "<span class="code">groovy.utilities</span>" is defined, it will be loaded by the ScriptEngine. 
+If the property "<span class="code">groovy.utilities</span>" is defined, it will be loaded by the ScriptEngine.
 This can be used to define common methods and variables. There is a
 sample init file in the <span class="code">bin</span> directory: <span class="code">utility.groovy</span>.
 </p>
@@ -2290,7 +2299,7 @@ The following variables are set before t
 </ul>
 
 <p>
-(*) means that this is set before the init file, if any, is processed. 
+(*) means that this is set before the init file, if any, is processed.
 Other variables vary from invocation to invocation.
 </p>
 
@@ -2332,7 +2341,7 @@ Instead do the following, which can be c
 <div class="name req-true">Expression to evaluate</div>
 <div class="description req-true">A groovy script (not a file name)
         <div class="clear"></div>
-<div class="note">Argument values that themselves contain commas should be escaped as necessary. 
+<div class="note">Argument values that themselves contain commas should be escaped as necessary.
         If you need to include a comma in your parameter value, escape it like this: '<span class="code">\,</span>'</div>
 <div class="clear"></div>
         
@@ -2346,7 +2355,7 @@ Instead do the following, which can be c
                computed by this function.</div>
 <div class="required req-false">No</div>
 </div>
-        
+
 
 </div>
 <p>
@@ -2389,10 +2398,10 @@ Remember to include any necessary quotes
 <p>
     The split function splits the string passed to it according to the delimiter,
     and returns the original string. If any delimiters are adjacent, "<span class="code">?</span>" is returned as the value.
-    The split strings are returned in the variables <span class="code">${VAR_1}</span>, <span class="code">${VAR_2}</span> etc. 
-    The count of variables is returned in <span class="code">${VAR_n}</span>. 
+    The split strings are returned in the variables <span class="code">${VAR_1}</span>, <span class="code">${VAR_2}</span> etc.
+    The count of variables is returned in <span class="code">${VAR_n}</span>.
     A trailing delimiter is treated as a missing variable, and "<span class="code">?</span>" is returned.
-    Also, to allow it to work better with the ForEach controller, 
+    Also, to allow it to work better with the ForEach controller,
     <span class="code">__split</span> now deletes the first unused variable in case it was set by a previous split.
     </p>
     
@@ -2457,12 +2466,12 @@ Remember to include any necessary quotes
         
 <div class="property">
 <div class="name req-false">Delimiter</div>
-<div class="description req-false">The delimiter character, e.g. <span class="code">|</span>. 
+<div class="description req-false">The delimiter character, e.g. <span class="code">|</span>.
 If omitted, <span class="code">,</span> is used. Note that <span class="code">,</span> would need to be specified as <span class="code">\,</span>.
 </div>
 <div class="required req-false">No</div>
 </div>
-        
+
 
 </div>
 <div class="go-top">
@@ -2527,7 +2536,7 @@ If omitted, <span class="code">,</span>
 </h2>
 <div class="description">
     
-<p>The setProperty function sets the value of a JMeter property. 
+<p>The setProperty function sets the value of a JMeter property.
         The default return value from the function is the empty string,
         so the function call can be used anywhere functions are valid.</p>
         
@@ -2662,8 +2671,8 @@ The following shorthand aliases are prov
 </h2>
 <div class="description">
     
-<p>The jexl function returns the result of evaluating a 
-    <a href="http://commons.apache.org/jexl">Commons JEXL expression</a>. 
+<p>The jexl function returns the result of evaluating a
+    <a href="http://commons.apache.org/jexl">Commons JEXL expression</a>.
     See links below for more information on JEXL expressions.
     </p>
     
@@ -2772,8 +2781,8 @@ i.intValue(); // or use i.longValue()
 </h2>
 <div class="description">
     
-<p>The jexl function returns the result of evaluating a 
-    <a href="http://commons.apache.org/proper/commons-jexl/">Commons JEXL expression</a>. 
+<p>The jexl function returns the result of evaluating a
+    <a href="http://commons.apache.org/proper/commons-jexl/">Commons JEXL expression</a>.
     See links below for more information on JEXL expressions.
     </p>
     
@@ -2917,7 +2926,7 @@ i.intValue(); // or use i.longValue()
 <div class="property">
 <div class="name req-true">Variable name</div>
 <div class="description req-true">
-        The variable to be evaluated. 
+        The variable to be evaluated.
         </div>
 <div class="required req-true">Yes</div>
 </div>
@@ -2925,7 +2934,7 @@ i.intValue(); // or use i.longValue()
 <div class="property">
 <div class="name req-false">Default value</div>
 <div class="description req-false">
-        The default value in case no variable found, if it's empty and no variable found function returns the variable name 
+        The default value in case no variable found, if it's empty and no variable found function returns the variable name
         </div>
 <div class="required req-false">No</div>
 </div>
@@ -2947,9 +2956,9 @@ i.intValue(); // or use i.longValue()
     
 <p>
     This allows one to read a string from a file, and process any variable references in it.
-    For example, if the variable "<span class="code">query</span>" contains "<span class="code">select ${column} from ${table}</span>" 
+    For example, if the variable "<span class="code">query</span>" contains "<span class="code">select ${column} from ${table}</span>"
     and "<span class="code">column</span>" and "<span class="code">table</span>" contain "<span class="code">name</span>" and "<span class="code">customers</span>", then <span class="code">${__evalVar(query)}</span>
-    will evaluate as "<span class="code">select name from customers</span>". 
+    will evaluate as "<span class="code">select name from customers</span>".
     </p>
     
 </div>
@@ -2967,7 +2976,7 @@ i.intValue(); // or use i.longValue()
 <div class="property">
 <div class="name req-true">Variable name</div>
 <div class="description req-true">
-        The variable to be evaluated. 
+        The variable to be evaluated.
         </div>
 <div class="required req-true">Yes</div>
 </div>
@@ -3010,10 +3019,10 @@ i.intValue(); // or use i.longValue()
 </li>
     
 </ul>
-    then <span class="code">${__eval(${SQL})}</span> will evaluate as "<span class="code">select age from birthdays where name='Smith'</span>". 
-  
+    then <span class="code">${__eval(${SQL})}</span> will evaluate as "<span class="code">select age from birthdays where name='Smith'</span>".
+
     <p>
-    This can be used in conjunction with CSV Dataset, for example 
+    This can be used in conjunction with CSV Dataset, for example
     where the both SQL statements and the values are defined in the data file.
     </p>
     
@@ -3032,7 +3041,7 @@ i.intValue(); // or use i.longValue()
 <div class="property">
 <div class="name req-true">Variable name</div>
 <div class="description req-true">
-        The variable to be evaluated. 
+        The variable to be evaluated.
         </div>
 <div class="required req-true">Yes</div>
 </div>
@@ -3151,7 +3160,7 @@ i.intValue(); // or use i.longValue()
     
 <p>
 Function to unescape a string containing HTML entity escapes
-to a string containing the actual Unicode characters corresponding to the escapes. 
+to a string containing the actual Unicode characters corresponding to the escapes.
 Supports HTML 4.0 entities.
 </p>
 
@@ -3342,7 +3351,7 @@ For example, the string <pre class="sour
 <p>
     The FileToString function can be used to read an entire file.
     Each time it is called it reads the entire file.
-    </p> 
+    </p>
     
 <p>If an error occurs opening or reading the file, then the function returns the string "<span class="code">**ERR**</span>"</p>
 
@@ -3401,7 +3410,7 @@ A reference name - <span class="code">re
     
 <p>
     The function does not work in Test elements that don't have an associated sampler.
-    For example the Test Plan. 
+    For example the Test Plan.
     Configuration elements also don't have an associated sampler.
     However some Configuration elements are referenced directly by samplers, such as the HTTP Header Manager
     and Http Cookie Manager, and in this case the functions are resolved in the context of the Http Sampler.
@@ -3601,7 +3610,7 @@ returns:
 <div class="property">
 <div class="name req-false">value to shift</div>
 <div class="description req-false">
-        Indicate the specified amount of seconds, minutes, hours or days to shift according to a textual representation of a duration such as PnDTnHnMn.nS. See https://docs.oracle.com/javase/8/docs/api/java/time/Duration.html#parse-java.lang.CharSequence- 
+        Indicate the specified amount of seconds, minutes, hours or days to shift according to a textual representation of a duration such as PnDTnHnMn.nS. See https://docs.oracle.com/javase/8/docs/api/java/time/Duration.html#parse-java.lang.CharSequence-
         <ul>
         
 <li>
@@ -3744,7 +3753,7 @@ returns:
         
 <pre class="source">${__digest(SHA-256,Felix qui potuit rerum cognoscere causas,mysalt,,)}</pre> returns <span class="code">a3bc6900fe2b2fc5fa8a601a4a84e27a079bf2c581d485009bc5c00516729ac7</span>
 <br>
-        
+
     
 </p>
 <div class="go-top">
@@ -3886,7 +3895,7 @@ returns:
 </h2>
 <div class="description">
         
-<p>The change case function returns a string value which 
+<p>The change case function returns a string value which
         case has been changed following a specific mode.
         Result can optionally be saved in a JMeter variable.</p>
     
@@ -3964,7 +3973,7 @@ returns:
 </h2>
 
 <p>
-Most variables are set by calling functions or by test elements such as User Defined Variables; 
+Most variables are set by calling functions or by test elements such as User Defined Variables;
 in which case the user has full control over the variable name that is used.
 However some variables are defined internally by JMeter. These are listed below.
 </p>
@@ -4046,9 +4055,6 @@ They are mainly intended for use in file
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -4057,7 +4063,7 @@ They are mainly intended for use in file
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/generating-dashboard.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/generating-dashboard.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/generating-dashboard.html (original)
+++ jmeter/trunk/docs/usermanual/generating-dashboard.html Sun Feb 10 12:41:03 2019
@@ -1607,9 +1607,6 @@ jmeter.reportgenerator.graph.custom_test
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -1618,7 +1615,7 @@ jmeter.reportgenerator.graph.custom_test
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/get-started.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/get-started.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jmeter/trunk/docs/usermanual/get-started.html Sun Feb 10 12:41:03 2019
@@ -915,8 +915,26 @@ options when <span class="code">-jar</sp
 
 </p>
 
+<p>Some templates may need parameters input from the user. For theses ones, after a click on the create button,
+a new window will appear as follow :
+<figure>
+<a href="../images/screenshots/templates/template_parameters.png"><img src="../images/screenshots/templates/template_parameters.png" width="" height="" alt="Parameters window"></a>
+<figcaption>Parameters window</figcaption>
+</figure>
+
+</p>
+
+<p>
+When you are done with parameters, click on the <span class="code">Validate</span> button and the template will be created.
+</p>
+
 <p>A documentation for each template explains what to do once test plan is created from template.</p>
 
+<div class="clear"></div>
+<div class="note">You can create your own templates following documentation <a href="../creating-templates.html">here</a>
+</div>
+<div class="clear"></div>
+
 </div>
 
 
@@ -931,6 +949,11 @@ from a command line with the following p
 <dl>
 
 <dt>
+<span class="code">-E</span>
+</dt>
+<dd>[proxy scheme to use - optional - for non-http]</dd>
+
+<dt>
 <span class="code">-H</span>
 </dt>
 <dd>[proxy server hostname or ip address]</dd>
@@ -958,9 +981,9 @@ from a command line with the following p
 </dl>
 
 <b>Example</b>:
-<pre class="source">jmeter -H my.proxy.server -P 8000 -u username -a password -N localhost</pre>
+<pre class="source">jmeter -E https -H my.proxy.server -P 8000 -u username -a password -N localhost</pre>
 
-<p>You can also use <span class="code">--proxyHost</span>, <span class="code">--proxyPort</span>, <span class="code">--username</span>, and <span class="code">--password</span> as parameter names</p>
+<p>You can also use <span class="code">--proxyScheme</span>, <span class="code">--proxyHost</span>, <span class="code">--proxyPort</span>, <span class="code">--username</span>, and <span class="code">--password</span> as parameter names</p>
 
 <div class="clear"></div>
 <div class="note">
@@ -969,6 +992,18 @@ Parameters provided on a command-line ma
 <div class="clear"></div>
 
 <p>
+If the proxy scheme is provided, then JMeter sets the following System properties:
+</p>
+
+<ul>
+
+<li>
+<span class="code">http.proxyScheme</span>
+</li>
+
+</ul>
+
+<p>
 If the proxy host and port are provided, then JMeter sets the following System properties:
 </p>
 
@@ -1825,9 +1860,6 @@ See also the comments in the <span class
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -1836,7 +1868,7 @@ See also the comments in the <span class
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/glossary.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/glossary.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/glossary.html (original)
+++ jmeter/trunk/docs/usermanual/glossary.html Sun Feb 10 12:41:03 2019
@@ -316,9 +316,6 @@ The formula is: Throughput = (number of
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -327,7 +324,7 @@ The formula is: Throughput = (number of
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/hints_and_tips.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/hints_and_tips.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/hints_and_tips.html (original)
+++ jmeter/trunk/docs/usermanual/hints_and_tips.html Sun Feb 10 12:41:03 2019
@@ -591,9 +591,6 @@ will match any component that contains t
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -602,7 +599,7 @@ will match any component that contains t
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/history_future.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/history_future.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/history_future.html (original)
+++ jmeter/trunk/docs/usermanual/history_future.html Sun Feb 10 12:41:03 2019
@@ -256,9 +256,6 @@ The primary goal of further developments
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -267,7 +264,7 @@ The primary goal of further developments
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/include_controller_tutorial.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/include_controller_tutorial.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/include_controller_tutorial.html (original)
+++ jmeter/trunk/docs/usermanual/include_controller_tutorial.html Sun Feb 10 12:41:03 2019
@@ -317,9 +317,6 @@ as the root and add other controllers to
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -328,7 +325,7 @@ as the root and add other controllers to
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/index.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/index.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/index.html (original)
+++ jmeter/trunk/docs/usermanual/index.html Sun Feb 10 12:41:03 2019
@@ -834,9 +834,6 @@
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -845,7 +842,7 @@
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/jmeter_accesslog_sampler_step_by_step.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/jmeter_accesslog_sampler_step_by_step.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/jmeter_accesslog_sampler_step_by_step.html (original)
+++ jmeter/trunk/docs/usermanual/jmeter_accesslog_sampler_step_by_step.html Sun Feb 10 12:41:03 2019
@@ -391,9 +391,6 @@ or from the menu
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -402,7 +399,7 @@ or from the menu
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/jmeter_distributed_testing_step_by_step.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/jmeter_distributed_testing_step_by_step.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/jmeter_distributed_testing_step_by_step.html (original)
+++ jmeter/trunk/docs/usermanual/jmeter_distributed_testing_step_by_step.html Sun Feb 10 12:41:03 2019
@@ -524,9 +524,6 @@ to stop the Linux firewall or ensure you
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -535,7 +532,7 @@ to stop the Linux firewall or ensure you
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/jmeter_proxy_step_by_step.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/jmeter_proxy_step_by_step.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/jmeter_proxy_step_by_step.html (original)
+++ jmeter/trunk/docs/usermanual/jmeter_proxy_step_by_step.html Sun Feb 10 12:41:03 2019
@@ -598,9 +598,6 @@ At the end of the test, an HTML report w
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -609,7 +606,7 @@ At the end of the test, an HTML report w
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/jmeter_tutorial.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/jmeter_tutorial.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/jmeter_tutorial.html (original)
+++ jmeter/trunk/docs/usermanual/jmeter_tutorial.html Sun Feb 10 12:41:03 2019
@@ -1562,9 +1562,6 @@ Here are some example commands.
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -1573,7 +1570,7 @@ Here are some example commands.
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/junitsampler_tutorial.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/junitsampler_tutorial.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/junitsampler_tutorial.html (original)
+++ jmeter/trunk/docs/usermanual/junitsampler_tutorial.html Sun Feb 10 12:41:03 2019
@@ -524,9 +524,6 @@ runs multi-threaded, it is important to
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -535,7 +532,7 @@ runs multi-threaded, it is important to
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/ldapanswer_xml.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapanswer_xml.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/ldapanswer_xml.html (original)
+++ jmeter/trunk/docs/usermanual/ldapanswer_xml.html Sun Feb 10 12:41:03 2019
@@ -267,9 +267,6 @@ The following tag is used:
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -278,7 +275,7 @@ The following tag is used:
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/ldapops_tutor.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapops_tutor.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/ldapops_tutor.html (original)
+++ jmeter/trunk/docs/usermanual/ldapops_tutor.html Sun Feb 10 12:41:03 2019
@@ -332,9 +332,6 @@
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -343,7 +340,7 @@
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/listeners.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/listeners.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/listeners.html (original)
+++ jmeter/trunk/docs/usermanual/listeners.html Sun Feb 10 12:41:03 2019
@@ -373,7 +373,7 @@ sampleresult.timestamp.start=true
 #sampleresult.useNanoTime=true
 
 # Use a background thread to calculate the nanoTime offset
-# Set this to &lt;= 0 to disable the background thread
+# Set this to &le;&nbsp;0 to disable the background thread
 #sampleresult.nanoThreadSleep=5000
 </pre>
 
@@ -925,9 +925,6 @@ e.g. a spreadsheet or text editor.
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -936,7 +933,7 @@ e.g. a spreadsheet or text editor.
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/properties_reference.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/properties_reference.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/properties_reference.html (original)
+++ jmeter/trunk/docs/usermanual/properties_reference.html Sun Feb 10 12:41:03 2019
@@ -372,6 +372,10 @@
 <a href="#jsr223">19.44 Advanced JSR-223 Scripting configuration</a>
 <ul></ul>
 </li>
+<li>
+<a href="#docgeneration">19.45 Documentation generation</a>
+<ul></ul>
+</li>
 </ul>
 <div class="section">
 <h1 id="introduction">19 Introduction<a class="sectionlink" href="#introduction" title="Link to here">&para;</a>
@@ -1641,6 +1645,30 @@ JMETER-SERVER</pre>
           </div>
 </div>
 
+<div class="property">
+<div class="name req-true">httpclient4.deflate_relax_mode</div>
+<div class="description req-true">
+    Ignore EOFException that some edgy application may emit to signal end of Deflated stream.<br>
+    Defaults to: <span class="code">false</span>
+
+</div>
+<div class="required req-true">
+            No
+          </div>
+</div>
+
+<div class="property">
+<div class="name req-true">httpclient4.gzip_relax_mode</div>
+<div class="description req-true">
+    Ignore EOFException that some edgy application may emit to signal end of GZipped stream.<br>
+    Defaults to: <span class="code">false</span>
+
+</div>
+<div class="required req-true">
+            No
+          </div>
+</div>
+
 </div>
 
 </div>
@@ -2231,6 +2259,19 @@ JMETER-SERVER</pre>
           </div>
 </div>
 
+<div class="property">
+<div class="name req-true">subresults.disable_renaming</div>
+<div class="description req-true">
+    Since version 5.0 JMeter has a new SubResult Naming Policy which numbers subresults by default<br>
+    This property if set to <span class="code">true</span> discards renaming policy. This can be required if you're using JMeter for functional testing.<br>
+    Defaults to: <span class="code">false</span>
+
+</div>
+<div class="required req-true">
+            No
+          </div>
+</div>
+
 </div>
 
 </div>
@@ -2414,7 +2455,7 @@ JMETER-SERVER</pre>
 <div class="description req-true">
     Binary <span class="code">content-type</span> handling.<br>
     These <span class="code">content-types</span> will be handled by saving the request in a file.<br>
-    Defaults to: <span class="code">application/x-amf,application/x-java-serialized-object</span>
+    Defaults to: <span class="code">application/x-amf,application/x-java-serialized-object,binary/octet-stream</span>
 
 </div>
 <div class="required req-true">
@@ -3060,7 +3101,7 @@ JMETER-SERVER</pre>
 <div class="name req-true">jdbc.config.jdbc.driver.class</div>
 <div class="description req-true">
     List of JDBC driver class name<br>
-    Defaults to: <pre class="source">com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDrivery|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver</pre>
+    Defaults to: <pre class="source">com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver</pre>
 
 </div>
 <div class="required req-true">
@@ -5640,6 +5681,36 @@ JMETER-SERVER</pre>
 </div>
 
 </div>
+<div class="section">
+<h1 id="docgeneration">19.45 Documentation generation<a class="sectionlink" href="#docgeneration" title="Link to here">&para;</a>
+</h1>
+
+<div class="description">Advanced properties for documentation generation</div>
+
+<div class="properties">
+<h3>
+        Parameters
+        </h3>
+<div class="property title">
+<div class="name title">Attribute</div>
+<div class="description title">Description</div>
+<div class="required title">Required</div>
+</div>
+    
+<div class="property">
+<div class="name req-true">docgeneration.schematic_xsl</div>
+<div class="description req-true">
+    Path to XSL file used to generate Schematic View of Test Plan.<br>
+    When empty, JMeter will use the embedded one in src/core/org/apache/jmeter/gui/action/schematic.xsl<br>
+    No default value</div>
+<div class="required req-true">
+            No
+          </div>
+</div>
+
+</div>
+
+</div>
 <ul class="pagelinks">
 <li>
 <a href="component_reference.html">&lt; Prev</a>
@@ -5660,9 +5731,6 @@ JMETER-SERVER</pre>
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -5671,7 +5739,7 @@ JMETER-SERVER</pre>
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/realtime-results.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/realtime-results.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/realtime-results.html (original)
+++ jmeter/trunk/docs/usermanual/realtime-results.html Sun Feb 10 12:41:03 2019
@@ -538,9 +538,6 @@ InfluxDB data can be easily viewed in a
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -549,7 +546,7 @@ InfluxDB data can be easily viewed in a
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/regular_expressions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/regular_expressions.html (original)
+++ jmeter/trunk/docs/usermanual/regular_expressions.html Sun Feb 10 12:41:03 2019
@@ -628,9 +628,6 @@ without needing to access any external s
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -639,7 +636,7 @@ without needing to access any external s
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/remote-test.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/remote-test.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jmeter/trunk/docs/usermanual/remote-test.html Sun Feb 10 12:41:03 2019
@@ -195,12 +195,12 @@
 <h1>13. Remote Testing</h1>
 
 
-<p>In the event that your JMeter client machine is unable, performance-wise, to simulate 
+<p>In the event that your JMeter client machine is unable, performance-wise, to simulate
 enough users to stress your server or is limited at network level, an option exists to control multiple, remote JMeter
-engines from a single JMeter client.  By running JMeter remotely, you can replicate 
+engines from a single JMeter client.  By running JMeter remotely, you can replicate
 a test across many low-end computers and thus simulate a larger load on the server.  One
 instance of the JMeter client can control any number of remote JMeter instances, and collect
-all the data from them.  This offers the following features: 
+all the data from them.  This offers the following features:
 
 <ul>
 
@@ -228,13 +228,13 @@ If many server instances are used, the c
 This has been improved by switching to Stripped modes (see below) but you should always check that your client is not overloaded.
 </p>
 
-<p>Note that while you can execute the JMeterEngine on your application 
-server, you need to be mindful of the fact that this will be adding processing 
-overhead on the application server and thus your testing results will be 
+<p>Note that while you can execute the JMeterEngine on your application
+server, you need to be mindful of the fact that this will be adding processing
+overhead on the application server and thus your testing results will be
 somewhat tainted.  The recommended approach is to have one or more machines on
 the same Ethernet segment as your application server that you configure to run
-the JMeter Engine.  This will minimize the impact of the network on the test 
-results without impacting the performance of the application server 
+the JMeter Engine.  This will minimize the impact of the network on the test
+results without impacting the performance of the application server
 itself.
 </p>
 
@@ -263,7 +263,7 @@ make sure that these are available in th
 If necessary you can define different values for properties by editing the <span class="code">user.properties</span> or <span class="code">system.properties</span>
 files on each server. These properties will be picked up when the server is started and may be
 used in the test plan to affect its behaviour (e.g. connecting to a different remote server).
-Alternatively use different content in any datafiles used by the test 
+Alternatively use different content in any datafiles used by the test
 (e.g. if each server must use unique ids, divide these between the data files)
 </p>
 
@@ -277,14 +277,14 @@ the <span class="code">JMETER_HOME/bin/j
 
 <p>Note that there can only be one JMeter server on each node unless different RMI ports are used.</p>
 
-<p>Since JMeter 2.3.1, the JMeter server application starts the RMI registry itself; 
+<p>Since JMeter 2.3.1, the JMeter server application starts the RMI registry itself;
 there is no need to start RMI registry separately.
 To revert to the previous behaviour, define the JMeter property <pre class="source">server.rmi.create=false</pre> on the server host systems.
 </p>
 
 <p>
 By default, RMI uses dynamic ports for the JMeter server engine. This can cause problems for firewalls,
-so you can define the JMeter property <span class="code">server.rmi.localport</span> 
+so you can define the JMeter property <span class="code">server.rmi.localport</span>
 to control this port numbers.
 If this is non-zero, it will be used as the base for local port numbers for the server engine. At the moment JMeter will open up to three ports beginning with the port defined in <span class="code">server.rmi.localport</span>.
 </p>
@@ -294,7 +294,7 @@ If this is non-zero, it will be used as
 </p>
 
 <p>Edit the properties file <i>on the controlling JMeter machine</i>.  In <span class="code">JMETER_HOME/bin/jmeter.properties</span>,
-find the property named, "<span class="code">remote_hosts</span>", and
+find the property named "<span class="code">remote_hosts</span>" and
 add the value of your running JMeter server's IP address.  Multiple such servers can be added, comma-delimited.</p>
 
 <p>Note that you can use the <span class="code">-R</span> <a href="get-started.html#override">command line option</a>
@@ -310,9 +310,9 @@ See also the <span class="code">-X</span
 <b>Step 3a: Start the JMeter Client from a GUI client to check configuration</b>
 </p>
 
-<p>Now you are ready to start the controlling JMeter client. For MS-Windows, start the client with the script "<span class="code">bin/jmeter.bat</span>".  For UNIX, 
-use the script "<span class="code">bin/jmeter</span>".  You will notice that the Run menu contains two new sub-menus: "Remote Start" and "Remote Stop" 
-(see figure 1). These menus contain the client that you set in the properties file.  Use the remote start and stop instead of the 
+<p>Now you are ready to start the controlling JMeter client. For MS-Windows, start the client with the script "<span class="code">bin/jmeter.bat</span>".  For UNIX,
+use the script "<span class="code">bin/jmeter</span>".  You will notice that the Run menu contains two new sub-menus: "Remote Start" and "Remote Stop"
+(see figure 1). These menus contain the client that you set in the properties file.  Use the remote start and stop instead of the
 normal JMeter start and stop menu items.</p>
 
 <figure>
@@ -425,7 +425,7 @@ and follow the instructions below.
 </p>
 
 <p>JMeter uses Remote Method Invocation (RMI) as the remote communication mechanism.  Therefore, you need
-to run the RMI Registry application (which is named, "<span class="code">rmiregistry</span>") that comes with the JDK and is located in the "<span class="code">bin</span>"
+to run the RMI Registry application (which is named "<span class="code">rmiregistry</span>") that comes with the JDK and is located in the "<span class="code">bin</span>"
 directory.  Before running <span class="code">rmiregistry</span>, make sure that the following jars are in your system classpath:
 <ul>
     
@@ -442,8 +442,8 @@ directory.  Before running <span class="
 </li>
 
 </ul>
-The 
-rmiregistry application needs access to certain JMeter classes.  Run <span class="code">rmiregistry</span> with no parameters.  By default the 
+The
+rmiregistry application needs access to certain JMeter classes.  Run <span class="code">rmiregistry</span> with no parameters.  By default the
 application listens to port <span class="code">1099</span>.</p>
 
 
@@ -557,7 +557,7 @@ $ SERVER_PORT=1664 jmeter-server [other
 </pre>
 [N.B. use upper case for the environment variable]
 <p>
-In both cases, the script starts rmiregistry on the specified port, 
+In both cases, the script starts rmiregistry on the specified port,
 and then starts JMeter in server mode, having defined the "<span class="code">server_port</span>" property.
 </p>
 
@@ -601,7 +601,7 @@ There are some JMeter properties that ca
 <dt>
 <span class="code">DiskStore</span>
 </dt>
-<dd>store samples in a disk file (under <span class="code">java.io.temp</span>) until the end of a run. 
+<dd>store samples in a disk file (under <span class="code">java.io.temp</span>) until the end of a run.
     The serialised data file is deleted on JVM exit.</dd>
     
 <dt>
@@ -629,13 +629,13 @@ There are some JMeter properties that ca
 <dd>time threshold, default 60000 ms = 60 seconds</dd>
         
 </dl>
-    
+
      See also the Asynch mode, described below.</dd>
     
 <dt>
 <span class="code">Statistical</span>
 </dt>
-<dd>send a summary sample when either the count or time exceeds a threshold. 
+<dd>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>
@@ -661,7 +661,7 @@ There are some JMeter properties that ca
 </li>
       
 </ul>
-    Other fields that vary between samples are lost. 
+    Other fields that vary between samples are lost.
     </dd>
     
 <dt>
@@ -696,7 +696,7 @@ There are some JMeter properties that ca
 </dt>
 <dd>set the mode parameter to your custom sample sender class name.
     This must implement the interface <span class="code">SampleSender</span> and have a constructor which takes a single
-    parameter of type <span class="code">RemoteSampleListener</span>. 
+    parameter of type <span class="code">RemoteSampleListener</span>.
     </dd>
     
 </dl>
@@ -738,15 +738,15 @@ This is not really a problem as there is
 </h2>
   
 <p>
-    For large-scale tests there is a chance that some part of remote servers will be unavailable or down. 
+    For large-scale tests there is a chance that some part of remote servers will be unavailable or down.
     For example, when you use automation script to allocate many cloud machines and use them as generators,
     some of requested machines might fail booting because of cloud's issues.
     Since JMeter 2.13 there are new properties to control this behaviour.
   </p>
   
 <p>
-    First what you might want is to retry initialization attempts in hope that failed nodes just slightly delayed their boot. 
-    To enable retries, you should set <span class="code">client.tries</span> property to total number of connection attempts. 
+    First what you might want is to retry initialization attempts in hope that failed nodes just slightly delayed their boot.
+    To enable retries, you should set <span class="code">client.tries</span> property to total number of connection attempts.
     By default it does only one attempt. To control retry delay, set the <span class="code">client.retries_delay</span> property
     to number of milliseconds to sleep between attempts.
   </p>
@@ -759,6 +759,110 @@ This is not really a problem as there is
 </div>
 
 
+<div class="subsection">
+<h2 id="security-manager">13.7 Using a security-manager<a class="sectionlink" href="#security-manager" title="Link to here">&para;</a>
+</h2>
+  
+<p>When running JMeter in a distributed environment you have to be aware, that JMeter is basically a remote execution agent on both the server and client side. This could be used by a malicious party to gain further access, once it has compromised one of the JMeter clients or servers. To mitigate this Java has the concept of a security manager that gets asked by the JVM before potential dangerous actions are executed. Those actions could be resolving host names, creating or reading files or executing commands in the OS.</p>
+  
+<p>The security manager can be enabled by setting the Java system properties <span class="code">java.security.manager</span> and <span class="code">java.security.policy</span>. Be sure to have a look at the <a href="https://docs.oracle.com/javase/tutorial/security/tour2/index.html">Quick Tour of Controlling Applications</a>.</p>
+  
+<p>Using the new mechansism of <span class="code">setenv.sh</span> (or <span class="code">setenv.bat</span> under Windows) you can enable the security manager by adding the following code snippet to <span class="code">${JMETER_HOME}/bin/setenv.sh</span>:</p>
+  
+<pre class="source">JVM_ARGS=" \
+   -Djava.security.manager \
+   -Djava.security.policy=${JMETER_HOME}/bin/java.policy \
+   -Djmeter.home=${JMETER_HOME} \
+"</pre>
+  
+<p>The JVM will now add the policies defined in the file <span class="code">${JMETER_HOME}/bin/java.policy</span> to the possibly globally defined policies. If you want your definition to be the only source for policies, use two equal signs instead of one when setting the property <span class="code">java.security.policy</span>.</p>
+  
+<p>The policies will be dependent upon your use case and it might take a while to find the correct restricted and allowed actions. Java can help you find the needed policies with the property <span class="code">java.security.debug</span>. Set it to <span class="code">access</span> and it will log all permissions, that it gets asked to allow. Simply add the following line to your <span class="code">setenv.sh</span>:</p>
+  
+<pre class="source">JVM_ARGS="${JVM_ARGS} -Djava.security.debug=access"</pre>
+  
+<p>It might look a bit strange, that we define a Java system property <span class="code">jmeter.home</span> with the value of <span class="code">${JMETER_HOME}</span>. This variable will be used in the example <span class="code">java.policy</span> to limit the file system access and allow it only to read JMeters configuration and libraries and restrict write access to specific locations, only.</p>
+  
+<p>The following policy definition file has been used for a simple remote test. You will probably have to tweak the policies, when you run more complex scenarios. The test plans are somewhere placed inside the users home directory under a directory called <span class="code">jmeter-testplans</span>. The sample <span class="code">java.policy</span> looks like:</p>
+  
+<pre class="source">
+grant codeBase "file:${jmeter.home}/bin/*" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jmeter.home}/lib/jorphan.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jmeter.home}/lib/log4j-api-2.11.1.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jmeter.home}/lib/log4j-slf4j-impl-2.11.1.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jmeter.home}/lib/slf4j-api-1.7.25.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jmeter.home}/lib/log4j-core-2.11.1.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jmeter.home}/lib/ext/*" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jmeter.home}/lib/httpclient-4.5.6.jar" {
+  permission java.net.SocketPermission "*", "connect,resolve";
+};
+
+grant codeBase "file:${jmeter.home}/lib/darcula.jar" {
+  permission java.lang.RuntimePermission "modifyThreadGroup";
+};
+
+grant codeBase "file:${jmeter.home}/lib/xercesImpl-2.12.0.jar" {
+  permission java.io.FilePermission "${java.home}/lib/xerces.properties", "read";
+};
+
+grant codeBase "file:${jmeter.home}/lib/groovy-all-2.4.15.jar" {
+  permission groovy.security.GroovyCodeSourcePermission "/groovy/script";
+  permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect";
+  permission java.lang.RuntimePermission "getProtectionDomain";
+};
+
+grant {
+  permission java.io.FilePermission "${jmeter.home}/backups", "read,write";
+  permission java.io.FilePermission "${jmeter.home}/backups/*", "read,write,delete";
+  permission java.io.FilePermission "${jmeter.home}/bin/upgrade.properties", "read";
+  permission java.io.FilePermission "${jmeter.home}/lib/ext/-", "read";
+  permission java.io.FilePermission "${jmeter.home}/lib/ext", "read";
+  permission java.io.FilePermission "${jmeter.home}/lib/-", "read";
+  permission java.io.FilePermission "${user.home}/jmeter-testplans/-", "read,write";
+  permission java.io.SerializablePermission "enableSubclassImplementation";
+  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+  permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.dynalink.support";
+  permission java.lang.RuntimePermission "accessClassInPackage.sun.awt";
+  permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
+  permission java.lang.RuntimePermission "accessClassInPackage.sun.swing";
+  permission java.lang.RuntimePermission "accessDeclaredMembers";
+  permission java.lang.RuntimePermission "createClassLoader";
+  permission java.lang.RuntimePermission "createSecurityManager";
+  permission java.lang.RuntimePermission "getClassLoader";
+  permission java.lang.RuntimePermission "getenv.*";
+  permission java.lang.RuntimePermission "nashorn.createGlobal";
+  permission java.util.PropertyPermission "*", "read";
+};
+  </pre>
+  
+<div class="clear"></div>
+<div class="note">The usage of <span class="code">java.security.AllPermission</span> is an easy way to make your test plans work, but it might be a dangerous shortcut on your path to security.</div>
+<div class="clear"></div>
+
+</div>
+
+
 </div>
 <ul class="pagelinks">
 <li>
@@ -780,9 +884,6 @@ This is not really a problem as there is
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -791,7 +892,7 @@ This is not really a problem as there is
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/docs/usermanual/test_plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/test_plan.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/test_plan.html (original)
+++ jmeter/trunk/docs/usermanual/test_plan.html Sun Feb 10 12:41:03 2019
@@ -929,9 +929,6 @@ jmeter &hellip; -Jhost=www3.example.org
 <li class="twitter">
 <a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a>
 </li>
-<li class="gplus">
-<a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a>
-</li>
 </ul>
 </div>
 <a href="#top" id="topButton">Go to top</a>
@@ -940,7 +937,7 @@ jmeter &hellip; -Jhost=www3.example.org
 <div class="copyright">
             Copyright &copy;
             1999 &ndash;
-            2018
+            2019
             , Apache Software Foundation
           </div>
 <div class="trademarks">Apache, Apache JMeter, JMeter, the Apache

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Sun Feb 10 12:41:03 2019
@@ -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 = "5.1-SNAPSHOT";
+    private static final String VERSION = "5.1";
 
     private static final String IMPLEMENTATION;
 

Modified: jmeter/trunk/xdocs/download_jmeter.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/download_jmeter.xml?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/xdocs/download_jmeter.xml (original)
+++ jmeter/trunk/xdocs/download_jmeter.xml Sun Feb 10 12:41:03 2019
@@ -18,7 +18,7 @@
 
 <!DOCTYPE document
 [
-<!ENTITY release '5.0'>
+<!ENTITY release '5.1'>
 <!ENTITY hellip   "&#x02026;" >
 ]>
     
@@ -78,7 +78,7 @@
       <a href="https://www.apache.org/dist/jmeter/KEYS">KEYS</a>
       </p>
     </section>
-    <section name="Apache JMeter &release; (Requires Java 8 or 9.)">
+    <section name="Apache JMeter &release; (Requires Java 8+)">
       <subsection name="Binaries" anchor="binaries">
         <table>
           <tr>

Modified: jmeter/trunk/xdocs/overview.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/overview.html?rev=1853306&r1=1853305&r2=1853306&view=diff
==============================================================================
--- jmeter/trunk/xdocs/overview.html (original)
+++ jmeter/trunk/xdocs/overview.html Sun Feb 10 12:41:03 2019
@@ -18,7 +18,7 @@
 <!-- This file is copied into the Javadoc overview -->
 <html>
 <body>
-This is the documentation for Apache JMeter version 5.0 API.
-@version 5.0
+This is the documentation for Apache JMeter version 5.1 API.
+@version 5.1
 </body>
 </html>
\ No newline at end of file



Mime
View raw message