jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1768221 [11/11] - in /jmeter/trunk: docs/ docs/images/screenshots/ docs/images/screenshots/dashboard/ docs/images/screenshots/http-config/ docs/localising/ docs/usermanual/ src/core/org/apache/jmeter/util/ xdocs/
Date Sat, 05 Nov 2016 14:26:11 GMT
Modified: jmeter/trunk/docs/usermanual/realtime-results.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/realtime-results.html?rev=1768221&r1=1768220&r2=1768221&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/realtime-results.html (original)
+++ jmeter/trunk/docs/usermanual/realtime-results.html Sat Nov  5 14:26:10 2016
@@ -5,7 +5,7 @@
             APACHE LOGO
           --><div><a href="http://www.apache.org"><img title="Apache Software Foundation" class="asf-logo logo" src="../images/asf-logo.svg" alt="Logo ASF"></a></div><!--
               PROJECT LOGO
-            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="../building.html">Building JMeter and Add-Ons</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../extending/jmeter_
 tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="main" id="content">
 <div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="generating-dashboard.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="best-practices.html">Next &gt;</a></li></ul><div class="section"><h1 id="realtime-results">17. Real-time results<a class="sectionlink" href="#realtime-results" title="Link to here">&para;</a></h1>
+            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../usermanual/properties_reference.html">Properties Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../e
 xtending/jmeter_tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="mai
 n" id="content"><div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="generating-dashboard.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="best-practices.html">Next &gt;</a></li></ul><div class="section"><h1 id="realtime-results">16. Real-time results<a class="sectionlink" href="#realtime-results" title="Link to here">&para;</a></h1>
 <p>Since JMeter 2.13 you can get real-time results sent to a backend through the 
 <a href="component_reference.html#Backend_Listener">Backend Listener</a> using potentially any backend (JDBC, JMS, Webservice, &hellip;)
 by providing a class which implements <a href="../api/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.html">AbstractBackendListenerClient</a>.<br>
@@ -24,8 +24,8 @@ In this document we will present the con
 <li>Graphite</li>
 </ul>
 </p>
-<div class="subsection"><h2 id="metrics">17.1 Metrics exposed<a class="sectionlink" href="#metrics" title="Link to here">&para;</a></h2>
-    <div class="subsection"><h2 id="metrics-threads">17.1.1 Thread/Virtual Users metrics<a class="sectionlink" href="#metrics-threads" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="metrics">16.1 Metrics exposed<a class="sectionlink" href="#metrics" title="Link to here">&para;</a></h2>
+    <div class="subsection"><h2 id="metrics-threads">16.1.1 Thread/Virtual Users metrics<a class="sectionlink" href="#metrics-threads" title="Link to here">&para;</a></h2>
     <p>
     Thread metrics are the following:
     </p>
@@ -37,7 +37,7 @@ In this document we will present the con
       <dt><span class="code">&lt;rootMetricsPrefix&gt;test.endedT</span></dt><dd>Finished threads</dd>
     </dl>
     </div>
-    <div class="subsection"><h2 id="metrics-response-times">17.1.2 Response times metrics<a class="sectionlink" href="#metrics-response-times" title="Link to here">&para;</a></h2>
+    <div class="subsection"><h2 id="metrics-response-times">16.1.2 Response times metrics<a class="sectionlink" href="#metrics-response-times" title="Link to here">&para;</a></h2>
     <p>Response related metrics are the following:</p>
     <dl>
       <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.ok.count</span></dt>
@@ -48,6 +48,8 @@ In this document we will present the con
       <dd>Min response time for successful responses of sampler name</dd>
       <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.ok.max</span></dt>
       <dd>Max response time for successful responses of sampler name</dd>
+      <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.ok.avg</span></dt>
+      <dd>Average response time for successful responses of sampler name.</dd>
       <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.ok.pct&lt;percentileValue&gt;</span></dt>
       <dd>Percentile computed for successful responses of sampler name. There will be one metric for each calculated value.</dd>
       <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.ko.count</span></dt>
@@ -56,6 +58,8 @@ In this document we will present the con
       <dd>Min response time for failed responses of sampler name</dd>
       <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.ko.max</span></dt>
       <dd>Max response time for failed responses of sampler name</dd>
