Modified: jmeter/trunk/docs/usermanual/ldapanswer_xml.html URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapanswer_xml.html?rev=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/docs/usermanual/ldapanswer_xml.html (original) +++ jmeter/trunk/docs/usermanual/ldapanswer_xml.html Sun Sep 9 15:25:54 2018 @@ -272,6 +272,7 @@ The following tag is used: </li> </ul> </div> +<a href="#top" id="topButton">Go to top</a> </div> <div class="footer"> <div class="copyright"> @@ -287,8 +288,16 @@ The following tag is used: </div> </div> <script>(function(){ - // fill in the current location into social links on this page. "use strict"; + // enable 'go to top' button functionality + document.addEventListener('scroll', function() { + if (document.body.scrollTop > 500 || document.documentElement.scrollTop > 500) { + document.getElementById("topButton").style.display = "block"; + } else { + document.getElementById("topButton").style.display = "none"; + } + }); + // fill in the current location into social links on this page. var as = document.getElementsByTagName('a'); var loc = document.location.href; if (!loc.toLowerCase().startsWith('http')) {
Modified: jmeter/trunk/docs/usermanual/ldapops_tutor.html URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapops_tutor.html?rev=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/docs/usermanual/ldapops_tutor.html (original) +++ jmeter/trunk/docs/usermanual/ldapops_tutor.html Sun Sep 9 15:25:54 2018 @@ -337,6 +337,7 @@ </li> </ul> </div> +<a href="#top" id="topButton">Go to top</a> </div> <div class="footer"> <div class="copyright"> @@ -352,8 +353,16 @@ </div> </div> <script>(function(){ - // fill in the current location into social links on this page. "use strict"; + // enable 'go to top' button functionality + document.addEventListener('scroll', function() { + if (document.body.scrollTop > 500 || document.documentElement.scrollTop > 500) { + document.getElementById("topButton").style.display = "block"; + } else { + document.getElementById("topButton").style.display = "none"; + } + }); + // fill in the current location into social links on this page. var as = document.getElementsByTagName('a'); var loc = document.location.href; if (!loc.toLowerCase().startsWith('http')) { Modified: jmeter/trunk/docs/usermanual/listeners.html URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/listeners.html?rev=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/docs/usermanual/listeners.html (original) +++ jmeter/trunk/docs/usermanual/listeners.html Sun Sep 9 15:25:54 2018 @@ -930,6 +930,7 @@ e.g. a spreadsheet or text editor. </li> </ul> </div> +<a href="#top" id="topButton">Go to top</a> </div> <div class="footer"> <div class="copyright"> @@ -945,8 +946,16 @@ e.g. a spreadsheet or text editor. </div> </div> <script>(function(){ - // fill in the current location into social links on this page. "use strict"; + // enable 'go to top' button functionality + document.addEventListener('scroll', function() { + if (document.body.scrollTop > 500 || document.documentElement.scrollTop > 500) { + document.getElementById("topButton").style.display = "block"; + } else { + document.getElementById("topButton").style.display = "none"; + } + }); + // fill in the current location into social links on this page. var as = document.getElementsByTagName('a'); var loc = document.location.href; if (!loc.toLowerCase().startsWith('http')) { Modified: jmeter/trunk/docs/usermanual/properties_reference.html URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/properties_reference.html?rev=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/docs/usermanual/properties_reference.html (original) +++ jmeter/trunk/docs/usermanual/properties_reference.html Sun Sep 9 15:25:54 2018 @@ -364,6 +364,10 @@ <a href="#help">19.42 Help</a> <ul></ul> </li> +<li> +<a href="#groovy">19.43 Advanced Groovy Scripting configuration</a> +<ul></ul> +</li> </ul> <div class="section"> <h1 id="introduction">19 Introduction<a class="sectionlink" href="#introduction" title="Link to here">¶</a> @@ -464,6 +468,17 @@ These properties are only taken into acc </div> </div> +<div class="property"> +<div class="name req-true">xpath2query.parser.cache.size</div> +<div class="description req-true">XPath2 query cache for storing compiled XPath queries + Defaults to <span class="code">400</span> + +</div> +<div class="required req-true"> + No + </div> +</div> + </div> </div> @@ -558,11 +573,37 @@ defined in the <span class="code">system </div> <div class="property"> +<div class="name req-true">httpclient.reset_state_on_thread_group_iteration</div> +<div class="description req-true"> +Reset HTTP State when starting a new Thread Group iteration. +In summary<span class="code">true</span> means next iteration is associated to a new user. +<span class="code">false</span> means next iteration is associated to same user. +<span class="code">true</span> involves: + <ul> + +<li>Closing opened connection</li> + +<li>resetting SSL State</li> + +</ul> +Defaults to: <span class="code">true</span> + +</div> +<div class="required req-true"> + No + </div> +</div> + +<div class="property"> <div class="name req-true">https.use.cached.ssl.context</div> <div class="description req-true"> Control if we allow reuse of cached SSL context between iterations.<br> Set the value to <span class="code">false</span> to reset the SSL context each iteration.<br> Defaults to: <span class="code">true</span> + +<div class="clear"></div> +<div class="note">DEPRECATED, you should use <span class="code">httpclient.reset_state_on_thread_group_iteration</span> with correct value</div> +<div class="clear"></div> </div> <div class="required req-true"> @@ -1308,6 +1349,19 @@ JMETER-SERVER</pre> </div> <div class="property"> +<div class="name req-true">http.post_add_content_type_if_missing</div> +<div class="description req-true"> + Should JMeter add to POST request a Header <span class="code">Content-type: application/x-www-form-urlencoded</span> if missing? <br> + Was true before version 4.1.<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">httpclient.timeout</div> <div class="description req-true"> Set the socket timeout (or use the parameter <span class="code">http.socket.timeout</span>) for @@ -1422,6 +1476,18 @@ JMETER-SERVER</pre> </div> </div> +<div class="property"> +<div class="name req-true">kerberos.spnego.delegate_cred</div> +<div class="description req-true"> + Should SPNEGO authentication should use delegation of credentials. + Defaults to: <span class="code">false</span> + +</div> +<div class="required req-true"> + No + </div> +</div> + </div> </div> @@ -2290,7 +2356,7 @@ JMETER-SERVER</pre> redirects and allows relative paths.<br> If you want to test strict conformance, set this value to <span class="code">true</span>.<br> When the property is <span class="code">true</span>, JMeter follows - <a href="http://tools.ietf.org/html/rfc3986#section-5.2";>RFC 3986 section 5.2</a>.<br> + <a href="https://tools.ietf.org/html/3986#section-5.2";>RFC 3986 section 5.2</a>.<br> Defaults to: <span class="code">false</span> </div> @@ -4440,7 +4506,7 @@ JMETER-SERVER</pre> <div class="name req-true">user.classpath</div> <div class="description req-true"> List of directories that JMeter will search for utility and plugin dependency classes.<br> - Use your platform path separator to separate multiple paths.<br> + Use your platform path separator (<span class="code">java.io.File.pathSeparatorChar</span> in Java) to separate multiple paths.<br> Any jar file in such a directory will be automatically included; jar files in sub directories are ignored.<br> The given value is in addition to any jars found in the <span class="code">lib</span> directory.<br> All entries will be added to the class path of the system class loader and also to the path @@ -5487,6 +5553,61 @@ JMETER-SERVER</pre> </div> </div> +<div class="section"> +<h1 id="groovy">19.43 Advanced Groovy Scripting configuration<a class="sectionlink" href="#groovy" title="Link to here">¶</a> +</h1> + +<div class="description">Advanced properties for configuration of scripting in Grooyv</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">groovy.init.file</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> + +<li> +<span class="code">log</span>: Logger to log any message, uses SLF4J library</li> + +<li> +<span class="code">props</span>: JMeter Properties</li> + +<li> +<span class="code">OUT</span>: System.OUT, useful to write in the console</li> + +</ul> + No script is defined by default. + </div> +<div class="required req-true"> + No + </div> +</div> + +<div class="property"> +<div class="name req-true">groovy.utilities</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> + +</div> +<div class="required req-true"> + No + </div> +</div> + +</div> + +</div> <ul class="pagelinks"> <li> <a href="component_reference.html">< Prev</a> @@ -5512,6 +5633,7 @@ JMETER-SERVER</pre> </li> </ul> </div> +<a href="#top" id="topButton">Go to top</a> </div> <div class="footer"> <div class="copyright"> @@ -5527,8 +5649,16 @@ JMETER-SERVER</pre> </div> </div> <script>(function(){ - // fill in the current location into social links on this page. "use strict"; + // enable 'go to top' button functionality + document.addEventListener('scroll', function() { + if (document.body.scrollTop > 500 || document.documentElement.scrollTop > 500) { + document.getElementById("topButton").style.display = "block"; + } else { + document.getElementById("topButton").style.display = "none"; + } + }); + // fill in the current location into social links on this page. var as = document.getElementsByTagName('a'); var loc = document.location.href; if (!loc.toLowerCase().startsWith('http')) { Modified: jmeter/trunk/docs/usermanual/realtime-results.html URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/realtime-results.html?rev=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/docs/usermanual/realtime-results.html (original) +++ jmeter/trunk/docs/usermanual/realtime-results.html Sun Sep 9 15:25:54 2018 @@ -381,6 +381,18 @@ In this document we will present the con <dd>Number of responses for sampler name (sum of ok.count and ko.count)</dd> <dt> +<span class="code"><rootMetricsPrefix><samplerName>.sb.bytes</span> +</dt> + +<dd>Sent Bytes</dd> + +<dt> +<span class="code"><rootMetricsPrefix><samplerName>.rb.bytes</span> +</dt> + +<dd>Received Bytes</dd> + +<dt> <span class="code"><rootMetricsPrefix><samplerName>.a.min</span> </dt> @@ -434,12 +446,12 @@ In this document we will present the con </h2> <p> - To make JMeter send metrics to backend add a <a href="./component_reference.html#Backend_Listener">BackendListener</a> using the GraphiteBackendListenerClient. + To make JMeter send metrics to backend add a <a href="./component_reference.html#Backend_Listener">BackendListener</a> using the InfluxDBBackendListenerClient. </p> <figure> -<a href="../images/screenshots/backend_listener.png"><img src="../images/screenshots/backend_listener.png" width="902" height="341" alt="Graphite configuration"></a> -<figcaption>Graphite configuration</figcaption> +<a href="../images/screenshots/backend_listener.png"><img src="../images/screenshots/backend_listener.png" width="902" height="341" alt="InfluxDB configuration"></a> +<figcaption>InfluxDB configuration</figcaption> </figure> </div> @@ -449,18 +461,14 @@ In this document we will present the con <h2 id="influxdb_db_configuration">15.3 InfluxDB database configuration<a class="sectionlink" href="#influxdb_db_configuration" title="Link to here">¶</a> </h2> -<p>Connect to InfluxDB using <a href="https://docs.influxdata.com/influxdb/v1.1/introduction/getting_started/";>influx shell</a> and <a href="https://docs.influxdata.com/influxdb/v1.1/query_language/database_management/";>create two databases</a>: +<p>Connect to InfluxDB using <a href="https://docs.influxdata.com/influxdb/latest/introduction/getting_started/";>InfluxDB’s Command Line Interface (CLI).</a> and <a href="https://docs.influxdata.com/influxdb/latest/query_language/database_management/";>create JMeter database</a>: <ul> -<li>grafana : Used by Grafana to store the dashboards we will create</li> - -<li>jmeter : Used by InfluxDB to store the data sent to Graphite Listener as per database="jmeter" config - element in <span class="code">influxdb.conf</span> or <span class="code">config.toml</span> -</li> +<li>jmeter : Used by InfluxDB to store the data sent by the Backend Listener</li> </ul> - -</p> + You can do it too by using the HTTP API. + </p> <div class="subsection"> @@ -469,34 +477,12 @@ In this document we will present the con <p>InfluxDB is an open-source, distributed, time-series database that allows to easily store metrics. -Installation and configuration is very easy, read this for more details <a href="https://docs.influxdata.com/influxdb/v1.1/introduction/installation/"; target="_blank">InfluxDB documentation</a>.<br> -InfluxDB data can be easily viewed in a browser through either <a href="https://github.com/hakobera/influga"; target="_blank">Influga</a> or <a href="http://grafana.org/"; target="_blank">Grafana</a>. -We will use Grafana in this case. -<b>There is no particular configuration to setup when using <span class="code">InfluxDBBackendListenerClient</span></b> - +Installation and configuration is very easy, read this for more details <a href="https://docs.influxdata.com/influxdb/latest/introduction/installation/"; target="_blank">InfluxDB documentation</a>.<br> +InfluxDB data can be easily viewed in a browser through <a href="http://grafana.org/"; target="_blank">Grafana</a>. </p> </div> - -<div class="subsection"> -<h2 id="influxdb_through_graphite_configuration">15.3.2 InfluxDB setup for GraphiteBackendListenerClient<a class="sectionlink" href="#influxdb_through_graphite_configuration" title="Link to here">¶</a> -</h2> - -<p>To enable Graphite listener in InfluxDB for <span class="code">GraphiteBackendListenerClient</span>, edit files <span class="code">/opt/influxdb/shared/config.toml</span> or <span class="code">/usr/local/etc/influxdb.conf</span>, - find "<span class="code">[[graphite]]</span>" and set this: - </p> - -<pre class="source"> -# Configure the graphite api -[[graphite]] -enabled = true -bind-address = ":2003" # If not set, is actually set to bind-address. -database = "jmeter" # store graphite data in this database - </pre> - -</div> - </div> @@ -505,36 +491,12 @@ database = "jmeter" # store graphite da </h2> <p> - Installing grafana is just a matter of putting the unzipped bundle behind an Apache HTTP server.<br> - Read <a href="http://grafana.org/docs/"; target="_blank">documentation</a> for more details. - Open <span class="code">config.js</span> file and find <span class="code">datasources</span> element, and edit it like this:<br> + Installing grafana<br> + Read <a href="http://docs.grafana.org/"; target="_blank">documentation</a> for more details. + Add the <a href="http://docs.grafana.org/features/datasources/influxdb/"; target="_blank">datasource</a> +<br> </p> - -<pre class="source"> -datasources: { - influxdb: { - type: 'influxdb', - url: "http://influx_db_host:8086/db/jmeter";, - username: 'root', - password: 'root', - }, - grafana: { - type: 'influxdb', - url: "http://influx_db_host:8086/db/grafana";, - username: 'root', - password: 'root', - grafanaDB: true - }, -}, - </pre> - -<div class="clear"></div> -<div class="note"> - Note that grafana has "<span class="code">grafanaDB:true</span>". Also note that here we use <span class="code">root</span> user for simplicity - It is better to dedicate a special user with restricted rights. - </div> -<div class="clear"></div> Here is the kind of dashboard that you could obtain: <figure> <a href="../images/screenshots/grafana_dashboard.png"><img src="../images/screenshots/grafana_dashboard.png" width="1265" height="581" alt="Grafana dashboard"></a> @@ -581,6 +543,7 @@ datasources: { </li> </ul> </div> +<a href="#top" id="topButton">Go to top</a> </div> <div class="footer"> <div class="copyright"> @@ -596,8 +559,16 @@ datasources: { </div> </div> <script>(function(){ - // fill in the current location into social links on this page. "use strict"; + // enable 'go to top' button functionality + document.addEventListener('scroll', function() { + if (document.body.scrollTop > 500 || document.documentElement.scrollTop > 500) { + document.getElementById("topButton").style.display = "block"; + } else { + document.getElementById("topButton").style.display = "none"; + } + }); + // fill in the current location into social links on this page. var as = document.getElementsByTagName('a'); var loc = document.location.href; if (!loc.toLowerCase().startsWith('http')) { Modified: jmeter/trunk/docs/usermanual/regular_expressions.html URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/docs/usermanual/regular_expressions.html (original) +++ jmeter/trunk/docs/usermanual/regular_expressions.html Sun Sep 9 15:25:54 2018 @@ -633,6 +633,7 @@ without needing to access any external s </li> </ul> </div> +<a href="#top" id="topButton">Go to top</a> </div> <div class="footer"> <div class="copyright"> @@ -648,8 +649,16 @@ without needing to access any external s </div> </div> <script>(function(){ - // fill in the current location into social links on this page. "use strict"; + // enable 'go to top' button functionality + document.addEventListener('scroll', function() { + if (document.body.scrollTop > 500 || document.documentElement.scrollTop > 500) { + document.getElementById("topButton").style.display = "block"; + } else { + document.getElementById("topButton").style.display = "none"; + } + }); + // fill in the current location into social links on this page. var as = document.getElementsByTagName('a'); var loc = document.location.href; if (!loc.toLowerCase().startsWith('http')) { Modified: jmeter/trunk/docs/usermanual/remote-test.html URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/remote-test.html?rev=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/docs/usermanual/remote-test.html (original) +++ jmeter/trunk/docs/usermanual/remote-test.html Sun Sep 9 15:25:54 2018 @@ -283,10 +283,10 @@ To revert to the previous behaviour, def </p> <p> -By default, RMI uses a dynamic port for the JMeter server engine. This can cause problems for firewalls, -so with you can define the JMeter property <span class="code">server.rmi.localport</span> -to control this port number. -If this is non-zero, it will be used as the local port number for the server engine. +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> +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> <p> @@ -785,6 +785,7 @@ This is not really a problem as there is </li> </ul> </div> +<a href="#top" id="topButton">Go to top</a> </div> <div class="footer"> <div class="copyright"> @@ -800,8 +801,16 @@ This is not really a problem as there is </div> </div> <script>(function(){ - // fill in the current location into social links on this page. "use strict"; + // enable 'go to top' button functionality + document.addEventListener('scroll', function() { + if (document.body.scrollTop > 500 || document.documentElement.scrollTop > 500) { + document.getElementById("topButton").style.display = "block"; + } else { + document.getElementById("topButton").style.display = "none"; + } + }); + // fill in the current location into social links on this page. var as = document.getElementsByTagName('a'); var loc = document.location.href; if (!loc.toLowerCase().startsWith('http')) { Modified: jmeter/trunk/docs/usermanual/test_plan.html URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/test_plan.html?rev=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/docs/usermanual/test_plan.html (original) +++ jmeter/trunk/docs/usermanual/test_plan.html Sun Sep 9 15:25:54 2018 @@ -934,6 +934,7 @@ jmeter … -Jhost=www3.example.org </li> </ul> </div> +<a href="#top" id="topButton">Go to top</a> </div> <div class="footer"> <div class="copyright"> @@ -949,8 +950,16 @@ jmeter … -Jhost=www3.example.org </div> </div> <script>(function(){ - // fill in the current location into social links on this page. "use strict"; + // enable 'go to top' button functionality + document.addEventListener('scroll', function() { + if (document.body.scrollTop > 500 || document.documentElement.scrollTop > 500) { + document.getElementById("topButton").style.display = "block"; + } else { + document.getElementById("topButton").style.display = "none"; + } + }); + // fill in the current location into social links on this page. var as = document.getElementsByTagName('a'); var loc = document.location.href; if (!loc.toLowerCase().startsWith('http')) { 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=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Sun Sep 9 15:25:54 2018 @@ -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.0-SNAPSHOT"; + private static final String VERSION = "5.0"; 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=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/xdocs/download_jmeter.xml (original) +++ jmeter/trunk/xdocs/download_jmeter.xml Sun Sep 9 15:25:54 2018 @@ -18,7 +18,7 @@ <!DOCTYPE document [ -<!ENTITY release '4.0'> +<!ENTITY release '5.0'> <!ENTITY hellip "…" > ]> Modified: jmeter/trunk/xdocs/overview.html URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/overview.html?rev=1840418&r1=1840417&r2=1840418&view=diff ============================================================================== --- jmeter/trunk/xdocs/overview.html (original) +++ jmeter/trunk/xdocs/overview.html Sun Sep 9 15:25:54 2018 @@ -18,7 +18,7 @@ <!-- This file is copied into the Javadoc overview --> <html> <body> -This is the documentation for Apache JMeter version 4.0 API. -@version 4.0 +This is the documentation for Apache JMeter version 5.0 API. +@version 5.0 </body> </html> \ No newline at end of file
