You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/06 22:11:14 UTC
svn commit: r1781963 - in
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http: gui/
modifier/ parser/ proxy/ proxy/gui/ visualizers/
Author: pmouawad
Date: Mon Feb 6 22:11:13 2017
New Revision: 1781963
URL: http://svn.apache.org/viewvc?rev=1781963&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - Replace logkit loggers with slf4j ones with keeping the current logkit binding solution
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java Mon Feb 6 22:11:13 2017
@@ -52,8 +52,8 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* Handles input for determining if authentication services are required for a
@@ -61,9 +61,9 @@ import org.apache.log.Logger;
* user selects.
*/
public class AuthPanel extends AbstractConfigGui implements ActionListener {
- private static final long serialVersionUID = -378312656300713636L;
+ private static final long serialVersionUID = -378312656300713635L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(AuthPanel.class);
private static final String ADD_COMMAND = "Add"; //$NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java Mon Feb 6 22:11:13 2017
@@ -55,8 +55,8 @@ import org.apache.jmeter.util.JMeterUtil
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledChoice;
import org.apache.jorphan.gui.layout.VerticalLayout;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* This is the GUI for Cookie Manager
@@ -67,9 +67,9 @@ import org.apache.log.Logger;
*/
public class CookiePanel extends AbstractConfigGui implements ActionListener {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(CookiePanel.class);
//++ Action command names
private static final String ADD_COMMAND = "Add"; //$NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java Mon Feb 6 22:11:13 2017
@@ -44,8 +44,8 @@ import org.apache.jmeter.protocol.http.c
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.GuiUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* Allows the user to specify if she needs HTTP header services, and give
@@ -54,9 +54,9 @@ import org.apache.log.Logger;
*/
public class HeaderPanel extends AbstractConfigGui implements ActionListener
{
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(HeaderPanel.class);
private static final String ADD_COMMAND = "Add"; // $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java Mon Feb 6 22:11:13 2017
@@ -40,8 +40,8 @@ import org.apache.jmeter.testelement.Abs
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.threads.JMeterContext;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -50,7 +50,7 @@ import org.w3c.dom.NodeList;
// For Unit tests, @see TestAnchorModifier
public class AnchorModifier extends AbstractTestElement implements PreProcessor, Serializable {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(AnchorModifier.class);
private static final long serialVersionUID = 240L;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java Mon Feb 6 22:11:13 2017
@@ -29,8 +29,8 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* This component allows you to specify reference name of a regular expression that extracts names and values of HTTP request parameters.
@@ -45,9 +45,9 @@ public class RegExUserParameters extends
/**
*
*/
- private static final long serialVersionUID = 5486502839185386122L;
+ private static final long serialVersionUID = 5486502839185386121L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RegExUserParameters.class);
public static final String REG_EX_REF_NAME = "RegExUserParameters.regex_ref_name";// $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java Mon Feb 6 22:11:13 2017
@@ -21,8 +21,8 @@ package org.apache.jmeter.protocol.http.
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* BaseParser is the base class for {@link LinkExtractorParser}
@@ -30,7 +30,7 @@ import org.apache.log.Logger;
* @since 3.0
*/
public abstract class BaseParser implements LinkExtractorParser {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger LOG = LoggerFactory.getLogger(BaseParser.class);
// Cache of parsers - parsers must be re-usable
private static final ConcurrentMap<String, LinkExtractorParser> PARSERS = new ConcurrentHashMap<>(5);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CSSParseExceptionCallback.java Mon Feb 6 22:11:13 2017
@@ -22,8 +22,8 @@ import java.net.URL;
import org.apache.commons.lang3.Validate;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import com.helger.css.handler.ICSSParseExceptionCallback;
import com.helger.css.parser.ParseException;
@@ -32,7 +32,7 @@ import com.helger.css.reader.errorhandle
public class CSSParseExceptionCallback implements ICSSParseExceptionCallback {
private static final long serialVersionUID = -4277276398858139449L;
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger LOG = LoggerFactory.getLogger(CSSParseExceptionCallback.class);
private static final boolean IGNORE_UNRECOVERABLE_PARSING_ERROR = JMeterUtils
.getPropDefault(
"httpsampler.ignore_failed_embedded_resource", false); //$NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParser.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParser.java Mon Feb 6 22:11:13 2017
@@ -28,8 +28,8 @@ import org.apache.commons.lang3.Validate
import org.apache.commons.lang3.tuple.ImmutableTriple;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
@@ -41,7 +41,7 @@ import com.github.benmanes.caffeine.cach
*/
public class CssParser implements LinkExtractorParser {
private static final URLCollection EMPTY_URL_COLLECTION = new URLCollection(Collections.emptyList());
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger LOG = LoggerFactory.getLogger(CssParser.class);
/**
*
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java Mon Feb 6 22:11:13 2017
@@ -25,8 +25,8 @@ import java.util.ArrayList;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import com.github.benmanes.caffeine.cache.CacheLoader;
import com.helger.css.ECSSVersion;
@@ -45,7 +45,7 @@ import com.helger.css.reader.errorhandle
public class CssParserCacheLoader implements
CacheLoader<Triple<String, URL, Charset>, URLCollection> {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger LOG = LoggerFactory.getLogger(CssParserCacheLoader.class);
private static final boolean IGNORE_ALL_CSS_ERRORS = JMeterUtils
.getPropDefault("css.parser.ignore_all_css_errors", true);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java Mon Feb 6 22:11:13 2017
@@ -27,8 +27,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* {@link HTMLParser} subclasses can parse HTML content to obtain URLs.
@@ -36,7 +36,7 @@ import org.apache.log.Logger;
*/
public abstract class HTMLParser extends BaseParser {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(HTMLParser.class);
protected static final String ATT_BACKGROUND = "background";// $NON-NLS-1$
protected static final String ATT_CODE = "code";// $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java Mon Feb 6 22:11:13 2017
@@ -34,8 +34,8 @@ import org.apache.jmeter.protocol.http.s
import org.apache.jmeter.protocol.http.util.ConversionUtils;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.apache.oro.text.PatternCacheLRU;
import org.apache.oro.text.regex.MatchResult;
import org.apache.oro.text.regex.Pattern;
@@ -51,7 +51,7 @@ import org.w3c.tidy.Tidy;
// For Junit tests @see TestHtmlParsingUtils
public final class HtmlParsingUtils {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(HtmlParsingUtils.class);
/**
* Private constructor to prevent instantiation.
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java Mon Feb 6 22:11:13 2017
@@ -26,8 +26,8 @@ import java.util.Iterator;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.protocol.http.util.ConversionUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -40,7 +40,7 @@ import org.xml.sax.SAXException;
*
*/
class JTidyHTMLParser extends HTMLParser {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JTidyHTMLParser.class);
protected JTidyHTMLParser() {
super();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java Mon Feb 6 22:11:13 2017
@@ -24,8 +24,6 @@ import java.util.Iterator;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.protocol.http.util.ConversionUtils;
-//import org.apache.jorphan.logging.LoggingManager;
-//import org.apache.log.Logger;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -39,7 +37,6 @@ import org.jsoup.select.NodeVisitor;
* TODO Factor out common code between {@link LagartoBasedHtmlParser} and this one (adapter pattern)
*/
public class JsoupBasedHtmlParser extends HTMLParser {
-// private static final Logger log = LoggingManager.getLoggerForClass();
/*
* A dummy class to pass the pointer of URL.
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java Mon Feb 6 22:11:13 2017
@@ -24,6 +24,10 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.Stack;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jmeter.protocol.http.util.ConversionUtils;
+import org.slf4j.Logger;
+
import jodd.lagarto.EmptyTagVisitor;
import jodd.lagarto.LagartoException;
import jodd.lagarto.LagartoParser;
@@ -35,17 +39,12 @@ import jodd.lagarto.dom.HtmlCCommentExpr
import jodd.log.LoggerFactory;
import jodd.log.impl.Slf4jLoggerFactory;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.protocol.http.util.ConversionUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
-
/**
* Parser based on Lagarto
* @since 2.10
*/
public class LagartoBasedHtmlParser extends HTMLParser {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = org.slf4j.LoggerFactory.getLogger(LagartoBasedHtmlParser.class);
static {
LoggerFactory.setLoggerFactory(new Slf4jLoggerFactory());
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java Mon Feb 6 22:11:13 2017
@@ -25,18 +25,14 @@ import java.util.Iterator;
import org.apache.jmeter.protocol.http.util.ConversionUtils;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
-//NOTE: Also looked at using Java 1.4 regexp instead of ORO. The change was
-//trivial. Performance did not improve -- at least not significantly.
-//Finally decided for ORO following advise from Stefan Bodewig (message
-//to jmeter-dev dated 25 Nov 2003 8:52 CET) [Jordi]
import org.apache.oro.text.MalformedCachePatternException;
import org.apache.oro.text.regex.MatchResult;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.PatternMatcherInput;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* HtmlParser implementation using regular expressions.
@@ -75,7 +71,7 @@ import org.apache.oro.text.regex.Perl5Ma
*
*/
class RegexpHTMLParser extends HTMLParser {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RegexpHTMLParser.class);
/**
* Regexp fragment matching a tag attribute's value (including the equals
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java Mon Feb 6 22:11:13 2017
@@ -26,8 +26,8 @@ import java.util.Iterator;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.Validate;
import org.apache.jmeter.protocol.http.util.ConversionUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* Collection class designed for handling URLs
@@ -40,7 +40,7 @@ import org.apache.log.Logger;
*
*/
public class URLCollection implements Iterable<URL> {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(URLCollection.class);
private final Collection<URLString> coll;
/**
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java Mon Feb 6 22:11:13 2017
@@ -28,9 +28,9 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.jmeter.gui.Stoppable;
-import org.apache.jorphan.logging.LoggingManager;
+import org.slf4j.LoggerFactory;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
/**
* Web daemon thread. Creates main socket on port 8080 and listens on it
@@ -40,7 +40,7 @@ import org.apache.log.Logger;
*/
public class Daemon extends Thread implements Stoppable {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Daemon.class);
/**
* The time (in milliseconds) to wait when accepting a client connection.
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java Mon Feb 6 22:11:13 2017
@@ -41,8 +41,8 @@ import org.apache.jmeter.protocol.http.u
import org.apache.jmeter.protocol.http.util.HTTPConstants;
import org.apache.jmeter.protocol.http.util.HTTPFileArg;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -53,7 +53,7 @@ import org.xml.sax.helpers.DefaultHandle
* Default implementation that handles classical HTTP textual + Multipart requests
*/
public class DefaultSamplerCreator extends AbstractSamplerCreator {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(DefaultSamplerCreator.class);
/**
*
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java Mon Feb 6 22:11:13 2017
@@ -22,9 +22,9 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.protocol.http.parser.HTMLParseException;
-import org.apache.jorphan.logging.LoggingManager;
+import org.slf4j.LoggerFactory;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -35,7 +35,7 @@ import org.jsoup.select.Elements;
*/
// made public see Bug 49976
public class FormCharSetFinder {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(FormCharSetFinder.class);
public FormCharSetFinder() {
super();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java Mon Feb 6 22:11:13 2017
@@ -39,8 +39,8 @@ import org.apache.jmeter.protocol.http.u
import org.apache.jmeter.protocol.http.util.HTTPConstants;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
//For unit tests, @see TestHttpRequestHdr
@@ -49,7 +49,7 @@ import org.apache.log.Logger;
*
*/
public class HttpRequestHdr {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(HttpRequestHdr.class);
private static final String HTTP = "http"; // $NON-NLS-1$
private static final String HTTPS = "https"; // $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Mon Feb 6 22:11:13 2017
@@ -51,10 +51,10 @@ import org.apache.jmeter.protocol.http.u
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
+import org.slf4j.LoggerFactory;
import org.apache.jorphan.util.JMeterException;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
/**
* Thread to handle one client request. Gets the request from the client and
@@ -64,7 +64,7 @@ import org.apache.log.Logger;
*
*/
public class Proxy extends Thread {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Proxy.class);
private static final byte[] CRLF_BYTES = { 0x0d, 0x0a };
private static final String CRLF_STRING = "\r\n";
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Mon Feb 6 22:11:13 2017
@@ -95,9 +95,9 @@ import org.apache.jmeter.timers.Timer;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.Visualizer;
import org.apache.jorphan.exec.KeyToolUtils;
-import org.apache.jorphan.logging.LoggingManager;
+import org.slf4j.LoggerFactory;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
import org.apache.oro.text.MalformedCachePatternException;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.Perl5Compiler;
@@ -109,7 +109,7 @@ import org.apache.oro.text.regex.Perl5Co
*/
public class ProxyControl extends GenericController {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ProxyControl.class);
private static final long serialVersionUID = 240L;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java Mon Feb 6 22:11:13 2017
@@ -25,15 +25,15 @@ import java.util.List;
import java.util.Map;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
+import org.slf4j.LoggerFactory;
import org.apache.jorphan.reflect.ClassFinder;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
/**
* {@link SamplerCreator} factory
*/
public class SamplerCreatorFactory {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SamplerCreatorFactory.class);
private static final SamplerCreator DEFAULT_SAMPLER_CREATOR = new DefaultSamplerCreator();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Mon Feb 6 22:11:13 2017
@@ -77,12 +77,12 @@ import org.apache.jmeter.util.JMeterUtil
import org.apache.jorphan.exec.KeyToolUtils;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledTextField;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
public class ProxyControlGui extends LogicControllerGui implements JMeterGUIComponent, ActionListener, ItemListener,
KeyListener, UnsharedComponent {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ProxyControlGui.class);
private static final long serialVersionUID = 232L;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java?rev=1781963&r1=1781962&r2=1781963&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java Mon Feb 6 22:11:13 2017
@@ -54,9 +54,9 @@ import org.apache.jmeter.visualizers.Sea
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.ObjectTableModel;
import org.apache.jorphan.gui.RendererUtils;
-import org.apache.jorphan.logging.LoggingManager;
+import org.slf4j.LoggerFactory;
import org.apache.jorphan.reflect.Functor;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
/**
* Specializer panel to view a HTTP request parsed
@@ -64,7 +64,7 @@ import org.apache.log.Logger;
*/
public class RequestViewHTTP implements RequestView {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RequestViewHTTP.class);
private static final String KEY_LABEL = "view_results_table_request_tab_http"; //$NON-NLS-1$