+      <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.ko.avg</span></dt>
+      <dd>Average response time for failed responses of sampler name.</dd>
       <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.ko.pct&lt;percentileValue&gt;</span></dt>
       <dd>Percentile computed for failed responses of sampler name. There will be one metric for each calculated value.</dd>
       <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.a.count</span></dt>
@@ -64,6 +68,8 @@ In this document we will present the con
       <dd>Min response time for responses of sampler name (min of ok.count and ko.count)</dd>
       <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.a.max</span></dt>
       <dd>Max response time for responses of sampler name (max of ok.count and ko.count)</dd>
+      <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.a.avg</span></dt>
+      <dd>Average response time for responses of sampler name (avg of ok.count and ko.count)</dd>
       <dt><span class="code">&lt;rootMetricsPrefix&gt;&lt;samplerName&gt;.a.pct&lt;percentileValue&gt;</span></dt>
       <dd>Percentile computed for responses of sampler name. There will be one metric for each calculated value. (calculated on the totals for OK and failed samples)</dd>
     </dl>
@@ -84,21 +90,21 @@ In this document we will present the con
     </p>
     </div>
 </div>
-<div class="subsection"><h2 id="jmeter-configuration">17.2 JMeter configuration<a class="sectionlink" href="#jmeter-configuration" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="jmeter-configuration">16.2 JMeter configuration<a class="sectionlink" href="#jmeter-configuration" title="Link to here">&para;</a></h2>
     <p>
     To make JMeter send metrics to backend add a <a href="./component_reference.html#Backend_Listener">BackendListener</a> using the GraphiteBackendListenerClient.
     </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></figure>
 </div>
 
-<div class="subsection"><h2 id="influxdb">17.2 InfluxDB<a class="sectionlink" href="#influxdb" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="influxdb">16.2 InfluxDB<a class="sectionlink" href="#influxdb" title="Link to here">&para;</a></h2>
 <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="http://influxdb.com/docs/v0.8/introduction/installation.html" 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.
 </p>
-    <div class="subsection"><h2 id="influxdb_configuration">17.2.1 InfluxDB graphite listener configuration<a class="sectionlink" href="#influxdb_configuration" title="Link to here">&para;</a></h2>
+    <div class="subsection"><h2 id="influxdb_configuration">16.2.1 InfluxDB graphite listener configuration<a class="sectionlink" href="#influxdb_configuration" title="Link to here">&para;</a></h2>
     <p>To enable Graphite listener in InfluxDB, 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">input_plugins.graphite</span>" and set this:
     </p>
@@ -115,7 +121,7 @@ database = "jmeter"  # store graphite da
     For later versions of InfluxDb (e.g. 0.12), replace <span class="code">[input_plugins.graphite]</span> with <span class="code">[[graphite]]</span>
     </p>
     </div>
-    <div class="subsection"><h2 id="influxdb_db_configuration">17.2.2 InfluxDB database configuration<a class="sectionlink" href="#influxdb_db_configuration" title="Link to here">&para;</a></h2>
+    <div class="subsection"><h2 id="influxdb_db_configuration">16.2.2 InfluxDB database configuration<a class="sectionlink" href="#influxdb_db_configuration" title="Link to here">&para;</a></h2>
     <p>Connect to InfluxDB admin console and create two databases:
     <ul>
         <li>grafana : Used by Grafana to store the dashboards we will create</li>
@@ -124,7 +130,7 @@ database = "jmeter"  # store graphite da
     </ul>
     </p>
     </div>
