jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1840934 - in /jmeter/trunk/docs: ./ images/screenshots/ images/screenshots/assertion/ images/screenshots/changes/4.0/ images/screenshots/changes/5.0/ images/screenshots/extractor/ images/screenshots/webtest/ usermanual/
Date Fri, 14 Sep 2018 15:03:07 GMT
Author: milamber
Date: Fri Sep 14 15:03:07 2018
New Revision: 1840934

URL: http://svn.apache.org/viewvc?rev=1840934&view=rev
Log:
Prepare next release 5.0: update docs tree and overview (RC2)

Modified:
    jmeter/trunk/docs/changes.html
    jmeter/trunk/docs/images/screenshots/JMETER_4.0.png
    jmeter/trunk/docs/images/screenshots/apply_naming_policy1.png
    jmeter/trunk/docs/images/screenshots/apply_naming_policy2.png
    jmeter/trunk/docs/images/screenshots/assertion/assertion.png
    jmeter/trunk/docs/images/screenshots/assertion/json_assertion.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/boundary_extractor.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/function_helper_dialog_enhancements.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/goodbye_workbench.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/if_controller_condition.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/if_controller_expression.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/jmsptp_communication_styles.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/json_assertion.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/menu_organization.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/precise_throughput_timer.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/recorder_naming_samplers.png
    jmeter/trunk/docs/images/screenshots/changes/4.0/response_assertion_enhancements.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_custom_graphs.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_distributed.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_flow_control_action.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_hits_per_sec.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_recording.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_rest1.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_rest2.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_restart.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_result_status_handler.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_search_feature.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_total_trans_per_sec.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_vrt_request_body.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_vrt_response_body.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_xpath2_extractor.png
    jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_xpath2_tester.png
    jmeter/trunk/docs/images/screenshots/extractor/boundary_extractor.png
    jmeter/trunk/docs/images/screenshots/setup_thread_group.png
    jmeter/trunk/docs/images/screenshots/teardown_thread_group.png
    jmeter/trunk/docs/images/screenshots/thread_group_distributed.png
    jmeter/trunk/docs/images/screenshots/threadgroup.png
    jmeter/trunk/docs/images/screenshots/webtest/http-cookie-manager.png
    jmeter/trunk/docs/images/screenshots/xpath2_extractor.png
    jmeter/trunk/docs/usermanual/component_reference.html
    jmeter/trunk/docs/usermanual/properties_reference.html

Modified: jmeter/trunk/docs/changes.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/changes.html?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
--- jmeter/trunk/docs/changes.html (original)
+++ jmeter/trunk/docs/changes.html Fri Sep 14 15:03:07 2018
@@ -385,7 +385,7 @@ available in the HTML Report in <span cl
 
 <h3 class="ch_title">Functions</h3>
 
-<p>A New function <span class="code">__threadGroupName</span> has been
introduced to obtain ThreadGroup name.</p>
+<p>A New function <span class="code"><a href="./usermanual/functions.html#__threadGroupName">__threadGroupName</a></span>
has been introduced to obtain ThreadGroup name.</p>
 
 
 
@@ -599,21 +599,21 @@ this behaviour, set <span class="code">h
       Bug
       62178</a>
     -
-  Add default value to <span class="code">__V</span> function. Contributed by
orimarko at gmail.com</li>
+  Add default value to <span class="code"><a href="./usermanual/functions.html#__V">__V</a></span>
function. Contributed by orimarko at gmail.com</li>
     
 <li>
 <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=62178">
       Bug
       62178</a>
     -
-  Add function <span class="code">__threadGroupName</span> function to obtain
ThreadGroup name. Mainly contributed by orimarko at gmail.com</li>
+  Add function <span class="code"><a href="./usermanual/functions.html#__threadGroupName">__threadGroupName</a></span>
function to obtain ThreadGroup name. Mainly contributed by orimarko at gmail.com</li>
     
 <li>
 <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=62533">
       Bug
       62533</a>
     -
-  Allow use epoch time as Date String value in function <span class="code">__dateTimeConvert</span>

