[jboss-svn-commits] JBoss Common SVN: r2661 - in common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk: xml and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 29 11:50:56 EDT 2007
Author: david.lloyd at jboss.com
Date: 2007-10-29 11:50:56 -0400 (Mon, 29 Oct 2007)
New Revision: 2661
Added:
common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/JBossLevel.java
Modified:
common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/JDK14LoggerPlugin.java
common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/xml/DOMConfigurator.java
Log:
Use standard JBoss log levels - JBCOMMON-39
Added: common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/JBossLevel.java
===================================================================
--- common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/JBossLevel.java (rev 0)
+++ common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/JBossLevel.java 2007-10-29 15:50:56 UTC (rev 2661)
@@ -0,0 +1,23 @@
+package org.jboss.logging.jdk;
+
+import java.util.logging.Level;
+
+/**
+ *
+ */
+public final class JBossLevel extends Level {
+ protected JBossLevel(final String name, final int value) {
+ super(name, value);
+ }
+
+ protected JBossLevel(final String name, final int value, final String resourceBundleName) {
+ super(name, value, resourceBundleName);
+ }
+
+ public static final JBossLevel FATAL = new JBossLevel("FATAL", 1100);
+ public static final JBossLevel ERROR = new JBossLevel("ERROR", 1000);
+ public static final JBossLevel WARN = new JBossLevel("WARN", 900);
+ public static final JBossLevel INFO = new JBossLevel("INFO", 800);
+ public static final JBossLevel DEBUG = new JBossLevel("DEBUG", 500);
+ public static final JBossLevel TRACE = new JBossLevel("TRACE", 400);
+}
Modified: common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/JDK14LoggerPlugin.java
===================================================================
--- common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/JDK14LoggerPlugin.java 2007-10-29 15:45:37 UTC (rev 2660)
+++ common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/JDK14LoggerPlugin.java 2007-10-29 15:50:56 UTC (rev 2661)
@@ -24,6 +24,7 @@
import java.util.logging.Logger;
import java.util.logging.Level;
+import java.util.logging.LogRecord;
import org.jboss.logging.LoggerPlugin;
import org.jboss.logging.MDCProvider;
@@ -39,85 +40,95 @@
public class JDK14LoggerPlugin implements LoggerPlugin, MDCSupport, NDCSupport
{
private Logger log;
+ private String name;
public void init(String name)
{
+ this.name = name;
log = Logger.getLogger(name);
}
+ private void doLog(Level level, Object message, Throwable t) {
+ LogRecord record = new LogRecord(level, message.toString());
+ record.setLoggerName(name);
+ record.setThrown(t);
+ record.setSourceMethodName(null); // prevent expensive, yet pointless, lookup
+ log.log(record);
+ }
+
public boolean isTraceEnabled()
{
- return log.isLoggable(Level.FINER);
+ return log.isLoggable(JBossLevel.TRACE);
}
public void trace(Object message)
{
- log.finer(message.toString());
+ doLog(JBossLevel.TRACE, message, null);
}
public void trace(Object message, Throwable t)
{
- log.log(Level.FINER, message.toString(), t);
+ doLog(JBossLevel.TRACE, message, t);
}
public boolean isDebugEnabled()
{
- return log.isLoggable(Level.FINE);
+ return log.isLoggable(JBossLevel.DEBUG);
}
public void debug(Object message)
{
- log.fine(message.toString());
+ doLog(JBossLevel.DEBUG, message, null);
}
public void debug(Object message, Throwable t)
{
- log.log(Level.FINE, message.toString(), t);
+ doLog(JBossLevel.DEBUG, message, t);
}
public boolean isInfoEnabled()
{
- return log.isLoggable(Level.INFO);
+ return log.isLoggable(JBossLevel.INFO);
}
public void info(Object message)
{
- log.info(message.toString());
+ doLog(JBossLevel.INFO, message, null);
}
public void info(Object message, Throwable t)
{
- log.log(Level.INFO, message.toString(), t);
+ doLog(JBossLevel.INFO, message, t);
}
public void warn(Object message)
{
- log.warning(message.toString());
+ doLog(JBossLevel.WARN, message, null);
}
public void warn(Object message, Throwable t)
{
- log.log(Level.WARNING, message.toString(), t);
+ doLog(JBossLevel.WARN, message, t);
}
public void error(Object message)
{
- log.severe(message.toString());
+ doLog(JBossLevel.ERROR, message, null);
}
public void error(Object message, Throwable t)
{
- log.log(Level.SEVERE, message.toString(), t);
+ doLog(JBossLevel.ERROR, message, t);
}
public void fatal(Object message)
{
- log.severe(message.toString());
+ doLog(JBossLevel.FATAL, message, null);
}
public void fatal(Object message, Throwable t)
{
- log.log(Level.SEVERE, message.toString(), t);
+ doLog(JBossLevel.FATAL, message, t);
}
public NDCProvider getNDCProvider()
Modified: common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/xml/DOMConfigurator.java
===================================================================
--- common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/xml/DOMConfigurator.java 2007-10-29 15:45:37 UTC (rev 2660)
+++ common-logging-jdk/trunk/src/main/java/org/jboss/logging/jdk/xml/DOMConfigurator.java 2007-10-29 15:50:56 UTC (rev 2661)
@@ -39,6 +39,7 @@
import org.jboss.util.StringPropertyReplacer;
import org.jboss.util.xml.JBossEntityResolver;
import org.jboss.logging.jdk.handlers.HandlerSkeleton;
+import org.jboss.logging.jdk.JBossLevel;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -577,8 +578,6 @@
}
String levelName = subst(element.getAttribute(VALUE_ATTR));
- // Check for a jdk level name
- levelName = mapLog4jLevel(levelName);
debug("Level value for " + catName + " is [" + levelName + "].");
if ("INHERITED".equalsIgnoreCase(levelName) || "NULL".equalsIgnoreCase(levelName))
@@ -938,28 +937,6 @@
}
}
- static String mapLog4jLevel(String name)
- {
- String jdkName = null;
- if( name.equals("OFF") )
- jdkName = Level.OFF.getName();
- else if( name.equals("FATAL") )
- jdkName = Level.SEVERE.getName();
- else if( name.equals("ERROR") )
- jdkName = Level.WARNING.getName();
- else if( name.equals("ERROR") )
- jdkName = Level.WARNING.getName();
- else if( name.equals("WARN") )
- jdkName = Level.WARNING.getName();
- else if( name.equals("INFO") )
- jdkName = Level.INFO.getName();
- else if( name.equals("DEBUG") )
- jdkName = Level.FINE.getName();
- else if( name.equals("TRACE") )
- jdkName = Level.FINER.getName();
- return jdkName;
- }
-
static String convertSpecialChars(String s)
{
char c;
More information about the jboss-svn-commits
mailing list