You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2020/11/29 16:25:46 UTC
[jmeter-site-preview] branch gh-pages updated: Update preview for
Apache JMeter v5.4-rc2
This is an automated email from the ASF dual-hosted git repository.
milamber pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/jmeter-site-preview.git
The following commit(s) were added to refs/heads/gh-pages by this push:
new 0aa6845 Update preview for Apache JMeter v5.4-rc2
0aa6845 is described below
commit 0aa68457be7c89a6bbce71b493b09a7d46982850
Author: Milamber <mi...@apache.org>
AuthorDate: Sun Nov 29 17:25:24 2020 +0100
Update preview for Apache JMeter v5.4-rc2
---
rat/index.html | 6 +-
rat/rat-report.txt | 8 +-
site/api/allclasses-frame.html | 1 +
site/api/allclasses-noframe.html | 1 +
site/api/constant-values.html | 35 ++
site/api/deprecated-list.html | 149 +++--
site/api/index-all.html | 103 ++++
site/api/org/apache/jmeter/gui/package-tree.html | 2 +-
.../api/org/apache/jorphan/io/package-summary.html | 4 +-
site/api/org/apache/jorphan/io/package-tree.html | 4 +-
.../org/apache/jorphan/logging/LoggingManager.html | 662 +++++++++++++++++++++
.../org/apache/jorphan/logging/package-frame.html | 20 +
.../jorphan/{io => logging}/package-summary.html | 20 +-
.../jorphan/{io => logging}/package-tree.html | 20 +-
.../org/apache/jorphan/math/package-summary.html | 4 +-
site/api/org/apache/jorphan/math/package-tree.html | 4 +-
site/api/overview-frame.html | 1 +
site/api/overview-summary.html | 12 +-
site/api/overview-tree.html | 2 +
site/api/package-list | 1 +
site/changes.html | 69 ++-
site/usermanual/component_reference.html | 6 +-
site/usermanual/curl.html | 8 +-
site/usermanual/get-started.html | 12 +-
site/usermanual/properties_reference.html | 22 +-
25 files changed, 1086 insertions(+), 90 deletions(-)
diff --git a/rat/index.html b/rat/index.html
index 92a8f6f..90e31fb 100644
--- a/rat/index.html
+++ b/rat/index.html
@@ -39,10 +39,10 @@ caption {color:blue;text-align:left;}
Table 1: A snapshot summary of this rat report.
</caption>
<tr>
-<td colspan="1" class="notes">Notes: 38</td><td colspan="1" class="binaries">Binaries: 10</td><td colspan="1" class="archives">Archives: 3</td><td colspan="1" class="standards">Standards: 1794</td>
+<td colspan="1" class="notes">Notes: 38</td><td colspan="1" class="binaries">Binaries: 10</td><td colspan="1" class="archives">Archives: 3</td><td colspan="1" class="standards">Standards: 1796</td>
</tr>
<tr>
-<td colspan="2" class="licenced">Apache Licensed: 1794</td><td colspan="2" class="generated">Generated Documents: 0</td>
+<td colspan="2" class="licenced">Apache Licensed: 1796</td><td colspan="2" class="generated">Generated Documents: 0</td>
</tr>
<tr>
<td colspan="2" class="java_note">Note: JavaDocs are generated and so license header is optional</td><td colspan="2" class="generated_note">Note: Generated files do not require license headers</td>
@@ -762,6 +762,8 @@ Table 1: A snapshot summary of this rat report.
AL /src/jorphan/src/main/java/org/apache/jorphan/collections/SearchByClass.java<br>
AL /src/jorphan/src/main/java/org/apache/jorphan/collections/HashTreeTraverser.java<br>
AL /src/jorphan/src/main/java/org/apache/jorphan/documentation/VisibleForTesting.java<br>
+ AL /src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java<br>
+ AL /src/jorphan/src/main/java/org/apache/jorphan/logging/Slf4jLogkitLogger.java<br>
AL /src/jorphan/src/main/java/org/apache/jorphan/math/NumberComparator.java<br>
AL /src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorLong.java<br>
AL /src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculator.java<br>
diff --git a/rat/rat-report.txt b/rat/rat-report.txt
index 450f734..691e690 100644
--- a/rat/rat-report.txt
+++ b/rat/rat-report.txt
@@ -2,14 +2,14 @@
*****************************************************
Summary
-------
-Generated at: 2020-11-23T11:08:31+01:00
+Generated at: 2020-11-29T17:22:37+01:00
Notes: 38
Binaries: 10
Archives: 3
-Standards: 1794
+Standards: 1796
-Apache Licensed: 1794
+Apache Licensed: 1796
Generated Documents: 0
JavaDocs are generated, thus a license header is optional.
@@ -727,6 +727,8 @@ Archives:
AL /src/jorphan/src/main/java/org/apache/jorphan/collections/SearchByClass.java
AL /src/jorphan/src/main/java/org/apache/jorphan/collections/HashTreeTraverser.java
AL /src/jorphan/src/main/java/org/apache/jorphan/documentation/VisibleForTesting.java
+ AL /src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java
+ AL /src/jorphan/src/main/java/org/apache/jorphan/logging/Slf4jLogkitLogger.java
AL /src/jorphan/src/main/java/org/apache/jorphan/math/NumberComparator.java
AL /src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorLong.java
AL /src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculator.java
diff --git a/site/api/allclasses-frame.html b/site/api/allclasses-frame.html
index c5d279d..694a0d3 100644
--- a/site/api/allclasses-frame.html
+++ b/site/api/allclasses-frame.html
@@ -582,6 +582,7 @@
<li><a href="org/apache/log/Logger.html" title="class in org.apache.log" target="classFrame">Logger</a></li>
<li><a href="org/apache/jmeter/gui/LoggerPanel.html" title="class in org.apache.jmeter.gui" target="classFrame">LoggerPanel</a></li>
<li><a href="org/apache/jmeter/gui/action/LoggerPanelEnableDisable.html" title="class in org.apache.jmeter.gui.action" target="classFrame">LoggerPanelEnableDisable</a></li>
+<li><a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging" target="classFrame">LoggingManager</a></li>
<li><a href="org/apache/jmeter/control/gui/LogicControllerGui.html" title="class in org.apache.jmeter.control.gui" target="classFrame">LogicControllerGui</a></li>
<li><a href="org/apache/jmeter/config/LoginConfig.html" title="class in org.apache.jmeter.config" target="classFrame">LoginConfig</a></li>
<li><a href="org/apache/jmeter/config/gui/LoginConfigGui.html" title="class in org.apache.jmeter.config.gui" target="classFrame">LoginConfigGui</a></li>
diff --git a/site/api/allclasses-noframe.html b/site/api/allclasses-noframe.html
index 06f2d2b..af0b90d 100644
--- a/site/api/allclasses-noframe.html
+++ b/site/api/allclasses-noframe.html
@@ -582,6 +582,7 @@
<li><a href="org/apache/log/Logger.html" title="class in org.apache.log">Logger</a></li>
<li><a href="org/apache/jmeter/gui/LoggerPanel.html" title="class in org.apache.jmeter.gui">LoggerPanel</a></li>
<li><a href="org/apache/jmeter/gui/action/LoggerPanelEnableDisable.html" title="class in org.apache.jmeter.gui.action">LoggerPanelEnableDisable</a></li>
+<li><a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></li>
<li><a href="org/apache/jmeter/control/gui/LogicControllerGui.html" title="class in org.apache.jmeter.control.gui">LogicControllerGui</a></li>
<li><a href="org/apache/jmeter/config/LoginConfig.html" title="class in org.apache.jmeter.config">LoginConfig</a></li>
<li><a href="org/apache/jmeter/config/gui/LoginConfigGui.html" title="class in org.apache.jmeter.config.gui">LoginConfigGui</a></li>
diff --git a/site/api/constant-values.html b/site/api/constant-values.html
index a738edc..36cb5ca 100644
--- a/site/api/constant-values.html
+++ b/site/api/constant-values.html
@@ -7593,6 +7593,41 @@
<ul class="blockList">
<li class="blockList">
<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.jorphan.logging.LoggingManager.DEFAULT_PATTERN">
+<!-- -->
+</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/jorphan/logging/LoggingManager.html#DEFAULT_PATTERN">DEFAULT_PATTERN</a></code></td>
+<td class="colLast"><code>"%{time:yyyy/MM/dd HH:mm:ss} %5.5{priority} - %{category}: %{message} %{throwable}"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.jorphan.logging.LoggingManager.LOG_FILE">
+<!-- -->
+</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/jorphan/logging/LoggingManager.html#LOG_FILE">LOG_FILE</a></code></td>
+<td class="colLast"><code>"log_file"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.jorphan.logging.LoggingManager.LOG_PRIORITY">
+<!-- -->
+</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/jorphan/logging/LoggingManager.html#LOG_PRIORITY">LOG_PRIORITY</a></code></td>
+<td class="colLast"><code>"log_level"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
<caption><span>org.apache.log.<a href="org/apache/log/Logger.html" title="class in org.apache.log">Logger</a></span><span class="tabEnd"> </span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
diff --git a/site/api/deprecated-list.html b/site/api/deprecated-list.html
index ecf9480..4d7aa59 100644
--- a/site/api/deprecated-list.html
+++ b/site/api/deprecated-list.html
@@ -143,21 +143,26 @@
</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">org.apache.jorphan.logging.LoggingManager</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logger creation</span></div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/log/Priority.html" title="class in org.apache.log">org.apache.log.Priority</a>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/smtp/sampler/protocol/TrustAllSSLSocketFactory.html" title="class in org.apache.jmeter.protocol.smtp.sampler.protocol">org.apache.jmeter.protocol.smtp.sampler.protocol.TrustAllSSLSocketFactory</a>
<div class="block"><span class="deprecationComment">Will be removed in next version, use <a href="org/apache/jmeter/util/TrustAllSSLSocketFactory.html" title="class in org.apache.jmeter.util"><code>TrustAllSSLSocketFactory</code></a></span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/testelement/WorkBench.html" title="class in org.apache.jmeter.testelement">org.apache.jmeter.testelement.WorkBench</a>
<div class="block"><span class="deprecationComment">since 4.0</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/control/gui/WorkBenchGui.html" title="class in org.apache.jmeter.control.gui">org.apache.jmeter.control.gui.WorkBenchGui</a>
<div class="block"><span class="deprecationComment">since 4.0 Non Test Elements are now children of Test Plan</span></div>
</td>
@@ -188,26 +193,41 @@
</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#DEFAULT_PATTERN">org.apache.jorphan.logging.LoggingManager.DEFAULT_PATTERN</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/jms/sampler/JMSSampler.html#IS_ONE_WAY">org.apache.jmeter.protocol.jms.sampler.JMSSampler.IS_ONE_WAY</a>
<div class="block"><span class="deprecationComment">since 4.0 replaced by JMS_COMMUNICATION_STYLE</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/util/JSR223BeanInfoSupport.html#LANGUAGE_NAMES">org.apache.jmeter.util.JSR223BeanInfoSupport.LANGUAGE_NAMES</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/jmeter/util/JSR223BeanInfoSupport.html#getLanguageNames--"><code>JSR223BeanInfoSupport.getLanguageNames()</code></a></span></div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#LOG_FILE">org.apache.jorphan.logging.LoggingManager.LOG_FILE</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
<tr class="altColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#LOG_PRIORITY">org.apache.jorphan.logging.LoggingManager.LOG_PRIORITY</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/gui/AbstractJMeterGuiComponent.html#namePanel">org.apache.jmeter.gui.AbstractJMeterGuiComponent.namePanel</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/jmeter/gui/AbstractJMeterGuiComponent.html#getName--"><code>AbstractJMeterGuiComponent.getName()</code></a> or <a href="org/apache/jmeter/gui/AbstractJMeterGuiComponent.html#createTitleLabel--"><code>AbstractJMeterGuiComponent.createTitleLabel()</code></a> for better alignment of the fields</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jorphan/exec/SystemCommand.html#POLL_INTERVAL">org.apache.jorphan.exec.SystemCommand.POLL_INTERVAL</a>
<div class="block"><span class="deprecationComment">does not make sense anymore. Superseded by <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang"><code>Object.wait(long)</code></a></span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.html#USE_CACHED_SSL_CONTEXT">org.apache.jmeter.protocol.http.sampler.HTTPHCAbstractImpl.USE_CACHED_SSL_CONTEXT</a>
<div class="block"><span class="deprecationComment">use httpclient.reset_state_on_thread_group_iteration instead</span></div>
</td>
@@ -228,52 +248,62 @@
</tr>
<tbody>
<tr class="altColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#addLogTargetToRootLogger-org.apache.log.LogTarget:A-">org.apache.jorphan.logging.LoggingManager.addLogTargetToRootLogger(LogTarget[])</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jorphan/reflect/Functor.html#checkMethod-java.lang.Object-">org.apache.jorphan.reflect.Functor.checkMethod(Object)</a>
<div class="block"><span class="deprecationComment">** for use by Unit test code only **</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jorphan/reflect/Functor.html#checkMethod-java.lang.Object-java.lang.Class-">org.apache.jorphan.reflect.Functor.checkMethod(Object, Class<?>)</a>
<div class="block"><span class="deprecationComment">** for use by Unit test code only **</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/JMeter.html#convertSubTree-org.apache.jorphan.collections.HashTree-">org.apache.jmeter.JMeter.convertSubTree(HashTree)</a>
<div class="block"><span class="deprecationComment">This method does not correctly handle a tree with Replaceable controllers
that contain NoThreadClone element. Use <a href="org/apache/jmeter/JMeter.html#convertSubTree-org.apache.jorphan.collections.HashTree-boolean-"><code>JMeter.convertSubTree(HashTree, boolean)</code></a></span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.html#getAllowedThroughputSurplus--">org.apache.jmeter.timers.poissonarrivals.PreciseThroughputTimer.getAllowedThroughputSurplus()</a></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/samplers/SampleResult.html#getBodySize--">org.apache.jmeter.samplers.SampleResult.getBodySize()</a>
<div class="block"><span class="deprecationComment">replaced by getBodySizeAsLong()</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/samplers/SampleResult.html#getBytes--">org.apache.jmeter.samplers.SampleResult.getBytes()</a>
<div class="block"><span class="deprecationComment">use getBytesAsLong</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/log/Logger.html#getChildren--">org.apache.log.Logger.getChildren()</a>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.html#getDoMultipartPost--">org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase.getDoMultipartPost()</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.html#getDoMultipart--"><code>HTTPSamplerBase.getDoMultipart()</code></a></span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.html#getExactLimit--">org.apache.jmeter.timers.poissonarrivals.PreciseThroughputTimer.getExactLimit()</a></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/gui/action/LookAndFeelCommand.html#getJMeterLaf--">org.apache.jmeter.gui.action.LookAndFeelCommand.getJMeterLaf()</a>
<div class="block"><span class="deprecationComment">see #getPreferredLafCommand</span></div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#getLoggerForShortName-java.lang.String-">org.apache.jorphan.logging.LoggingManager.getLoggerForShortName(String)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.html#getMonitor--">org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase.getMonitor()</a>
<div class="block"><span class="deprecationComment">since 3.2 always returns false</span></div>
@@ -303,69 +333,79 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#initializeLogging-java.util.Properties-">org.apache.jorphan.logging.LoggingManager.initializeLogging(Properties)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/util/JMeterUtils.html#initLogging--">org.apache.jmeter.util.JMeterUtils.initLogging()</a>
<div class="block"><span class="deprecationComment">does not do anything anymore</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/samplers/SampleResult.html#isMonitor--">org.apache.jmeter.samplers.SampleResult.isMonitor()</a>
<div class="block"><span class="deprecationComment">since 3.2 always return false</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.html#isMonitor--">org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase.isMonitor()</a>
<div class="block"><span class="deprecationComment">since 3.2 always returns false</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.html#isMonitor--">org.apache.jmeter.protocol.http.sampler.HTTPAbstractImpl.isMonitor()</a>
<div class="block"><span class="deprecationComment">since 3.2 always return false</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/threads/JMeterContext.html#isRestartNextLoop--">org.apache.jmeter.threads.JMeterContext.isRestartNextLoop()</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/jmeter/threads/JMeterContext.html#isStartNextThreadLoop--"><code>JMeterContext.isStartNextThreadLoop()</code></a></span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/samplers/SampleResult.html#isStartNextThreadLoop--">org.apache.jmeter.samplers.SampleResult.isStartNextThreadLoop()</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/jmeter/samplers/SampleResult.html#getTestLogicalAction--"><code>SampleResult.getTestLogicalAction()</code></a></span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/threads/JMeterContext.html#isStartNextThreadLoop--">org.apache.jmeter.threads.JMeterContext.isStartNextThreadLoop()</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/jmeter/threads/JMeterContext.html#getTestLogicalAction--"><code>JMeterContext.getTestLogicalAction()</code></a></span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/http/control/HeaderManager.html#merge-org.apache.jmeter.testelement.TestElement-boolean-">org.apache.jmeter.protocol.http.control.HeaderManager.merge(TestElement, boolean)</a>
<div class="block"><span class="deprecationComment">since 3.2, use <a href="org/apache/jmeter/protocol/http/control/HeaderManager.html#merge-org.apache.jmeter.testelement.TestElement-"><code>HeaderManager.merge(TestElement)</code></a> as this method will be removed in a future version</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.html#notifySSLContextWasReset--">org.apache.jmeter.protocol.http.sampler.HTTPAbstractImpl.notifySSLContextWasReset()</a>
<div class="block"><span class="deprecationComment">** unused since r1489189. **</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.html#read-java.io.InputStream-">org.apache.jmeter.protocol.tcp.sampler.BinaryTCPClientImpl.read(InputStream)</a></td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.html#read-java.io.InputStream-">org.apache.jmeter.protocol.tcp.sampler.TCPClientImpl.read(InputStream)</a></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/tcp/sampler/TCPClient.html#read-java.io.InputStream-">org.apache.jmeter.protocol.tcp.sampler.TCPClient.read(InputStream)</a>
<div class="block"><span class="deprecationComment">since 3.3, implement <a href="org/apache/jmeter/protocol/tcp/sampler/TCPClient.html#read-java.io.InputStream-org.apache.jmeter.samplers.SampleResult-"><code>TCPClient.read(InputStream, SampleResult)</code></a> instead, will be removed in future version</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/tcp/sampler/LengthPrefixedBinaryTCPClientImpl.html#read-java.io.InputStream-">org.apache.jmeter.protocol.tcp.sampler.LengthPrefixedBinaryTCPClientImpl.read(InputStream)</a></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.html#readResponse-org.apache.jmeter.samplers.SampleResult-java.io.BufferedInputStream-int-">org.apache.jmeter.protocol.http.sampler.HTTPAbstractImpl.readResponse(SampleResult, BufferedInputStream, int)</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.html#readResponse-org.apache.jmeter.samplers.SampleResult-java.io.BufferedInputStream-long-"><code>HTTPAbstractImpl.readResponse(SampleResult, BufferedInputStream, long)</code></a></span></div>
</td>
</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#removePrefix-java.lang.String-">org.apache.jorphan.logging.LoggingManager.removePrefix(String)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colOne"><a href="org/apache/log/Logger.html#setAdditivity-boolean-">org.apache.log.Logger.setAdditivity(boolean)</a>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
@@ -398,21 +438,51 @@
<td class="colOne"><a href="org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.html#setExactLimit-int-">org.apache.jmeter.timers.poissonarrivals.PreciseThroughputTimer.setExactLimit(int)</a></td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#setLoggingLevels-java.util.Properties-">org.apache.jorphan.logging.LoggingManager.setLoggingLevels(Properties)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/log/Logger.html#setLogTargets-org.apache.log.LogTarget:A-">org.apache.log.Logger.setLogTargets(LogTarget[])</a>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/samplers/SampleResult.html#setMonitor-boolean-">org.apache.jmeter.samplers.SampleResult.setMonitor(boolean)</a>
<div class="block"><span class="deprecationComment">since 3.2 NOOP</span></div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriority-org.apache.log.Priority-">org.apache.jorphan.logging.LoggingManager.setPriority(Priority)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
<tr class="altColor">
<td class="colOne"><a href="org/apache/log/Logger.html#setPriority-org.apache.log.Priority-">org.apache.log.Logger.setPriority(Priority)</a>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
</td>
</tr>
<tr class="rowColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriority-org.apache.log.Priority-java.lang.String-">org.apache.jorphan.logging.LoggingManager.setPriority(Priority, String)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriority-java.lang.String-">org.apache.jorphan.logging.LoggingManager.setPriority(String)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriority-java.lang.String-java.lang.String-">org.apache.jorphan.logging.LoggingManager.setPriority(String, String)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriorityFullName-java.lang.String-java.lang.String-">org.apache.jorphan.logging.LoggingManager.setPriorityFullName(String, String)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/samplers/SampleResult.html#setResponseData-java.lang.String-">org.apache.jmeter.samplers.SampleResult.setResponseData(String)</a>
<div class="block"><span class="deprecationComment">- only intended for use from BeanShell code</span></div>
</td>
@@ -433,47 +503,52 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colOne"><a href="org/apache/jorphan/logging/LoggingManager.html#setTarget-org.apache.log.LogTarget-java.lang.String-">org.apache.jorphan.logging.LoggingManager.setTarget(LogTarget, String)</a>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.html#setupDefaultRenderer-javax.swing.JTable-java.lang.Object:A:A-">org.apache.jmeter.gui.util.HeaderAsPropertyRendererWrapper.setupDefaultRenderer(JTable, Object[][])</a>
<div class="block"><span class="deprecationComment">don't use <code>columnsMsgParameters</code> as they are not moved when the columns
of the corresponding tables object model are moved</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/visualizers/SummaryReport.html#testFunctors--">org.apache.jmeter.visualizers.SummaryReport.testFunctors()</a>
<div class="block"><span class="deprecationComment">- only for use in testing</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/visualizers/StatVisualizer.html#testFunctors--">org.apache.jmeter.visualizers.StatVisualizer.testFunctors()</a>
<div class="block"><span class="deprecationComment">- only for use in testing</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/log/Logger.html#unsetLogTargets--">org.apache.log.Logger.unsetLogTargets()</a>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/log/Logger.html#unsetLogTargets-boolean-">org.apache.log.Logger.unsetLogTargets(boolean)</a>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/log/Logger.html#unsetPriority--">org.apache.log.Logger.unsetPriority()</a>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/log/Logger.html#unsetPriority-boolean-">org.apache.log.Logger.unsetPriority(boolean)</a>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/jmeter/util/JMeterUtils.html#unsplit-java.lang.Object:A-java.lang.Object-">org.apache.jmeter.util.JMeterUtils.unsplit(Object[], Object)</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/jorphan/util/JOrphanUtils.html#unsplit-java.lang.Object:A-java.lang.Object-"><code>JOrphanUtils.unsplit(Object[], Object)</code></a></span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/jmeter/visualizers/GraphVisualizer.html#updateGui-org.apache.jmeter.visualizers.Sample-">org.apache.jmeter.visualizers.GraphVisualizer.updateGui(Sample)</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/jmeter/visualizers/GraphVisualizer.html#add-org.apache.jmeter.samplers.SampleResult-"><code>GraphVisualizer.add(SampleResult)</code></a> instead</span></div>
</td>
diff --git a/site/api/index-all.html b/site/api/index-all.html
index 0591e23..6c4b5f8 100644
--- a/site/api/index-all.html
+++ b/site/api/index-all.html
@@ -1105,6 +1105,12 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/util/JMeterUtils.html#addLocaleChangeListener-org.apache.jmeter.util.LocaleChangeListener-">addLocaleChangeListener(LocaleChangeListener)</a></span> - Static method in class org.apache.jmeter.util.<a href="org/apache/jmeter/util/JMeterUtils.html" title="class in org.apache.jmeter.util">JMeterUtils</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#addLogTargetToRootLogger-org.apache.log.LogTarget:A-">addLogTargetToRootLogger(LogTarget[])</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/gui/util/TristateCheckBox.html#addMouseListener-java.awt.event.MouseListener-">addMouseListener(MouseListener)</a></span> - Method in class org.apache.jmeter.gui.util.<a href="org/apache/jmeter/gui/util/TristateCheckBox.html" title="class in org.apache.jmeter.gui.util">TristateCheckBox</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/gui/util/PowerTableModel.html#addNewColumn-java.lang.String-java.lang.Class-">addNewColumn(String, Class<?>)</a></span> - Method in class org.apache.jmeter.gui.util.<a href="org/apache/jmeter/gui/util/PowerTableModel.html" title="class in org.apache.jmeter.gui.util">PowerTableModel</a></dt>
@@ -5996,6 +6002,12 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/http/parser/HTMLParser.html#DEFAULT_PARSER">DEFAULT_PARSER</a></span> - Static variable in class org.apache.jmeter.protocol.http.parser.<a href="org/apache/jmeter/protocol/http/parser/HTMLParser.html" title="class in org.apache.jmeter.protocol.http.parser">HTMLParser</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#DEFAULT_PATTERN">DEFAULT_PATTERN</a></span> - Static variable in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/http/control/HC4CookieHandler.html#DEFAULT_POLICY_NAME">DEFAULT_POLICY_NAME</a></span> - Static variable in class org.apache.jmeter.protocol.http.control.<a href="org/apache/jmeter/protocol/http/control/HC4CookieHandler.html" title="class in org.apache.jmeter.protocol.http.control">HC4CookieHandler</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/http/proxy/ProxyControl.html#DEFAULT_PORT">DEFAULT_PORT</a></span> - Static variable in class org.apache.jmeter.protocol.http.proxy.<a href="org/apache/jmeter/protocol/http/proxy/ProxyControl.html" title="class in org.apache.jmeter.protocol.http.proxy">ProxyControl</a></dt>
@@ -11466,6 +11478,23 @@
<dd>
<div class="block">Get the path where XML messages are stored.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#getLoggerFor-java.lang.String-">getLoggerFor(String)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Get the Logger for a class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#getLoggerForClass--">getLoggerForClass()</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+<div class="block">Get the Logger for a class - no argument needed because the calling class
+ name is derived automatically from the call stack.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#getLoggerForShortName-java.lang.String-">getLoggerForShortName(String)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/gui/GuiPackage.html#getLoggerPanel--">getLoggerPanel()</a></span> - Method in class org.apache.jmeter.gui.<a href="org/apache/jmeter/gui/GuiPackage.html" title="class in org.apache.jmeter.gui">GuiPackage</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/reporters/MailerModel.html#getLogin--">getLogin()</a></span> - Method in class org.apache.jmeter.reporters.<a href="org/apache/jmeter/reporters/MailerModel.html" title="class in org.apache.jmeter.reporters">MailerModel</a></dt>
@@ -16138,6 +16167,12 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.html#initializeExtraResults-org.apache.jmeter.report.processor.MapResultData-">initializeExtraResults(MapResultData)</a></span> - Method in class org.apache.jmeter.report.processor.graph.impl.<a href="org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.html" title="class in org.apache.jmeter.report.processor.graph.impl">TotalTPSGraphConsumer</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#initializeLogging-java.util.Properties-">initializeLogging(Properties)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/util/JMeterUtils.html#initializeProperties-java.lang.String-">initializeProperties(String)</a></span> - Method in class org.apache.jmeter.util.<a href="org/apache/jmeter/util/JMeterUtils.html" title="class in org.apache.jmeter.util">JMeterUtils</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jorphan/test/UnitTestManager.html#initializeProperties-java.lang.String-">initializeProperties(String)</a></span> - Method in interface org.apache.jorphan.test.<a href="org/apache/jorphan/test/UnitTestManager.html" title="interface in org.apache.jorphan.test">UnitTestManager</a></dt>
@@ -18952,10 +18987,22 @@
<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
<div class="block">Log a event at specific priority with a certain message.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#LOG_FILE">LOG_FILE</a></span> - Static variable in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/functions/BeanShell.html#log_info-java.lang.String-">log_info(String)</a></span> - Method in class org.apache.jmeter.functions.<a href="org/apache/jmeter/functions/BeanShell.html" title="class in org.apache.jmeter.functions">BeanShell</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/gui/action/ActionNames.html#LOG_LEVEL_PREFIX">LOG_LEVEL_PREFIX</a></span> - Static variable in class org.apache.jmeter.gui.action.<a href="org/apache/jmeter/gui/action/ActionNames.html" title="class in org.apache.jmeter.gui.action">ActionNames</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#LOG_PRIORITY">LOG_PRIORITY</a></span> - Static variable in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><a href="org/apache/jmeter/assertions/LogErrorHandler.html" title="class in org.apache.jmeter.assertions"><span class="typeNameLink">LogErrorHandler</span></a> - Class in <a href="org/apache/jmeter/assertions/package-summary.html">org.apache.jmeter.assertions</a></dt>
<dd>
<div class="block"><a href="https://docs.oracle.com/javase/8/docs/api/org/xml/sax/ErrorHandler.html?is-external=true" title="class or interface in org.xml.sax"><code>ErrorHandler</code></a> implementation that logs</div>
@@ -19032,6 +19079,12 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/gui/action/template/TemplateManager.LoggingErrorHandler.html#LoggingErrorHandler-org.slf4j.Logger-java.io.File-">LoggingErrorHandler(Logger, File)</a></span> - Constructor for class org.apache.jmeter.gui.action.template.<a href="org/apache/jmeter/gui/action/template/TemplateManager.LoggingErrorHandler.html" title="class in org.apache.jmeter.gui.action.template">TemplateManager.LoggingErrorHandler</a></dt>
<dd> </dd>
+<dt><a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging"><span class="typeNameLink">LoggingManager</span></a> - Class in <a href="org/apache/jorphan/logging/package-summary.html">org.apache.jorphan.logging</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logger creation</span></div>
+</div>
+</dd>
<dt><a href="org/apache/jmeter/control/gui/LogicControllerGui.html" title="class in org.apache.jmeter.control.gui"><span class="typeNameLink">LogicControllerGui</span></a> - Class in <a href="org/apache/jmeter/control/gui/package-summary.html">org.apache.jmeter.control.gui</a></dt>
<dd>
<div class="block">A generic controller component.</div>
@@ -21009,6 +21062,8 @@ any class wishing to display or present data collected in SampleResults.</div>
<dd> </dd>
<dt><a href="org/apache/jorphan/io/package-summary.html">org.apache.jorphan.io</a> - package org.apache.jorphan.io</dt>
<dd> </dd>
+<dt><a href="org/apache/jorphan/logging/package-summary.html">org.apache.jorphan.logging</a> - package org.apache.jorphan.logging</dt>
+<dd> </dd>
<dt><a href="org/apache/jorphan/math/package-summary.html">org.apache.jorphan.math</a> - package org.apache.jorphan.math</dt>
<dd> </dd>
<dt><a href="org/apache/jorphan/reflect/package-summary.html">org.apache.jorphan.reflect</a> - package org.apache.jorphan.reflect</dt>
@@ -22677,6 +22732,12 @@ any class wishing to display or present data collected in SampleResults.</div>
<div class="block">Allows an ActionListener to be removed from receiving notifications of a
command being executed prior to the actual execution of the command.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#removePrefix-java.lang.String-">removePrefix(String)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/testelement/AbstractTestElement.html#removeProperty-java.lang.String-">removeProperty(String)</a></span> - Method in class org.apache.jmeter.testelement.<a href="org/apache/jmeter/testelement/AbstractTestElement.html" title="class in org.apache.jmeter.testelement">AbstractTestElement</a></dt>
<dd>
<div class="block">Remove property stored under the <code>key</code></div>
@@ -26633,6 +26694,12 @@ any class wishing to display or present data collected in SampleResults.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/gui/GuiPackage.html#setLoggerPanel-org.apache.jmeter.gui.LoggerPanel-">setLoggerPanel(LoggerPanel)</a></span> - Method in class org.apache.jmeter.gui.<a href="org/apache/jmeter/gui/GuiPackage.html" title="class in org.apache.jmeter.gui">GuiPackage</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#setLoggingLevels-java.util.Properties-">setLoggingLevels(Properties)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/reporters/MailerModel.html#setLogin-java.lang.String-">setLogin(String)</a></span> - Method in class org.apache.jmeter.reporters.<a href="org/apache/jmeter/reporters/MailerModel.html" title="class in org.apache.jmeter.reporters">MailerModel</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/log/Logger.html#setLogTargets-org.apache.log.LogTarget:A-">setLogTargets(LogTarget[])</a></span> - Method in class org.apache.log.<a href="org/apache/log/Logger.html" title="class in org.apache.log">Logger</a></dt>
@@ -27506,6 +27573,30 @@ any class wishing to display or present data collected in SampleResults.</div>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/jms/sampler/PublisherSampler.html#setPriority-java.lang.String-">setPriority(String)</a></span> - Method in class org.apache.jmeter.protocol.jms.sampler.<a href="org/apache/jmeter/protocol/jms/sampler/PublisherSampler.html" title="class in org.apache.jmeter.protocol.jms.sampler">PublisherSampler</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriority-java.lang.String-java.lang.String-">setPriority(String, String)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriority-org.apache.log.Priority-java.lang.String-">setPriority(Priority, String)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriority-java.lang.String-">setPriority(String)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriority-org.apache.log.Priority-">setPriority(Priority)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/log/LogEvent.html#setPriority-org.apache.log.Priority-">setPriority(Priority)</a></span> - Method in class org.apache.log.<a href="org/apache/log/LogEvent.html" title="class in org.apache.log">LogEvent</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -27517,6 +27608,12 @@ any class wishing to display or present data collected in SampleResults.</div>
<div class="block"><span class="deprecationComment">Will be dropped in 3.3</span></div>
</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#setPriorityFullName-java.lang.String-java.lang.String-">setPriorityFullName(String, String)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/report/processor/AbstractSampleConsumer.html#setProducedMetadata-org.apache.jmeter.report.core.SampleMetadata-int-">setProducedMetadata(SampleMetadata, int)</a></span> - Method in class org.apache.jmeter.report.processor.<a href="org/apache/jmeter/report/processor/AbstractSampleConsumer.html" title="class in org.apache.jmeter.report.processor">AbstractSampleConsumer</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/report/processor/SampleProducer.html#setProducedMetadata-org.apache.jmeter.report.core.SampleMetadata-int-">setProducedMetadata(SampleMetadata, int)</a></span> - Method in interface org.apache.jmeter.report.processor.<a href="org/apache/jmeter/report/processor/SampleProducer.html" title="interface in org.apache.jmeter.report.processor">SampleProducer</a></dt>
@@ -28566,6 +28663,12 @@ any class wishing to display or present data collected in SampleResults.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/sampler/TestAction.html#setTarget-int-">setTarget(int)</a></span> - Method in class org.apache.jmeter.sampler.<a href="org/apache/jmeter/sampler/TestAction.html" title="class in org.apache.jmeter.sampler">TestAction</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/jorphan/logging/LoggingManager.html#setTarget-org.apache.log.LogTarget-java.lang.String-">setTarget(LogTarget, String)</a></span> - Static method in class org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></dt>
+<dd>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/util/SlowSSLSocket.html#setTcpNoDelay-boolean-">setTcpNoDelay(boolean)</a></span> - Method in class org.apache.jmeter.util.<a href="org/apache/jmeter/util/SlowSSLSocket.html" title="class in org.apache.jmeter.util">SlowSSLSocket</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/testelement/TestPlan.html#setTearDownOnShutdown-boolean-">setTearDownOnShutdown(boolean)</a></span> - Method in class org.apache.jmeter.testelement.<a href="org/apache/jmeter/testelement/TestPlan.html" title="class in org.apache.jmeter.testelement">TestPlan</a></dt>
diff --git a/site/api/org/apache/jmeter/gui/package-tree.html b/site/api/org/apache/jmeter/gui/package-tree.html
index 6d5989d..afcbf6c 100644
--- a/site/api/org/apache/jmeter/gui/package-tree.html
+++ b/site/api/org/apache/jmeter/gui/package-tree.html
@@ -176,8 +176,8 @@
</ul>
<h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
<ul>
-<li type="circle">org.apache.jmeter.gui.<a href="../../../../org/apache/jmeter/gui/GUIMenuSortOrder.html" title="annotation in org.apache.jmeter.gui"><span class="typeNameLink">GUIMenuSortOrder</span></a> (implements java.lang.annotation.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
<li type="circle">org.apache.jmeter.gui.<a href="../../../../org/apache/jmeter/gui/TestElementMetadata.html" title="annotation in org.apache.jmeter.gui"><span class="typeNameLink">TestElementMetadata</span></a> (implements java.lang.annotation.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.jmeter.gui.<a href="../../../../org/apache/jmeter/gui/GUIMenuSortOrder.html" title="annotation in org.apache.jmeter.gui"><span class="typeNameLink">GUIMenuSortOrder</span></a> (implements java.lang.annotation.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
</ul>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
diff --git a/site/api/org/apache/jorphan/io/package-summary.html b/site/api/org/apache/jorphan/io/package-summary.html
index 1cb0d46..93cef37 100644
--- a/site/api/org/apache/jorphan/io/package-summary.html
+++ b/site/api/org/apache/jorphan/io/package-summary.html
@@ -44,7 +44,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/jorphan/gui/ui/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../org/apache/jorphan/math/package-summary.html">Next Package</a></li>
+<li><a href="../../../../org/apache/jorphan/logging/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/jorphan/io/package-summary.html" target="_top">Frames</a></li>
@@ -115,7 +115,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/jorphan/gui/ui/package-summary.html">Prev Package</a></li>
-<li><a href="../../../../org/apache/jorphan/math/package-summary.html">Next Package</a></li>
+<li><a href="../../../../org/apache/jorphan/logging/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/jorphan/io/package-summary.html" target="_top">Frames</a></li>
diff --git a/site/api/org/apache/jorphan/io/package-tree.html b/site/api/org/apache/jorphan/io/package-tree.html
index a5b1295..3d3a5b0 100644
--- a/site/api/org/apache/jorphan/io/package-tree.html
+++ b/site/api/org/apache/jorphan/io/package-tree.html
@@ -44,7 +44,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/jorphan/gui/ui/package-tree.html">Prev</a></li>
-<li><a href="../../../../org/apache/jorphan/math/package-tree.html">Next</a></li>
+<li><a href="../../../../org/apache/jorphan/logging/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/jorphan/io/package-tree.html" target="_top">Frames</a></li>
@@ -112,7 +112,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/jorphan/gui/ui/package-tree.html">Prev</a></li>
-<li><a href="../../../../org/apache/jorphan/math/package-tree.html">Next</a></li>
+<li><a href="../../../../org/apache/jorphan/logging/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/jorphan/io/package-tree.html" target="_top">Frames</a></li>
diff --git a/site/api/org/apache/jorphan/logging/LoggingManager.html b/site/api/org/apache/jorphan/logging/LoggingManager.html
new file mode 100644
index 0000000..7816154
--- /dev/null
+++ b/site/api/org/apache/jorphan/logging/LoggingManager.html
@@ -0,0 +1,662 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>LoggingManager (Apache JMeter dist API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="LoggingManager (Apache JMeter dist API)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var methods = {"i0":41,"i1":41,"i2":41,"i3":41,"i4":41,"i5":41,"i6":41,"i7":41,"i8":41,"i9":41,"i10":41,"i11":41,"i12":41};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+<div class="aboutLanguage"><b>Apache JMeter</b></div>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev Class</li>
+<li>Next Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/jorphan/logging/LoggingManager.html" target="_top">Frames</a></li>
+<li><a href="LoggingManager.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li>Constr | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li>Constr | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.jorphan.logging</div>
+<h2 title="Class LoggingManager" class="title">Class LoggingManager</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.apache.jorphan.logging.LoggingManager</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logger creation</span></div>
+</div>
+<br>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public final class <span class="typeNameLabel">LoggingManager</span>
+extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Manages JMeter logging</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#DEFAULT_PATTERN">DEFAULT_PATTERN</a></span></code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#LOG_FILE">LOG_FILE</a></span></code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#LOG_PRIORITY">LOG_PRIORITY</a></span></code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tab [...]
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#addLogTargetToRootLogger-org.apache.log.LogTarget:A-">addLogTargetToRootLogger</a></span>(<a href="../../../../org/apache/log/LogTarget.html" title="interface in org.apache.log">LogTarget</a>[] logTargets)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/log/Logger.html" title="class in org.apache.log">Logger</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#getLoggerFor-java.lang.String-">getLoggerFor</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> </div>
+<div class="block">Get the Logger for a class.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/log/Logger.html" title="class in org.apache.log">Logger</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#getLoggerForClass--">getLoggerForClass</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> </div>
+<div class="block">Get the Logger for a class - no argument needed because the calling class
+ name is derived automatically from the call stack.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/log/Logger.html" title="class in org.apache.log">Logger</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#getLoggerForShortName-java.lang.String-">getLoggerForShortName</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#initializeLogging-java.util.Properties-">initializeLogging</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a> properties)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#removePrefix-java.lang.String-">removePrefix</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#setLoggingLevels-java.util.Properties-">setLoggingLevels</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a> appProperties)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#setPriority-org.apache.log.Priority-">setPriority</a></span>(<a href="../../../../org/apache/log/Priority.html" title="class in org.apache.log">Priority</a> priority)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#setPriority-org.apache.log.Priority-java.lang.String-">setPriority</a></span>(<a href="../../../../org/apache/log/Priority.html" title="class in org.apache.log">Priority</a> priority,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#setPriority-java.lang.String-">setPriority</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> priority)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#setPriority-java.lang.String-java.lang.String-">setPriority</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> priority,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#setPriorityFullName-java.lang.String-java.lang.String-">setPriorityFullName</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> priority,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> fullName)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html#setTarget-org.apache.log.LogTarget-java.lang.String-">setTarget</a></span>(<a href="../../../../org/apache/log/LogTarget.html" title="interface in org.apache.log">LogTarget</a> target,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="htt [...]
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a name="DEFAULT_PATTERN">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DEFAULT_PATTERN</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> DEFAULT_PATTERN</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Predefined format patterns, selected by the property log_format_type (see
+ jmeter.properties) The new-line is added later</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.apache.jorphan.logging.LoggingManager.DEFAULT_PATTERN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="LOG_FILE">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG_FILE</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> LOG_FILE</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.apache.jorphan.logging.LoggingManager.LOG_FILE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="LOG_PRIORITY">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>LOG_PRIORITY</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> LOG_PRIORITY</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.apache.jorphan.logging.LoggingManager.LOG_PRIORITY">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a name="initializeLogging-java.util.Properties-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>initializeLogging</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static void initializeLogging(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a> properties)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Initialise the logging system from the Jmeter properties. Logkit loggers
+ inherit from their parents.
+
+ Normally the jmeter properties file defines a single log file, so set
+ this as the default from "log_file", default "jmeter.log" The default
+ priority is set from "log_level", with a default of INFO</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>properties</code> - <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util"><code>Properties</code></a> to be used for initialization</dd>
+</dl>
+</li>
+</ul>
+<a name="setLoggingLevels-java.util.Properties-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setLoggingLevels</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static void setLoggingLevels(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a> appProperties)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Handle LOG_PRIORITY.category=priority and LOG_FILE.category=file_name
+ properties. If the prefix is detected, then remove it to get the
+ category.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>appProperties</code> - <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util"><code>Properties</code></a> that contain the
+ <a href="../../../../org/apache/jorphan/logging/LoggingManager.html#LOG_PRIORITY"><code>LOG_PRIORITY</code></a> and
+ <a href="../../../../org/apache/jorphan/logging/LoggingManager.html#LOG_FILE"><code>LOG_FILE</code></a> prefixed entries</dd>
+</dl>
+</li>
+</ul>
+<a name="removePrefix-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removePrefix</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> removePrefix(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Removes the standard prefix, i.e. "org.apache.".</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - from which to remove the prefix</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the name with the prefix removed</dd>
+</dl>
+</li>
+</ul>
+<a name="getLoggerForClass--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLoggerForClass</h4>
+<pre>public static <a href="../../../../org/apache/log/Logger.html" title="class in org.apache.log">Logger</a> getLoggerForClass()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> </div>
+<div class="block">Get the Logger for a class - no argument needed because the calling class
+ name is derived automatically from the call stack.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Logger</dd>
+</dl>
+</li>
+</ul>
+<a name="getLoggerFor-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLoggerFor</h4>
+<pre>public static <a href="../../../../org/apache/log/Logger.html" title="class in org.apache.log">Logger</a> getLoggerFor(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> </div>
+<div class="block">Get the Logger for a class.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>category</code> - - the full name of the logger category</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Logger</dd>
+</dl>
+</li>
+</ul>
+<a name="getLoggerForShortName-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLoggerForShortName</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static <a href="../../../../org/apache/log/Logger.html" title="class in org.apache.log">Logger</a> getLoggerForShortName(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Get the Logger for a class.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>category</code> - - the full name of the logger category, this will have the prefix removed.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Logger</dd>
+</dl>
+</li>
+</ul>
+<a name="setPriority-java.lang.String-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPriority</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static void setPriority(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> priority,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Set the logging priority for a category.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>priority</code> - - string containing the priority name, e.g. "INFO", "WARN", "DEBUG", "FATAL_ERROR"</dd>
+<dd><code>category</code> - - string containing the category</dd>
+</dl>
+</li>
+</ul>
+<a name="setPriorityFullName-java.lang.String-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPriorityFullName</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static void setPriorityFullName(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> priority,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> fullName)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Set the logging priority for a category.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>priority</code> - - priority, e.g. DEBUG, INFO</dd>
+<dd><code>fullName</code> - - e.g. org.apache.jmeter.etc, will have the prefix removed.</dd>
+</dl>
+</li>
+</ul>
+<a name="setPriority-org.apache.log.Priority-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPriority</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static void setPriority(<a href="../../../../org/apache/log/Priority.html" title="class in org.apache.log">Priority</a> priority,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Set the logging priority for a category.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>priority</code> - - e.g. Priority.DEBUG</dd>
+<dd><code>category</code> - - string containing the category</dd>
+</dl>
+</li>
+</ul>
+<a name="setPriority-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPriority</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static void setPriority(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> priority)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Set the logging priority.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>priority</code> - - e.g. Priority.DEBUG</dd>
+</dl>
+</li>
+</ul>
+<a name="setPriority-org.apache.log.Priority-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPriority</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static void setPriority(<a href="../../../../org/apache/log/Priority.html" title="class in org.apache.log">Priority</a> priority)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Set the default logging priority.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>priority</code> - e.g. Priority.DEBUG</dd>
+</dl>
+</li>
+</ul>
+<a name="setTarget-org.apache.log.LogTarget-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTarget</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static void setTarget(<a href="../../../../org/apache/log/LogTarget.html" title="interface in org.apache.log">LogTarget</a> target,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> category)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Set the logging target for a category.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>target</code> - the LogTarget</dd>
+<dd><code>category</code> - the category name</dd>
+</dl>
+</li>
+</ul>
+<a name="addLogTargetToRootLogger-org.apache.log.LogTarget:A-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>addLogTargetToRootLogger</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public static void addLogTargetToRootLogger(<a href="../../../../org/apache/log/LogTarget.html" title="interface in org.apache.log">LogTarget</a>[] logTargets)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 3.2, use SLF4J for logging</span></div>
+<div class="block">Add logTargets to root logger
+ FIXME What's the clean way to add a LogTarget afterwards ?</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>logTargets</code> - LogTarget array</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+<div class="aboutLanguage"><b>Apache JMeter</b></div>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev Class</li>
+<li>Next Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/jorphan/logging/LoggingManager.html" target="_top">Frames</a></li>
+<li><a href="LoggingManager.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li>Constr | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li>Constr | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 1998-2020 Apache Software Foundation. All Rights Reserved.</small></p>
+</body>
+</html>
diff --git a/site/api/org/apache/jorphan/logging/package-frame.html b/site/api/org/apache/jorphan/logging/package-frame.html
new file mode 100644
index 0000000..fac2091
--- /dev/null
+++ b/site/api/org/apache/jorphan/logging/package-frame.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>org.apache.jorphan.logging (Apache JMeter dist API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../../org/apache/jorphan/logging/package-summary.html" target="classFrame">org.apache.jorphan.logging</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="LoggingManager.html" title="class in org.apache.jorphan.logging" target="classFrame">LoggingManager</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/site/api/org/apache/jorphan/io/package-summary.html b/site/api/org/apache/jorphan/logging/package-summary.html
similarity index 82%
copy from site/api/org/apache/jorphan/io/package-summary.html
copy to site/api/org/apache/jorphan/logging/package-summary.html
index 1cb0d46..4dbe862 100644
--- a/site/api/org/apache/jorphan/io/package-summary.html
+++ b/site/api/org/apache/jorphan/logging/package-summary.html
@@ -4,7 +4,7 @@
<head>
<!-- Generated by javadoc -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.jorphan.io (Apache JMeter dist API)</title>
+<title>org.apache.jorphan.logging (Apache JMeter dist API)</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
@@ -12,7 +12,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="org.apache.jorphan.io (Apache JMeter dist API)";
+ parent.document.title="org.apache.jorphan.logging (Apache JMeter dist API)";
}
}
catch(err) {
@@ -43,11 +43,11 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/jorphan/gui/ui/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../org/apache/jorphan/io/package-summary.html">Prev Package</a></li>
<li><a href="../../../../org/apache/jorphan/math/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
-<li><a href="../../../../index.html?org/apache/jorphan/io/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../../../index.html?org/apache/jorphan/logging/package-summary.html" target="_top">Frames</a></li>
<li><a href="package-summary.html" target="_top">No Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_top">
@@ -70,7 +70,7 @@
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
<div class="header">
-<h1 title="Package" class="title">Package org.apache.jorphan.io</h1>
+<h1 title="Package" class="title">Package org.apache.jorphan.logging</h1>
</div>
<div class="contentContainer">
<ul class="blockList">
@@ -83,9 +83,9 @@
</tr>
<tbody>
<tr class="altColor">
-<td class="colFirst"><a href="../../../../org/apache/jorphan/io/TextFile.html" title="class in org.apache.jorphan.io">TextFile</a></td>
-<td class="colLast">
-<div class="block">Utility class to handle text files as a single lump of text.</div>
+<td class="colFirst"><a href="../../../../org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging">LoggingManager</a></td>
+<td class="colLast">Deprecated
+<div class="block"><span class="deprecationComment">since 3.2, use SLF4J for logger creation</span></div>
</td>
</tr>
</tbody>
@@ -114,11 +114,11 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/jorphan/gui/ui/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../org/apache/jorphan/io/package-summary.html">Prev Package</a></li>
<li><a href="../../../../org/apache/jorphan/math/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
-<li><a href="../../../../index.html?org/apache/jorphan/io/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../../../index.html?org/apache/jorphan/logging/package-summary.html" target="_top">Frames</a></li>
<li><a href="package-summary.html" target="_top">No Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_bottom">
diff --git a/site/api/org/apache/jorphan/io/package-tree.html b/site/api/org/apache/jorphan/logging/package-tree.html
similarity index 75%
copy from site/api/org/apache/jorphan/io/package-tree.html
copy to site/api/org/apache/jorphan/logging/package-tree.html
index a5b1295..e2ddbe0 100644
--- a/site/api/org/apache/jorphan/io/package-tree.html
+++ b/site/api/org/apache/jorphan/logging/package-tree.html
@@ -4,7 +4,7 @@
<head>
<!-- Generated by javadoc -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.jorphan.io Class Hierarchy (Apache JMeter dist API)</title>
+<title>org.apache.jorphan.logging Class Hierarchy (Apache JMeter dist API)</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
@@ -12,7 +12,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="org.apache.jorphan.io Class Hierarchy (Apache JMeter dist API)";
+ parent.document.title="org.apache.jorphan.logging Class Hierarchy (Apache JMeter dist API)";
}
}
catch(err) {
@@ -43,11 +43,11 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/jorphan/gui/ui/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/jorphan/io/package-tree.html">Prev</a></li>
<li><a href="../../../../org/apache/jorphan/math/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
-<li><a href="../../../../index.html?org/apache/jorphan/io/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../../../index.html?org/apache/jorphan/logging/package-tree.html" target="_top">Frames</a></li>
<li><a href="package-tree.html" target="_top">No Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_top">
@@ -70,7 +70,7 @@
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
<div class="header">
-<h1 class="title">Hierarchy For Package org.apache.jorphan.io</h1>
+<h1 class="title">Hierarchy For Package org.apache.jorphan.logging</h1>
<span class="packageHierarchyLabel">Package Hierarchies:</span>
<ul class="horizontal">
<li><a href="../../../../overview-tree.html">All Packages</a></li>
@@ -81,11 +81,7 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
<ul>
-<li type="circle">java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><span class="typeNameLink">File</span></a> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class [...]
-<ul>
-<li type="circle">org.apache.jorphan.io.<a href="../../../../org/apache/jorphan/io/TextFile.html" title="class in org.apache.jorphan.io"><span class="typeNameLink">TextFile</span></a></li>
-</ul>
-</li>
+<li type="circle">org.apache.jorphan.logging.<a href="../../../../org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging"><span class="typeNameLink">LoggingManager</span></a></li>
</ul>
</li>
</ul>
@@ -111,11 +107,11 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/jorphan/gui/ui/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/jorphan/io/package-tree.html">Prev</a></li>
<li><a href="../../../../org/apache/jorphan/math/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
-<li><a href="../../../../index.html?org/apache/jorphan/io/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../../../index.html?org/apache/jorphan/logging/package-tree.html" target="_top">Frames</a></li>
<li><a href="package-tree.html" target="_top">No Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_bottom">
diff --git a/site/api/org/apache/jorphan/math/package-summary.html b/site/api/org/apache/jorphan/math/package-summary.html
index 6b752ce..d237c94 100644
--- a/site/api/org/apache/jorphan/math/package-summary.html
+++ b/site/api/org/apache/jorphan/math/package-summary.html
@@ -43,7 +43,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/jorphan/io/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../org/apache/jorphan/logging/package-summary.html">Prev Package</a></li>
<li><a href="../../../../org/apache/jorphan/reflect/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
@@ -130,7 +130,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/jorphan/io/package-summary.html">Prev Package</a></li>
+<li><a href="../../../../org/apache/jorphan/logging/package-summary.html">Prev Package</a></li>
<li><a href="../../../../org/apache/jorphan/reflect/package-summary.html">Next Package</a></li>
</ul>
<ul class="navList">
diff --git a/site/api/org/apache/jorphan/math/package-tree.html b/site/api/org/apache/jorphan/math/package-tree.html
index 348e9b3..22d707e 100644
--- a/site/api/org/apache/jorphan/math/package-tree.html
+++ b/site/api/org/apache/jorphan/math/package-tree.html
@@ -43,7 +43,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/jorphan/io/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/jorphan/logging/package-tree.html">Prev</a></li>
<li><a href="../../../../org/apache/jorphan/reflect/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
@@ -113,7 +113,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/jorphan/io/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/jorphan/logging/package-tree.html">Prev</a></li>
<li><a href="../../../../org/apache/jorphan/reflect/package-tree.html">Next</a></li>
</ul>
<ul class="navList">
diff --git a/site/api/overview-frame.html b/site/api/overview-frame.html
index 7bccb46..54985f1 100644
--- a/site/api/overview-frame.html
+++ b/site/api/overview-frame.html
@@ -150,6 +150,7 @@
<li><a href="org/apache/jorphan/gui/layout/package-frame.html" target="packageFrame">org.apache.jorphan.gui.layout</a></li>
<li><a href="org/apache/jorphan/gui/ui/package-frame.html" target="packageFrame">org.apache.jorphan.gui.ui</a></li>
<li><a href="org/apache/jorphan/io/package-frame.html" target="packageFrame">org.apache.jorphan.io</a></li>
+<li><a href="org/apache/jorphan/logging/package-frame.html" target="packageFrame">org.apache.jorphan.logging</a></li>
<li><a href="org/apache/jorphan/math/package-frame.html" target="packageFrame">org.apache.jorphan.math</a></li>
<li><a href="org/apache/jorphan/reflect/package-frame.html" target="packageFrame">org.apache.jorphan.reflect</a></li>
<li><a href="org/apache/jorphan/test/package-frame.html" target="packageFrame">org.apache.jorphan.test</a></li>
diff --git a/site/api/overview-summary.html b/site/api/overview-summary.html
index 05b3892..a122181 100644
--- a/site/api/overview-summary.html
+++ b/site/api/overview-summary.html
@@ -650,22 +650,26 @@ any class wishing to display or present data collected in SampleResults.</div>
<td class="colLast"> </td>
</tr>
<tr class="altColor">
-<td class="colFirst"><a href="org/apache/jorphan/math/package-summary.html">org.apache.jorphan.math</a></td>
+<td class="colFirst"><a href="org/apache/jorphan/logging/package-summary.html">org.apache.jorphan.logging</a></td>
<td class="colLast"> </td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><a href="org/apache/jorphan/reflect/package-summary.html">org.apache.jorphan.reflect</a></td>
+<td class="colFirst"><a href="org/apache/jorphan/math/package-summary.html">org.apache.jorphan.math</a></td>
<td class="colLast"> </td>
</tr>
<tr class="altColor">
-<td class="colFirst"><a href="org/apache/jorphan/test/package-summary.html">org.apache.jorphan.test</a></td>
+<td class="colFirst"><a href="org/apache/jorphan/reflect/package-summary.html">org.apache.jorphan.reflect</a></td>
<td class="colLast"> </td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><a href="org/apache/jorphan/util/package-summary.html">org.apache.jorphan.util</a></td>
+<td class="colFirst"><a href="org/apache/jorphan/test/package-summary.html">org.apache.jorphan.test</a></td>
<td class="colLast"> </td>
</tr>
<tr class="altColor">
+<td class="colFirst"><a href="org/apache/jorphan/util/package-summary.html">org.apache.jorphan.util</a></td>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/log/package-summary.html">org.apache.log</a></td>
<td class="colLast"> </td>
</tr>
diff --git a/site/api/overview-tree.html b/site/api/overview-tree.html
index e6aca0f..7d3c96a 100644
--- a/site/api/overview-tree.html
+++ b/site/api/overview-tree.html
@@ -209,6 +209,7 @@
<li><a href="org/apache/jorphan/gui/layout/package-tree.html">org.apache.jorphan.gui.layout</a>, </li>
<li><a href="org/apache/jorphan/gui/ui/package-tree.html">org.apache.jorphan.gui.ui</a>, </li>
<li><a href="org/apache/jorphan/io/package-tree.html">org.apache.jorphan.io</a>, </li>
+<li><a href="org/apache/jorphan/logging/package-tree.html">org.apache.jorphan.logging</a>, </li>
<li><a href="org/apache/jorphan/math/package-tree.html">org.apache.jorphan.math</a>, </li>
<li><a href="org/apache/jorphan/reflect/package-tree.html">org.apache.jorphan.reflect</a>, </li>
<li><a href="org/apache/jorphan/test/package-tree.html">org.apache.jorphan.test</a>, </li>
@@ -1462,6 +1463,7 @@
<li type="circle">org.apache.log.<a href="org/apache/log/LogEvent.html" title="class in org.apache.log"><span class="typeNameLink">LogEvent</span></a> (implements java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)</li>
<li type="circle">org.apache.jmeter.protocol.http.util.accesslog.<a href="org/apache/jmeter/protocol/http/util/accesslog/LogFilter.html" title="class in org.apache.jmeter.protocol.http.util.accesslog"><span class="typeNameLink">LogFilter</span></a> (implements org.apache.jmeter.protocol.http.util.accesslog.<a href="org/apache/jmeter/protocol/http/util/accesslog/Filter.html" title="interface in org.apache.jmeter.protocol.http.util.accesslog">Filter</a>, java.io.<a href="https://docs.oracl [...]
<li type="circle">org.apache.log.<a href="org/apache/log/Logger.html" title="class in org.apache.log"><span class="typeNameLink">Logger</span></a></li>
+<li type="circle">org.apache.jorphan.logging.<a href="org/apache/jorphan/logging/LoggingManager.html" title="class in org.apache.jorphan.logging"><span class="typeNameLink">LoggingManager</span></a></li>
<li type="circle">org.apache.jmeter.save.converters.<a href="org/apache/jmeter/save/converters/LongPropertyConverter.html" title="class in org.apache.jmeter.save.converters"><span class="typeNameLink">LongPropertyConverter</span></a> (implements com.thoughtworks.xstream.converters.Converter)</li>
<li type="circle">org.apache.jmeter.gui.action.<a href="org/apache/jmeter/gui/action/LookAndFeelCommand.MenuItem.html" title="class in org.apache.jmeter.gui.action"><span class="typeNameLink">LookAndFeelCommand.MenuItem</span></a></li>
<li type="circle">org.apache.jmeter.engine.event.<a href="org/apache/jmeter/engine/event/LoopIterationEvent.html" title="class in org.apache.jmeter.engine.event"><span class="typeNameLink">LoopIterationEvent</span></a></li>
diff --git a/site/api/package-list b/site/api/package-list
index 051c171..303d6c1 100644
--- a/site/api/package-list
+++ b/site/api/package-list
@@ -134,6 +134,7 @@ org.apache.jorphan.gui
org.apache.jorphan.gui.layout
org.apache.jorphan.gui.ui
org.apache.jorphan.io
+org.apache.jorphan.logging
org.apache.jorphan.math
org.apache.jorphan.reflect
org.apache.jorphan.test
diff --git a/site/changes.html b/site/changes.html
index 6ebe977..436e7ff 100644
--- a/site/changes.html
+++ b/site/changes.html
@@ -266,7 +266,10 @@ applications when JMeter is starting up.</p>
<ul>
-<li>Remove <span class="code">LoggingManager</span> class (it has been deprecated since JMeter 3.2)</li>
+<li>Remove LogKit logger functionality from some classes. This was intended to completely remove
+ <span class="code">LoggingManager</span> class (it has been deprecated since JMeter 3.2), but as jmeter-plugins
+ depended on it, <span class="code">LoggingManager</span> and our <span class="code">LogKit</span>-adapter will remain for
+ this version (but is still deprecated).</li>
</ul>
@@ -336,6 +339,13 @@ applications when JMeter is starting up.</p>
<h3>Listeners</h3>
<ul>
+
+<li>
+<a href="https://github.com/apache/jmeter/pull/544">
+ Pull request #544</a>
+ -
+ Add BackendListener that sends "raw" results to InfluxDB. Contributed by Graham Russell
+ (graham at ham1.co.uk)</li>
</ul>
@@ -372,6 +382,13 @@ applications when JMeter is starting up.</p>
-
Dashboard/HTML Report: Rename <span class="code">KO</span> to <span class="code">FAIL</span>
</li>
+
+<li>
+<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=64936">
+ Bug
+ 64936</a>
+ -
+ Increase generate_report_ui.generation_timeout to 5 minutes to handle large performance test</li>
</ul>
@@ -495,7 +512,7 @@ applications when JMeter is starting up.</p>
<a href="https://github.com/apache/jmeter/pull/612">
Pull request #612</a>
-
- Correct typos in <span class="code">README.me</span>. Based on patches by Pooja Chandak (poojachandak002 at gmail.com)</li>
+ Correct typos in <span class="code">README.md</span>. Based on patches by Pooja Chandak (poojachandak002 at gmail.com)</li>
<li>
<a href="https://github.com/apache/jmeter/pull/613">
@@ -536,6 +553,13 @@ applications when JMeter is starting up.</p>
<li>Update XStream to 1.4.14 (from 1.4.14.1)</li>
<li>Update Apache commons-dbcp2 to 2.8.0 (from 2.7.0)</li>
+
+<li>
+<a href="https://github.com/apache/jmeter/pull/635">
+ Pull request #635</a>
+ -
+ Correct some image ratios in the documentation. Patch provided
+ by Vincent Daburon (vdaburon at gmail.com)</li>
</ul>
@@ -772,6 +796,13 @@ applications when JMeter is starting up.</p>
64711</a>
-
Textarea Colors are not good in dark modes. Contributed by Jannis Weis</li>
+
+<li>
+<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=64935">
+ Bug
+ 64935</a>
+ -
+ A broken plugin class should not prevent JMeter from starting</li>
</ul>
@@ -787,7 +818,7 @@ applications when JMeter is starting up.</p>
<li>Michael Weidmann (https://github.com/michaelweidmann)</li>
-<li>Deng Liming (liming.d.pro at gmail.com>)</li>
+<li>Deng Liming (liming.d.pro at gmail.com)</li>
<li>jmetertea (https://github.com/jmetertea)</li>
@@ -812,6 +843,8 @@ applications when JMeter is starting up.</p>
<li>Woonsan Ko (woonsan at apache.org)</li>
<li>Timo (ASF.Software.Timo at Leefers.eu)</li>
+
+<li>Graham Russell (graham at ham1.co.uk)</li>
</ul>
@@ -915,7 +948,35 @@ export JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
<li>
-With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine, copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_13_Release/rhino-engine-1.7.13.jar">rhino-engine-1.7.13.jar</a> in <span class="code">$JMETER_HOME/lib/ext</span>.
+With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jeps/372">Nashorn has been removed</a>. To add back a JSR-223 compatible JavaScript engine you have two options:
+ <dl>
+
+<dt>Use Mozilla Rhino</dt>
+
+<dd>Copy <a href="https://github.com/mozilla/rhino/releases/download/Rhino1_7_13_Release/rhino-engine-1.7.13.jar">rhino-engine-1.7.13.jar</a> into <span class="code">$JMETER_HOME/lib/ext</span>.</dd>
+
+<dt>Use OpenJDK Nashorn</dt>
+
+<dd>
+ The OpenJDK Nashorn implementation comes as a module. To use it, you will have to download it and add it to the module path. A hacky way to download the version 15.0 and its dependencies and set the module path is outlined below:
+ <pre class="source">
+mkdir lib/modules
+pushd lib/modules
+wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.0/nashorn-core-15.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.0/asm-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.0/asm-commons-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.0/asm-util-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.0/asm-tree-9.0.jar
+wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.0/asm-analysis-9.0.jar
+popd
+export JVM_ARGS="--modulepath $PWD/lib/modules"
+./bin/jmeter
+ </pre>
+
+</dd>
+
+</dl>
+
</li>
diff --git a/site/usermanual/component_reference.html b/site/usermanual/component_reference.html
index c5f61ee..3932555 100644
--- a/site/usermanual/component_reference.html
+++ b/site/usermanual/component_reference.html
@@ -998,7 +998,7 @@ https.default.protocol=SSLv3
</figure>
</div>
<figure>
-<a href="../images/screenshots/http-request-advanced-tab.png"><img src="../images/screenshots/http-request-advanced-tab.png" width="951" height="284" alt="HTTP Request Advanced config fields"></a>
+<a href="../images/screenshots/http-request-advanced-tab.png"><img src="../images/screenshots/http-request-advanced-tab.png" width="951" height="548" alt="HTTP Request Advanced config fields"></a>
<figcaption>HTTP Request Advanced config fields</figcaption>
</figure>
<figure>
@@ -9171,7 +9171,7 @@ By default, a Graphite implementation is provided.
</div>
<div class="screenshot">
<figure>
-<a href="../images/screenshots/csvdatasetconfig.png"><img src="../images/screenshots/csvdatasetconfig.png" width="433" height="281" alt="Screenshot for Control-Panel of CSV Data Set Config"></a>
+<a href="../images/screenshots/csvdatasetconfig.png"><img src="../images/screenshots/csvdatasetconfig.png" width="658" height="281" alt="Screenshot for Control-Panel of CSV Data Set Config"></a>
<figcaption>Screenshot of Control-Panel of CSV Data Set Config</figcaption>
</figure>
</div>
@@ -16613,7 +16613,7 @@ JMeter does not interrupt samplers which are waiting for a response, so the end
</div>
<div class="screenshot">
<figure>
-<a href="../images/screenshots/threadgroup.png"><img src="../images/screenshots/threadgroup.png" width="911" height="390" alt="Screenshot for Control-Panel of Thread Group"></a>
+<a href="../images/screenshots/threadgroup.png"><img src="../images/screenshots/threadgroup.png" width="911" height="662" alt="Screenshot for Control-Panel of Thread Group"></a>
<figcaption>Screenshot of Control-Panel of Thread Group</figcaption>
</figure>
</div>
diff --git a/site/usermanual/curl.html b/site/usermanual/curl.html
index 9933507..94563c8 100644
--- a/site/usermanual/curl.html
+++ b/site/usermanual/curl.html
@@ -220,12 +220,12 @@ Create a Test Plan From a cURL Command
<li>There are two ways to enter the curl command line. Firstly, we can enter it manually. Secondly, we can import a file containing the curl command line.
This tool supports input of multiple curl command lines at the same time.
<figure>
-<a href="../images/screenshots/curl/enter_command.png"><img src="../images/screenshots/curl/enter_command.png" width="767" height="316" alt="Figure 2.1 - Enter curl command in text panel"></a>
+<a href="../images/screenshots/curl/enter_command.png"><img src="../images/screenshots/curl/enter_command.png" width="767" height="443" alt="Figure 2.1 - Enter curl command in text panel"></a>
<figcaption>Figure 2.1 - Enter curl command in text panel</figcaption>
</figure>
<figure>
-<a href="../images/screenshots/curl/enter_command_from_file.png"><img src="../images/screenshots/curl/enter_command_from_file.png" width="767" height="316" alt="Figure 2.2 - Enter curl command from file"></a>
+<a href="../images/screenshots/curl/enter_command_from_file.png"><img src="../images/screenshots/curl/enter_command_from_file.png" width="767" height="449" alt="Figure 2.2 - Enter curl command from file"></a>
<figcaption>Figure 2.2 - Enter curl command from file</figcaption>
</figure>
@@ -233,7 +233,7 @@ Create a Test Plan From a cURL Command
<li>Then, click <span class="code">Create Test Plan</span> button and a new HTTP Sample will be added to the Test Plan.
<figure>
-<a href="../images/screenshots/curl/result.png"><img src="../images/screenshots/curl/result.png" width="767" height="316" alt="Figure 3 - result of Test Plan"></a>
+<a href="../images/screenshots/curl/result.png"><img src="../images/screenshots/curl/result.png" width="767" height="464" alt="Figure 3 - result of Test Plan"></a>
<figcaption>Figure 3 - result of Test Plan</figcaption>
</figure>
@@ -536,7 +536,7 @@ When the command you entered is ignored or contains warning content, we will dis
</p>
<figure>
-<a href="../images/screenshots/curl/http_request_warning.png"><img src="../images/screenshots/curl/http_request_warning.png" width="768" height="339" alt="Figure 1 -Warning"></a>
+<a href="../images/screenshots/curl/http_request_warning.png"><img src="../images/screenshots/curl/http_request_warning.png" width="768" height="464" alt="Figure 1 -Warning"></a>
<figcaption>Figure 1 -Warning</figcaption>
</figure>
diff --git a/site/usermanual/get-started.html b/site/usermanual/get-started.html
index 9c78bc3..231f8b6 100644
--- a/site/usermanual/get-started.html
+++ b/site/usermanual/get-started.html
@@ -637,7 +637,7 @@ There are a few environment variables, that can be used to customize the JVM set
rem This is the content of bin\setenv.bat,
rem it will be called by bin\jmeter.bat
-set JVM_ARGS="-Xms1024m -Xmx1024m -Dpropname=value"
+set JVM_ARGS=-Xms1024m -Xmx1024m -Dpropname=value
</pre>
@@ -1026,7 +1026,17 @@ If the proxy host and port are provided, then JMeter sets the following System p
</li>
</ul>
+
+<p>
+The user and password used for a proxy can be given by the System properties <span class="code">http.proxyUser</span>
+and <span class="code">http.proxyUser</span>. They will get overridden by the above arguments or values set in the
+HTTP Samplers.
+</p>
+
+<p>
If a nonproxy host list is provided, then JMeter sets the following System properties:
+</p>
+
<ul>
<li>
diff --git a/site/usermanual/properties_reference.html b/site/usermanual/properties_reference.html
index 5a8116d..13c25a5 100644
--- a/site/usermanual/properties_reference.html
+++ b/site/usermanual/properties_reference.html
@@ -1492,6 +1492,26 @@ JMETER-SERVER</pre>
</div>
</div>
+<div class="property">
+<div class="name req-true">http.proxyUser</div>
+<div class="description req-true">
+ Set the user name to use with a proxy.
+</div>
+<div class="required req-true">
+ No
+ </div>
+</div>
+
+<div class="property">
+<div class="name req-true">http.proxyPass</div>
+<div class="description req-true">
+ Set the password to use with a proxy.
+</div>
+<div class="required req-true">
+ No
+ </div>
+</div>
+
</div>
</div>
@@ -5307,7 +5327,7 @@ JMETER-SERVER</pre>
<div class="name req-true">generate_report_ui.generation_timeout</div>
<div class="description req-true">
Timeout in milliseconds for Report generation when using Tools > Generate HTML report.<br>
- Defaults to: 120000
+ Defaults to: 300000
</div>
<div class="required req-true">
No