+  Allow use epoch time as Date String value in function <span class="code"><a href="./usermanual/functions.html#__dateTimeConvert">__dateTimeConvert</a></span>

 </li>
     
 <li>
@@ -621,7 +621,7 @@ this behaviour, set <span class="code">h
       Bug
       62541</a>
     -
-  Allow <span class="code">__jexl3</span>,<span class="code">__jexl2</span>
functions to support new syntax as <span class="code">var x;</span>. Contributed
by orimarko at gmail.com</li>
+  Allow <span class="code">funclink name="__jexl3"/&gt;</span>, <span
class="code"><a href="./usermanual/functions.html#__jexl2">__jexl2</a></span>
functions to support new syntax as <span class="code">var x;</span>. Contributed
by orimarko at gmail.com</li>
     
 <li>
 <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=61834">
@@ -774,7 +774,7 @@ this behaviour, set <span class="code">h
       Bug
       62700</a>
     -
-  Introduce groovy.init.file to allow calling a groovy script on JMeter startup</li>
+  Introduce <span class="code">jsr223.init.file</span> to allow calling a JSR-223
script on JMeter startup</li>
   
 <li>
 <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=62128">
@@ -852,7 +852,7 @@ this behaviour, set <span class="code">h
       Bug
       62113</a>
     -
-  Updated to latest Bouncycastle (v1.59). Based on contribution by Olaf Flebbe (oflebbe at
apache.org)</li>
+  Updated to latest Bouncycastle (v1.60). Based on contribution by Olaf Flebbe (oflebbe at
apache.org)</li>
     
 <li>
 <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=62171">
@@ -961,6 +961,13 @@ this behaviour, set <span class="code">h
       58807</a>
     -
   <span class="code">Reset SSL State on Thread Group iteration only (was https.use.cached.ssl.context=false</span>
is broken)</li>
+    
+<li>
+<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=62716">
+      Bug
+      62716</a>
+    -
+  When Recording, JMeter removes Authorization from generated Header Manager when using Bearer
Token</li>
 
 </ul>
 

Modified: jmeter/trunk/docs/images/screenshots/JMETER_4.0.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/JMETER_4.0.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

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

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

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

Modified: jmeter/trunk/docs/images/screenshots/assertion/json_assertion.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/assertion/json_assertion.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/boundary_extractor.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/boundary_extractor.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/function_helper_dialog_enhancements.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/function_helper_dialog_enhancements.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/goodbye_workbench.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/goodbye_workbench.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/if_controller_condition.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/if_controller_condition.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/if_controller_expression.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/if_controller_expression.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/jmsptp_communication_styles.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/jmsptp_communication_styles.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/json_assertion.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/json_assertion.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/menu_organization.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/menu_organization.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/precise_throughput_timer.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/precise_throughput_timer.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/recorder_naming_samplers.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/recorder_naming_samplers.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/4.0/response_assertion_enhancements.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/4.0/response_assertion_enhancements.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_custom_graphs.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_custom_graphs.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_distributed.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_distributed.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_flow_control_action.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_flow_control_action.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_hits_per_sec.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_hits_per_sec.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_recording.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_recording.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_rest1.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_rest1.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_rest2.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_rest2.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_restart.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_restart.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_result_status_handler.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_result_status_handler.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_search_feature.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_search_feature.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_total_trans_per_sec.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_total_trans_per_sec.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_vrt_request_body.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_vrt_request_body.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_vrt_response_body.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_vrt_response_body.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_xpath2_extractor.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_xpath2_extractor.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_xpath2_tester.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/5.0/jmeter_5_xpath2_tester.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/extractor/boundary_extractor.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/extractor/boundary_extractor.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

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

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

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

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

Modified: jmeter/trunk/docs/images/screenshots/webtest/http-cookie-manager.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/webtest/http-cookie-manager.png?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
Binary files - no diff available.

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