-    <div class="subsection"><h2 id="grafana_configuration">17.2.3 Grafana configuration<a class="sectionlink" href="#grafana_configuration" title="Link to here">&para;</a></h2>
+    <div class="subsection"><h2 id="grafana_configuration">16.2.3 Grafana configuration<a class="sectionlink" href="#grafana_configuration" title="Link to here">&para;</a></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/" targer="_blank">documentation</a> for more details.
@@ -157,7 +163,7 @@ datasources: {
     </div>
 </div>
 
-<div class="subsection"><h2 id="graphite">17.3 Graphite<a class="sectionlink" href="#graphite" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="graphite">16.3 Graphite<a class="sectionlink" href="#graphite" title="Link to here">&para;</a></h2>
 <p>TODO.</p>
 </div>
 

Modified: jmeter/trunk/docs/usermanual/regular_expressions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=1768221&r1=1768220&r2=1768221&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/regular_expressions.html (original)
+++ jmeter/trunk/docs/usermanual/regular_expressions.html Sat Nov  5 14:26:10 2016
@@ -5,7 +5,7 @@
             APACHE LOGO
           --><div><a href="http://www.apache.org"><img title="Apache Software Foundation" class="asf-logo logo" src="../images/asf-logo.svg" alt="Logo ASF"></a></div><!--
               PROJECT LOGO
-            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="../building.html">Building JMeter and Add-Ons</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../extending/jmeter_
 tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="main" id="content">
 <div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="functions.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="hints_and_tips.html">Next &gt;</a></li></ul><div class="section"><h1 id="regex">22. Regular Expressions<a class="sectionlink" href="#regex" title="Link to here">&para;</a></h1>
+            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../usermanual/properties_reference.html">Properties Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../e
 xtending/jmeter_tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="mai
 n" id="content"><div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="functions.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="hints_and_tips.html">Next &gt;</a></li></ul><div class="section"><h1 id="regex">22. Regular Expressions<a class="sectionlink" href="#regex" title="Link to here">&para;</a></h1>
 <div class="subsection"><h2 id="overview">22.1 Overview<a class="sectionlink" href="#overview" title="Link to here">&para;</a></h2>
 <p>
 JMeter includes the pattern matching software <a href="http://attic.apache.org/projects/jakarta-oro.html">Apache Jakarta ORO</a>

Modified: jmeter/trunk/docs/usermanual/remote-test.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/remote-test.html?rev=1768221&r1=1768220&r2=1768221&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jmeter/trunk/docs/usermanual/remote-test.html Sat Nov  5 14:26:10 2016
@@ -5,7 +5,7 @@
             APACHE LOGO
           --><div><a href="http://www.apache.org"><img title="Apache Software Foundation" class="asf-logo logo" src="../images/asf-logo.svg" alt="Logo ASF"></a></div><!--
               PROJECT LOGO
-            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="../building.html">Building JMeter and Add-Ons</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../extending/jmeter_
 tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="main" id="content">
 <div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="listeners.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="generating-dashboard.html">Next &gt;</a></li></ul><div class="section"><h1>15. Remote Testing</h1>
+            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../usermanual/properties_reference.html">Properties Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../e
 xtending/jmeter_tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="mai
 n" id="content"><div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="listeners.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="generating-dashboard.html">Next &gt;</a></li></ul><div class="section"><h1>14. Remote Testing</h1>
 
 <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
@@ -110,7 +110,7 @@ The second example will define <span cla
 <br>
 The command-line client will exit when all the remote servers have stopped.
 
-<div class="subsection"><h2 id="detail_instructions">15.1 Doing it Manually<a class="sectionlink" href="#detail_instructions" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="detail_instructions">14.1 Doing it Manually<a class="sectionlink" href="#detail_instructions" title="Link to here">&para;</a></h2>
 <p>In some cases, the jmeter-server script may not work for you (if you are using an OS platform not anticipated by the JMeter developers).
 Here is how to start the JMeter servers (step 1 above) with a more manual process:</p>
 <p><b>Step 1a: Start the RMI Registry</b></p>
@@ -137,7 +137,7 @@ Use the "<span class="code">-s</span>" o
 
 <p>Steps 2 and 3 remain the same.</p>
 </div>
-<div class="subsection"><h2 id="tips">15.2 Tips<a class="sectionlink" href="#tips" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="tips">14.2 Tips<a class="sectionlink" href="#tips" title="Link to here">&para;</a></h2>
 <p>
 JMeter/RMI requires a connection from the client to the server. This will use the port you chose, default <span class="code">1099</span>.<br>
 JMeter/RMI also requires a reverse connection in order to return sample results from the server to the client.<br>
@@ -184,7 +184,7 @@ in remote testing, since JMeter 2.6:</p>
  "<span class="code">java.rmi.server.hostname</span>" parameter.</li>
 </ul>
 </div>
-<div class="subsection"><h2 id="portchange">15.3 Using a different port<a class="sectionlink" href="#portchange" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="portchange">14.3 Using a different port<a class="sectionlink" href="#portchange" title="Link to here">&para;</a></h2>
 <p>By default, JMeter uses the standard RMI port <span class="code">1099</span>. It is possible to change this. For this to work successfully,
 all the following need to agree:</p>
 <ul>
@@ -214,7 +214,7 @@ The chosen port will be logged in the se
 </p>
 </div>
 
-<div class="subsection"><h2 id="sendermode">15.4 Using a different sample sender<a class="sectionlink" href="#sendermode" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="sendermode">14.4 Using a different sample sender<a class="sectionlink" href="#sendermode" title="Link to here">&para;</a></h2>
 <p>
 Listeners in the test plan send their results back to the client JMeter which writes the results to the specified files
 By default, samples are sent back synchronously as they are generated.
@@ -281,7 +281,7 @@ This is not really a problem as there is
 </div>
 
 
-<div class="subsection"><h2 id="retries">15.5 Dealing with nodes that failed starting<a class="sectionlink" href="#retries" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="retries">14.5 Dealing with nodes that failed starting<a class="sectionlink" href="#retries" title="Link to here">&para;</a></h2>
   <p>
     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,

Modified: jmeter/trunk/docs/usermanual/test_plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/test_plan.html?rev=1768221&r1=1768220&r2=1768221&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/test_plan.html (original)
+++ jmeter/trunk/docs/usermanual/test_plan.html Sat Nov  5 14:26:10 2016
@@ -5,7 +5,7 @@
             APACHE LOGO
           --><div><a href="http://www.apache.org"><img title="Apache Software Foundation" class="asf-logo logo" src="../images/asf-logo.svg" alt="Logo ASF"></a></div><!--
               PROJECT LOGO
-            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="../building.html">Building JMeter and Add-Ons</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../extending/jmeter_
 tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="main" id="content">
 <div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="build-test-plan.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="build-web-test-plan.html">Next &gt;</a></li></ul><div class="section"><h1>4. Elements of a Test Plan</h1>
+            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../usermanual/properties_reference.html">Properties Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../e
 xtending/jmeter_tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="mai
 n" id="content"><div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="build-test-plan.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="build-web-test-plan.html">Next &gt;</a></li></ul><div class="section"><h1>3. Elements of a Test Plan</h1>
 <p>
 This section describes the different parts of a test plan.
 </p>
@@ -13,7 +13,7 @@ This section describes the different par
 A minimal test will consist of the Test Plan, a Thread Group and one or more Samplers.
 </p>
 
-<div class="subsection"><h2 id="test_plan">4.0 Test Plan<a class="sectionlink" href="#test_plan" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="test_plan">3.0 Test Plan<a class="sectionlink" href="#test_plan" title="Link to here">&para;</a></h2>
 <p>The Test Plan object has a checkbox called "<span class="code">Functional Testing</span>".  If selected, it
 will cause JMeter to record the data returned from the server for each sample.  If you have 
 selected a file in your test listeners, this data will be written to file.  This can be useful if
@@ -25,7 +25,7 @@ is off by default).  </p>
 <p>You can also use the <span class="code">Configuration</span> button on a listener to decide what fields to save.</p>
 </div>
 
