ceki 2005/04/28 09:33:17
Modified: src/java/org/apache/log4j/joran/spi Interpreter.java
JoranDocument.java
src/java/org/apache/log4j/rolling/helper
RollingCalendar.java
src/java/org/apache/log4j PropertyConfigurator.java
LogManager.java Logger.java Category.java
src/java/org/apache/log4j/spi ComponentBase.java
Log:
SLF4J migration continued
Revision Changes Path
1.5 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/spi/Interpreter.java
Index: Interpreter.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/spi/Interpreter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Interpreter.java 13 Jan 2005 16:25:59 -0000 1.4
+++ Interpreter.java 28 Apr 2005 16:33:16 -0000 1.5
@@ -22,7 +22,7 @@
import org.apache.log4j.spi.Component;
import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerRepository;
-import org.apache.ugli.ULogger;
+import org.slf4j.ULogger;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/spi/JoranDocument.java
Index: JoranDocument.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/spi/JoranDocument.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JoranDocument.java 12 Jan 2005 15:08:26 -0000 1.1
+++ JoranDocument.java 28 Apr 2005 16:33:16 -0000 1.2
@@ -21,7 +21,7 @@
import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerRepository;
-import org.apache.ugli.ULogger;
+import org.slf4j.ULogger;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
1.4 +1 -1
logging-log4j/src/java/org/apache/log4j/rolling/helper/RollingCalendar.java
Index: RollingCalendar.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/rolling/helper/RollingCalendar.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RollingCalendar.java 6 Jan 2005 19:27:03 -0000 1.3
+++ RollingCalendar.java 28 Apr 2005 16:33:16 -0000 1.4
@@ -16,7 +16,7 @@
package org.apache.log4j.rolling.helper;
-import org.apache.ugli.ULogger;
+import org.slf4j.ULogger;
import java.text.SimpleDateFormat;
1.81 +0 -1
logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- PropertyConfigurator.java 8 Jan 2005 14:05:28 -0000 1.80
+++ PropertyConfigurator.java 28 Apr 2005 16:33:16 -0000 1.81
@@ -371,7 +371,6 @@
repository.setPristine(false);
-
String thresholdStr =
OptionConverter.findAndSubst(THRESHOLD_PREFIX, properties);
1.42 +1 -1 logging-log4j/src/java/org/apache/log4j/LogManager.java
Index: LogManager.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/LogManager.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- LogManager.java 18 Feb 2005 17:23:44 -0000 1.41
+++ LogManager.java 28 Apr 2005 16:33:17 -0000 1.42
@@ -26,7 +26,7 @@
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.RepositorySelector;
import org.apache.log4j.spi.RootLogger;
-import org.apache.ugli.impl.SimpleLoggerFA;
+import org.slf4j.impl.SimpleLoggerFA;
import java.util.Enumeration;
1.30 +1 -1 logging-log4j/src/java/org/apache/log4j/Logger.java
Index: Logger.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Logger.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Logger.java 4 Jan 2005 15:09:54 -0000 1.29
+++ Logger.java 28 Apr 2005 16:33:17 -0000 1.30
@@ -17,7 +17,7 @@
package org.apache.log4j;
import org.apache.log4j.spi.LoggerFactory;
-import org.apache.ugli.impl.MessageFormatter;
+import org.slf4j.impl.MessageFormatter;
/**
1.96 +2 -2 logging-log4j/src/java/org/apache/log4j/Category.java
Index: Category.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Category.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- Category.java 3 Jan 2005 11:05:45 -0000 1.95
+++ Category.java 28 Apr 2005 16:33:17 -0000 1.96
@@ -37,8 +37,8 @@
import org.apache.log4j.spi.AppenderAttachable;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.ugli.ULogger;
-import org.apache.ugli.impl.MessageFormatter;
+import org.slf4j.ULogger;
+import org.slf4j.impl.MessageFormatter;
import java.util.Enumeration;
import java.util.MissingResourceException;
1.7 +2 -2
logging-log4j/src/java/org/apache/log4j/spi/ComponentBase.java
Index: ComponentBase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/spi/ComponentBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ComponentBase.java 23 Feb 2005 18:37:39 -0000 1.6
+++ ComponentBase.java 28 Apr 2005 16:33:17 -0000 1.7
@@ -7,8 +7,8 @@
package org.apache.log4j.spi;
import org.apache.log4j.LogManager;
-import org.apache.ugli.ULogger;
-import org.apache.ugli.impl.NOPLogger;
+import org.slf4j.ULogger;
+import org.slf4j.impl.NOPLogger;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
