You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/11 03:29:40 UTC
git commit: Remove extraneous custom levels.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 2aabced4b -> aeafab134
Remove extraneous custom levels.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/aeafab13
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/aeafab13
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/aeafab13
Branch: refs/heads/master
Commit: aeafab134a7f03d4d7017233d9e3383f37126693
Parents: 2aabced
Author: Matt Sicker <ma...@apache.org>
Authored: Wed Sep 10 20:29:33 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Wed Sep 10 20:29:33 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/jul/ApiLogger.java | 4 ++--
.../org/apache/logging/log4j/jul/DefaultLevelConverter.java | 8 +++-----
.../java/org/apache/logging/log4j/jul/LevelTranslator.java | 2 --
.../org/apache/logging/log4j/jul/LevelTranslatorTest.java | 4 ++--
4 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aeafab13/log4j-jul/src/main/java/org/apache/logging/log4j/jul/ApiLogger.java
----------------------------------------------------------------------
diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/ApiLogger.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/ApiLogger.java
index e213076..adac9be 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/ApiLogger.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/ApiLogger.java
@@ -220,12 +220,12 @@ public class ApiLogger extends Logger {
@Override
public void fine(final String msg) {
- logger.logIfEnabled(FQCN, LevelTranslator.FINE, null, msg);
+ logger.logIfEnabled(FQCN, org.apache.logging.log4j.Level.DEBUG, null, msg);
}
@Override
public void finer(final String msg) {
- logger.logIfEnabled(FQCN, LevelTranslator.FINER, null, msg);
+ logger.logIfEnabled(FQCN, org.apache.logging.log4j.Level.TRACE, null, msg);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aeafab13/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
----------------------------------------------------------------------
diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
index 71194ac..0444fdb 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
@@ -35,18 +35,16 @@ public class DefaultLevelConverter implements LevelConverter {
public DefaultLevelConverter() {
JDK_TO_LOG4J.put(java.util.logging.Level.OFF, Level.OFF);
JDK_TO_LOG4J.put(java.util.logging.Level.FINEST, LevelTranslator.FINEST);
- JDK_TO_LOG4J.put(java.util.logging.Level.FINER, LevelTranslator.FINER);
- JDK_TO_LOG4J.put(java.util.logging.Level.FINE, LevelTranslator.FINE);
+ JDK_TO_LOG4J.put(java.util.logging.Level.FINER, Level.TRACE);
+ JDK_TO_LOG4J.put(java.util.logging.Level.FINE, Level.DEBUG);
JDK_TO_LOG4J.put(java.util.logging.Level.CONFIG, LevelTranslator.CONFIG);
JDK_TO_LOG4J.put(java.util.logging.Level.INFO, Level.INFO);
JDK_TO_LOG4J.put(java.util.logging.Level.WARNING, Level.WARN);
JDK_TO_LOG4J.put(java.util.logging.Level.SEVERE, Level.ERROR);
JDK_TO_LOG4J.put(java.util.logging.Level.ALL, Level.ALL);
LOG4J_TO_JDK.put(Level.OFF, java.util.logging.Level.OFF);
- LOG4J_TO_JDK.put(Level.TRACE, java.util.logging.Level.FINEST);
LOG4J_TO_JDK.put(LevelTranslator.FINEST, java.util.logging.Level.FINEST);
- LOG4J_TO_JDK.put(LevelTranslator.FINER, java.util.logging.Level.FINER);
- LOG4J_TO_JDK.put(LevelTranslator.FINE, java.util.logging.Level.FINE);
+ LOG4J_TO_JDK.put(Level.TRACE, java.util.logging.Level.FINER);
LOG4J_TO_JDK.put(Level.DEBUG, java.util.logging.Level.FINE);
LOG4J_TO_JDK.put(LevelTranslator.CONFIG, java.util.logging.Level.CONFIG);
LOG4J_TO_JDK.put(Level.INFO, java.util.logging.Level.INFO);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aeafab13/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LevelTranslator.java
----------------------------------------------------------------------
diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LevelTranslator.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LevelTranslator.java
index 8df429a..d8a147f 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LevelTranslator.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LevelTranslator.java
@@ -33,8 +33,6 @@ public final class LevelTranslator {
public static final String LEVEL_CONVERTER_PROPERTY = "log4j.jul.levelConverter";
public static final Level FINEST = Level.forName("FINEST", Level.TRACE.intLevel() + 100);
- public static final Level FINER = Level.forName("FINER", Level.TRACE.intLevel());
- public static final Level FINE = Level.forName("FINE", Level.DEBUG.intLevel());
public static final Level CONFIG = Level.forName("CONFIG", Level.INFO.intLevel() + 50);
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aeafab13/log4j-jul/src/test/java/org/apache/logging/log4j/jul/LevelTranslatorTest.java
----------------------------------------------------------------------
diff --git a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/LevelTranslatorTest.java b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/LevelTranslatorTest.java
index 3ab5e92..7ef8714 100644
--- a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/LevelTranslatorTest.java
+++ b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/LevelTranslatorTest.java
@@ -48,8 +48,8 @@ public class LevelTranslatorTest {
{java.util.logging.Level.WARNING, Level.WARN},
{java.util.logging.Level.INFO, Level.INFO},
{java.util.logging.Level.CONFIG, LevelTranslator.CONFIG},
- {java.util.logging.Level.FINE, LevelTranslator.FINE},
- {java.util.logging.Level.FINER, LevelTranslator.FINER},
+ {java.util.logging.Level.FINE, Level.DEBUG},
+ {java.util.logging.Level.FINER, Level.TRACE},
{java.util.logging.Level.FINEST, LevelTranslator.FINEST}
}
);