-<div class="subsection"><h2 id="thread_group">4.1 Thread Group<a class="sectionlink" href="#thread_group" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="thread_group">3.1 Thread Group<a class="sectionlink" href="#thread_group" title="Link to here">&para;</a></h2>
 <p>Thread group elements are the beginning points of any test plan.
 All controllers and samplers must be under a thread group.
 Other elements, e.g. Listeners, may be placed directly under the test plan,
@@ -74,7 +74,7 @@ Start with Ramp-up = number of threads a
      </p>
 </div>
 
-<div class="subsection"><h2 id="controllers">4.2 Controllers<a class="sectionlink" href="#controllers" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="controllers">3.2 Controllers<a class="sectionlink" href="#controllers" title="Link to here">&para;</a></h2>
 
 <p>
 JMeter has two types of Controllers: Samplers and Logical Controllers.
@@ -95,7 +95,7 @@ For more information, see <a href="#logi
 
 </div>
 
-<div class="subsection"><h2 id="samplers">4.2.1 Samplers<a class="sectionlink" href="#samplers" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="samplers">3.2.1 Samplers<a class="sectionlink" href="#samplers" title="Link to here">&para;</a></h2>
 
 <p>
 Samplers tell JMeter to send requests to a server and wait for a response.
@@ -138,7 +138,7 @@ expressions.</p>
 <p><a href="component_reference.html#samplers">JMeter's built-in samplers</a></p>
 </div>
 
