Author: pmouawad
Date: Mon Mar 28 17:04:08 2016
New Revision: 1736907
URL: http://svn.apache.org/viewvc?rev=1736907&view=rev
Log:
Bug 59240 - Introduce a slf4j adapter for Logkit
Rename classes
Bugzilla Id: 59240
Added:
jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerAdapter.java
(contents, props changed)
- copied, changed from r1736749,
jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerAdapter.java
jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerFactory.java
(contents, props changed)
- copied, changed from r1736749,
jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerFactory.java
Removed:
jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerAdapter.java
jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerFactory.java
Modified:
jmeter/trunk/src/core/org/slf4j/impl/StaticLoggerBinder.java
Copied:
jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerAdapter.java (from
r1736749,
jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerAdapter.java)
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerAdapter.java?p2=jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerAdapter.java&p1=jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerAdapter.java&r1=1736749&r2=1736907&rev=1736907&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerAdapter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerAdapter.java
Mon Mar 28 17:04:08 2016
@@ -27,10 +27,10 @@ import org.slf4j.helpers.MarkerIgnoringB
import org.slf4j.helpers.MessageFormatter;
/**
- * Logback adapter for slf4j
+ * Logkit adapter for slf4j
* @since 3.0
*/
-public class LogbackLoggerAdapter extends MarkerIgnoringBase implements
Serializable {
+public class LogkitLoggerAdapter extends MarkerIgnoringBase implements
Serializable {
final transient Logger logger;
/**
@@ -38,8 +38,8 @@ public class LogbackLoggerAdapter extend
*/
private static final long serialVersionUID = -122848886791823355L;
- LogbackLoggerAdapter(org.apache.log.Logger logbackLogger) {
- this.logger = logbackLogger;
+ LogkitLoggerAdapter(org.apache.log.Logger logkitLogger) {
+ this.logger = logkitLogger;
}
/* (non-Javadoc)
Propchange:
jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerAdapter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerFactory.java (from
r1736749,
jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerFactory.java)
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerFactory.java?p2=jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerFactory.java&p1=jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerFactory.java&r1=1736749&r2=1736907&rev=1736907&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/logging/LogbackLoggerFactory.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerFactory.java
Mon Mar 28 17:04:08 2016
@@ -27,17 +27,17 @@ import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
/**
- * Implementation of {@link ILoggerFactory} for Logback
+ * Implementation of {@link ILoggerFactory} for Logkit
* @since 3.0
*/
-public class LogbackLoggerFactory implements ILoggerFactory {
+public class LogkitLoggerFactory implements ILoggerFactory {
// key: name (String), value: a Log4jLoggerAdapter;
Map<String, Logger> loggerMap;
/**
*
*/
- public LogbackLoggerFactory() {
+ public LogkitLoggerFactory() {
loggerMap = new HashMap<String, Logger>();
}
@@ -52,17 +52,16 @@ public class LogbackLoggerFactory implem
synchronized (this) {
slf4jLogger = loggerMap.get(name);
if (slf4jLogger == null) {
- org.apache.log.Logger logbackLogger;
+ org.apache.log.Logger logkitLogger;
if (name.equalsIgnoreCase(Logger.ROOT_LOGGER_NAME)) {
- logbackLogger =
Hierarchy.getDefaultHierarchy().getRootLogger();
+ logkitLogger =
Hierarchy.getDefaultHierarchy().getRootLogger();
} else {
- logbackLogger = LoggingManager.getLoggerFor(name);
+ logkitLogger = LoggingManager.getLoggerFor(name);
}
- slf4jLogger = new LogbackLoggerAdapter(logbackLogger);
+ slf4jLogger = new LogkitLoggerAdapter(logkitLogger);
loggerMap.put(name, slf4jLogger);
}
}
return slf4jLogger;
}
-
}
Propchange:
jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jmeter/trunk/src/core/org/apache/jmeter/logging/LogkitLoggerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/src/core/org/slf4j/impl/StaticLoggerBinder.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/slf4j/impl/StaticLoggerBinder.java?rev=1736907&r1=1736906&r2=1736907&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/slf4j/impl/StaticLoggerBinder.java (original)
+++ jmeter/trunk/src/core/org/slf4j/impl/StaticLoggerBinder.java Mon Mar 28
17:04:08 2016
@@ -18,7 +18,7 @@
package org.slf4j.impl;
-import org.apache.jmeter.logging.LogbackLoggerFactory;
+import org.apache.jmeter.logging.LogkitLoggerFactory;
import org.slf4j.ILoggerFactory;
import org.slf4j.LoggerFactory;
import org.slf4j.spi.LoggerFactoryBinder;
@@ -53,7 +53,7 @@ public class StaticLoggerBinder implemen
// to avoid constant folding by the compiler, this field must *not* be
final
public static String REQUESTED_API_VERSION = "1.7"; // !final
- private static final String loggerFactoryClassStr =
LogbackLoggerFactory.class
+ private static final String loggerFactoryClassStr =
LogkitLoggerFactory.class
.getName();
/**
@@ -63,7 +63,7 @@ public class StaticLoggerBinder implemen
private final ILoggerFactory loggerFactory;
private StaticLoggerBinder() {
- loggerFactory = new LogbackLoggerFactory();
+ loggerFactory = new LogkitLoggerFactory();
}
@Override