Modified: jmeter/trunk/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/component_reference.html?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jmeter/trunk/docs/usermanual/component_reference.html Fri Sep 14 15:03:07 2018
@@ -6112,7 +6112,7 @@ If the last sample just before the loop
 <div class="clear"></div>
 <div class="note">
 The condition can be any variable or function that eventually evaluates to the string "<span
class="code">false</span>".
-This allows the use of <span class="code">__jexl3</span>, <span class="code">__groovy</span>
function, properties or variables as needed.
+This allows the use of <span class="code"><a href="../usermanual/functions.html#__jexl3">__jexl3</a></span>,
<span class="code"><a href="../usermanual/functions.html#__groovy">__groovy</a></span>
function, properties or variables as needed.
 </div>
 <div class="clear"></div>
 
@@ -12095,16 +12095,24 @@ The non-tolerant parser can be quite slo
 <div class="note">
 
 <b>NAMESPACES</b>
-As a work-round for namespace limitations of the Xalan XPath parser implementation on which
JMeter is based,
-you can provide a Properties file which contains mappings for the namespace prefixes: 
+<br>
+As a work-round for namespace limitations of the Xalan XPath parser (implementation on which
JMeter is based) you need to:
+<ul>
+
+<li>provide a Properties file (if for example your file is named namespaces.properties)
which contains mappings for the namespace prefixes: 
 <pre class="source">
-prefix1=Full Namespace 1
-prefix2=Full Namespace 2
+prefix1=http\://foo.apache.org
+prefix2=http\://toto.apache.org
 &hellip;
 </pre>
+</li>
 
-You reference this file in <span class="code">jmeter.properties</span> file using
the property:
-    <pre class="source">xpath.namespace.config</pre>
+
+<li>reference this file in <span class="code">user.properties</span> file
using the property:
+    <pre class="source">xpath.namespace.config=namespaces.properties</pre>
+</li>
+
+</ul>
 
 </div>
 <div class="clear"></div>
@@ -15073,16 +15081,24 @@ extracting the node as text or attribute
 <div class="note">
 
 <b>NAMESPACES</b>
-As a work-round for namespace limitations of the Xalan XPath parser implementation on which
JMeter is based,
-you can provide a Properties file which contains mappings for the namespace prefixes: 
+<br>
+As a work-round for namespace limitations of the Xalan XPath parser (implementation on which
JMeter is based) you need to:
+<ul>
+
+<li>provide a Properties file (if for example your file is named namespaces.properties)
which contains mappings for the namespace prefixes: 
 <pre class="source">
-prefix1=Full Namespace 1
-prefix2=Full Namespace 2
+prefix1=http\://foo.apache.org
+prefix2=http\://toto.apache.org
 &hellip;
 </pre>
+</li>
 
-You reference this file in <span class="code">jmeter.properties</span> file using
the property:
-    <pre class="source">xpath.namespace.config</pre>
+
+<li>reference this file in <span class="code">user.properties</span> file
using the property:
+    <pre class="source">xpath.namespace.config=namespaces.properties</pre>
+</li>
+
+</ul>
 
 </div>
 <div class="clear"></div>

Modified: jmeter/trunk/docs/usermanual/properties_reference.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/properties_reference.html?rev=1840934&r1=1840933&r2=1840934&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/properties_reference.html (original)
+++ jmeter/trunk/docs/usermanual/properties_reference.html Fri Sep 14 15:03:07 2018
@@ -368,6 +368,10 @@
 <a href="#groovy">19.43 Advanced Groovy Scripting configuration</a>
 <ul></ul>
 </li>
+<li>
+<a href="#jsr223">19.44 Advanced JSR-223 Scripting configuration</a>
+<ul></ul>
+</li>
 </ul>
 <div class="section">
 <h1 id="introduction">19 Introduction<a class="sectionlink" href="#introduction"
title="Link to here">&para;</a>
@@ -2704,7 +2708,9 @@ JMETER-SERVER</pre>
     
 <dl>
         
-<dt>org.apache.jmeter.protocol.http.parser.LagartoBasedHtmlParser</dt>
+<dt>
+<span class="code">org.apache.jmeter.protocol.http.parser.LagartoBasedHtmlParser</span>
+</dt>
         
 <dd>This new parser (since 2.10) should perform better than all others. See <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=55632">
       Bug