-<div class="subsection"><h2 id="logic_controller">4.2.2 Logic Controllers<a class="sectionlink" href="#logic_controller" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="logic_controller">3.2.2 Logic Controllers<a class="sectionlink" href="#logic_controller" title="Link to here">&para;</a></h2>
 <p>Logic Controllers let you customize the logic that JMeter uses to
 decide when to send requests.
 Logic Controllers can change the order of requests coming from their
@@ -218,7 +218,7 @@ will share the same cookies.</p>
 Logic Controllers</a>.</p>
 </div>
 
-<div class="subsection"><h2 id="test_fragments">4.2.3 Test Fragments<a class="sectionlink" href="#test_fragments" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="test_fragments">3.2.3 Test Fragments<a class="sectionlink" href="#test_fragments" title="Link to here">&para;</a></h2>
 <p>The Test Fragment element is a special type of <a href="#controllers">controller</a> that
 exists on the Test Plan tree at the same level as the Thread Group element.  It is distinguished
 from a Thread Group in that it is not executed unless it is 
@@ -227,7 +227,7 @@ referenced by either a <a href="../userm
 <p>This element is purely for code re-use within Test Plans</p>
 </div>
 
-<div class="subsection"><h2 id="listeners">4.3 Listeners<a class="sectionlink" href="#listeners" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="listeners">3.3 Listeners<a class="sectionlink" href="#listeners" title="Link to here">&para;</a></h2>
 <p>Listeners provide access to the information JMeter gathers about the test cases while
 JMeter runs.  The  <a href="../usermanual/component_reference.html#Graph_Results">Graph Results</a> listener plots the response times on a graph.  
 The "View Results Tree" Listener shows details of sampler requests and responses, and can display basic HTML and XML representations of the response.
@@ -250,7 +250,7 @@ They will collect data only from element
 that come with JMeter.</p>
 </div>
 
-<div class="subsection"><h2 id="timers">4.4 Timers<a class="sectionlink" href="#timers" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="timers">3.4 Timers<a class="sectionlink" href="#timers" title="Link to here">&para;</a></h2>
 
 <p>By default, a JMeter thread executes samplers in sequence without pausing.
 We recommend that you specify a delay by adding one of the available timers to
@@ -270,7 +270,7 @@ To provide a pause at a single place in
 </p>
 </div>
 
-<div class="subsection"><h2 id="assertions">4.5 Assertions<a class="sectionlink" href="#assertions" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="assertions">3.5 Assertions<a class="sectionlink" href="#assertions" title="Link to here">&para;</a></h2>
 
 <p>Assertions allow you to assert facts about responses received from the
 server being tested. Using an assertion, you can essentially "test" that your
@@ -297,7 +297,7 @@ and will count towards the error %age fo
 </p>
 </div>
 
-<div class="subsection"><h2 id="config_elements">4.6 Configuration Elements<a class="sectionlink" href="#config_elements" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="config_elements">3.6 Configuration Elements<a class="sectionlink" href="#config_elements" title="Link to here">&para;</a></h2>
 <p>A configuration element works closely with a Sampler.  Although it does not send requests
 (except for <a href="../usermanual/component_reference.html#HTTP(S)_Test_Script_Recorder">HTTP(S) Test Script Recorder</a>), it can add to or modify requests.</p>
 
@@ -321,21 +321,21 @@ For simplicity, it is suggested that the
 </div><div class="clear"></div>
 </div>
 
-<div class="subsection"><h2 id="preprocessors">4.7 Pre-Processor Elements<a class="sectionlink" href="#preprocessors" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="preprocessors">3.7 Pre-Processor Elements<a class="sectionlink" href="#preprocessors" title="Link to here">&para;</a></h2>
 <p>A Pre-Processor executes some action prior to a Sampler Request being made. 
 If a Pre-Processor is attached to a Sampler element, then it will execute just prior to that sampler element running. 
 A Pre-Processor is most often used to modify the settings of a Sample Request just before it runs, or to update variables that aren't extracted from response text.  
 See the <a href="test_plan.html#scoping_rules"><b>scoping rules</b></a> for more details on when Pre-Processors are executed.</p>
 </div>
 
