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 21:19:13 UTC
svn commit: r1781956 - in
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util:
HTTPArgument.java accesslog/LogFilter.java accesslog/SessionFilter.java
accesslog/StandardGenerator.java accesslog/TCLogParser.java
Author: pmouawad
Date: Mon Feb 6 21:19:13 2017
New Revision: 1781956
URL: http://svn.apache.org/viewvc?rev=1781956&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/util/HTTPArgument.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java?rev=1781956&r1=1781955&r2=1781956&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java Mon Feb 6 21:19:13 2017
@@ -28,8 +28,8 @@ import org.apache.jmeter.config.Argument
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
//For unit tests, @see TestHTTPArgument
@@ -38,9 +38,9 @@ import org.apache.log.Logger;
* Represents an Argument for HTTP requests.
*/
public class HTTPArgument extends Argument implements Serializable {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(HTTPArgument.class);
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
private static final String ALWAYS_ENCODE = "HTTPArgument.always_encode";
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java?rev=1781956&r1=1781955&r2=1781956&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java Mon Feb 6 21:19:13 2017
@@ -23,8 +23,8 @@ import java.util.ArrayList;
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;
import org.apache.oro.text.MalformedCachePatternException;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.Perl5Compiler;
@@ -71,9 +71,9 @@ import org.apache.oro.text.regex.Perl5Co
public class LogFilter implements Filter, Serializable {
- 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(LogFilter.class);
// protected members used by class to filter
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java?rev=1781956&r1=1781955&r2=1781956&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java Mon Feb 6 21:19:13 2017
@@ -30,8 +30,8 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.ThreadListener;
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.regex.Pattern;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
@@ -41,8 +41,8 @@ import org.apache.oro.text.regex.Perl5Ma
*
*/
public class SessionFilter implements Filter, Serializable, TestCloneable,ThreadListener {
- private static final long serialVersionUID = 232L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final long serialVersionUID = 233L;
+ private static final Logger log = LoggerFactory.getLogger(SessionFilter.class);
/**
* Protects access to managersInUse
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java?rev=1781956&r1=1781955&r2=1781956&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java Mon Feb 6 21:19:13 2017
@@ -27,9 +27,9 @@ import java.io.Serializable;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
-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;
/**
* Description:<br>
@@ -54,9 +54,9 @@ import org.apache.log.Logger;
public class StandardGenerator implements Generator, Serializable {
- private static final long serialVersionUID = 233L;
+ private static final long serialVersionUID = 234L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(StandardGenerator.class);
protected HTTPSamplerBase SAMPLE = null;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java?rev=1781956&r1=1781955&r2=1781956&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java Mon Feb 6 21:19:13 2017
@@ -34,8 +34,8 @@ import java.util.zip.GZIPInputStream;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
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;
// For JUnit tests, @see TestTCLogParser
@@ -75,7 +75,7 @@ import org.apache.log.Logger;
*/
public class TCLogParser implements LogParser {
- protected static final Logger log = LoggingManager.getLoggerForClass();
+ protected static final Logger log = LoggerFactory.getLogger(TCLogParser.class);
/*
* TODO should these fields be public?