@@ -4154,7 +4160,7 @@ JMETER-SERVER</pre>
 <div class="name req-true">javascript.use_rhino</div>
 <div class="description req-true">
     Ability to switch to Rhino as default Javascript Engine used by <span class="code">IfController</span>
-    and <span class="code">__javaScript</span> function.<br>
+    and <span class="code"><a href="../usermanual/functions.html#__javaScript">__javaScript</a></span>
function.<br>
     
 <div class="clear"></div>
 <div class="note">JMeter uses Nashorn since 3.2 version.
@@ -4458,18 +4464,6 @@ JMETER-SERVER</pre>
           </div>
 </div>
 
-<div class="property">
-<div class="name req-true">jsr223.compiled_scripts_cache_size</div>
-<div class="description req-true">
-    Used by JSR223 elements.<br>
-    Size of compiled scripts cache.<br>
-    Defaults to: <span class="code">100</span>
-</div>
-<div class="required req-true">
-            No
-          </div>
-</div>
-
 </div>
 
 </div>
@@ -5557,7 +5551,7 @@ JMETER-SERVER</pre>
 <h1 id="groovy">19.43 Advanced Groovy Scripting configuration<a class="sectionlink"
href="#groovy" title="Link to here">&para;</a>
 </h1>
 
-<div class="description">Advanced properties for configuration of scripting in Grooyv</div>
+<div class="description">Advanced properties for configuration of scripting in Groovy</div>
 
 <div class="properties">
 <h3>
@@ -5570,11 +5564,49 @@ JMETER-SERVER</pre>
 </div>
     
 <div class="property">
-<div class="name req-true">groovy.init.file</div>
+<div class="name req-true">groovy.utilities</div>
 <div class="description req-true">
-    Path to Groovy file containing script to call on JMeter startup. <br>
-    This script can use pre-defined variables:
-    <ul>
+    Path to Groovy file containing utility functions to make available to <span class="code"><a
href="../usermanual/functions.html#__groovy">__groovy</a></span> function.<br>
+    Defaults to <span class="code">bin/utility.groovy</span> 
+    
+</div>
+<div class="required req-true">
+            No
+          </div>
+</div>
+
+</div>
+
+</div>
+<div class="section">
+<h1 id="jsr223">19.44 Advanced JSR-223 Scripting configuration<a class="sectionlink"
href="#jsr223" title="Link to here">&para;</a>
+</h1>
+
+<div class="description">Advanced properties for configuration of scripting in JSR-223</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">jsr223.init.file</div>
+<div class="description req-true">
+    
+<p>Path to JSR-223 file containing script to call on JMeter startup.</p>
+    
+<p>The actual scripting engine to use will be determined by the extension
+    of the init file name. If the file name has no extension, or no scripting
+    engine could be found for that extension, Groovy will be used.</p>
+    
+<p>This script can use pre-defined variables:</p>
+    
+<ul>
         
 <li>
 <span class="code">log</span>: Logger to log any message, uses SLF4J library</li>
@@ -5586,7 +5618,7 @@ JMETER-SERVER</pre>
 <span class="code">OUT</span>: System.OUT, useful to write in the console</li>
     
 </ul>
-    No script is defined by default. 
+    No script is defined by default.
     </div>
 <div class="required req-true">
             No
@@ -5594,11 +5626,11 @@ JMETER-SERVER</pre>
 </div>
     
 <div class="property">
-<div class="name req-true">groovy.utilities</div>
+<div class="name req-true">jsr223.compiled_scripts_cache_size</div>
 <div class="description req-true">
-    Path to Groovy file containing utility functions to make available to __groovy function.
<br>
-    Defaults to <span class="code">bin/utility.groovy</span> 
-    
+    Used by JSR-223 elements.<br>
+    Size of compiled scripts cache.<br>
+    Defaults to: <span class="code">100</span>
 </div>
 <div class="required req-true">
             No



Mime
View raw message