-<div class="subsection"><h2 id="postprocessors">4.8 Post-Processor Elements<a class="sectionlink" href="#postprocessors" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="postprocessors">3.8 Post-Processor Elements<a class="sectionlink" href="#postprocessors" title="Link to here">&para;</a></h2>
 <p>A Post-Processor executes some action after a Sampler Request has been made.
 If a Post-Processor is attached to a Sampler element, then it will execute just after that sampler element runs.
 A Post-Processor is most often used to process the response data, often to extract values from it.  
 See the <a href="test_plan.html#scoping_rules"><b>scoping rules</b></a> for more details on when Post-Processors are executed.</p>
 </div>
 
-<div class="subsection"><h2 id="executionorder">4.9 Execution order<a class="sectionlink" href="#executionorder" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="executionorder">3.9 Execution order<a class="sectionlink" href="#executionorder" title="Link to here">&para;</a></h2>
 <ol start="0">
 <li>Configuration elements</li>
 <li>Pre-Processors</li>
@@ -388,7 +388,7 @@ Assertion 1
 </p>
 </div>
 
-<div class="subsection"><h2 id="scoping_rules">4.10 Scoping Rules<a class="sectionlink" href="#scoping_rules" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="scoping_rules">3.10 Scoping Rules<a class="sectionlink" href="#scoping_rules" title="Link to here">&para;</a></h2>
 <p>
 The JMeter test tree contains elements that are both hierarchical and ordered.  Some elements in the test trees are strictly hierarchical (Listeners, Config Elements, Post-Processors, Pre-Processors, Assertions, Timers), and some are primarily ordered (controllers, samplers).  When you create your test plan, you will create an ordered list of sample request (via Samplers) that represent a set of steps to be executed.  These requests are often organized within controllers that are also ordered.  Given the following test tree:</p>
 <figure><a href="../images/screenshots/scoping1.png"><img src="../images/screenshots/scoping1.png" width="" height="" alt="Example test tree"></a><figcaption>Example test tree</figcaption></figure>
@@ -415,7 +415,7 @@ only one Manager is used, but there is c
 </div>
 
 
-<div class="subsection"><h2 id="properties">4.11 Properties and Variables<a class="sectionlink" href="#properties" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="properties">3.11 Properties and Variables<a class="sectionlink" href="#properties" title="Link to here">&para;</a></h2>
 
 <p>
 JMeter <em>properties</em> are defined in <span class="code">jmeter.properties</span> (see <a href="get-started.html#configuring_jmeter">Getting Started - Configuring JMeter</a> for more details).
@@ -451,7 +451,7 @@ These are global to the test plan, so ca
 <div class="clear"></div><div class="note">Both variables and properties are case-sensitive.</div><div class="clear"></div>
 </div>
 
-<div class="subsection"><h2 id="using_variables">4.12 Using Variables to parameterise tests<a class="sectionlink" href="#using_variables" title="Link to here">&para;</a></h2>
+<div class="subsection"><h2 id="using_variables">3.12 Using Variables to parameterise tests<a class="sectionlink" href="#using_variables" title="Link to here">&para;</a></h2>
 <p>
 Variables don't have to vary - they can be defined once, and if left alone, will not change value.
 So you can use them as short-hand for expressions that appear frequently in a test plan.

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=1768221&r1=1768220&r2=1768221&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Sat Nov  5 14:26:10 2016
@@ -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 = "3.1-SNAPSHOT";
+    private static final String VERSION = "3.1";
 
     private static final String IMPLEMENTATION;
     

Modified: jmeter/trunk/xdocs/overview.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/overview.html?rev=1768221&r1=1768220&r2=1768221&view=diff
==============================================================================
--- jmeter/trunk/xdocs/overview.html (original)
+++ jmeter/trunk/xdocs/overview.html Sat Nov  5 14:26:10 2016
@@ -18,7 +18,7 @@
 <!-- This file is copied into the Javadoc overview -->
 <html>
 <body>
-This is the documentation for Apache JMeter version 3.0 API.
-@version 3.0
+This is the documentation for Apache JMeter version 3.1 API.
+@version 3.1
 </body>
 </html>
\ No newline at end of file



Mime
View raw message