ceki 01/09/04 07:53:13
Modified: src/java/org/apache/log4j Category.java Logger.java
Priority.java
src/java/org/apache/log4j/test Makefile Shallow.java
Log:
Fixed backward compatibility problem in a simpler way.
Revision Changes Path
1.45 +15 -0 jakarta-log4j/src/java/org/apache/log4j/Category.java
Index: Category.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Category.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Category.java 2001/09/03 22:10:10 1.44
+++ Category.java 2001/09/04 14:53:12 1.45
@@ -229,4 +229,19 @@
Category getRoot() {
return (Category) defaultHierarchy.getRootLogger();
}
+
+ /**
+ Set the level of this Category.
+
+ <p>Null values are admitted.
+
+ @deprecated Please use {@link Logger#setLevel} instead.
+ */
+ public
+ void setPriority(Level level) {
+ setLevel(level);
+ }
+
+
+
}
1.3 +0 -13 jakarta-log4j/src/java/org/apache/log4j/Logger.java
Index: Logger.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Logger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Logger.java 2001/09/03 22:10:10 1.2
+++ Logger.java 2001/09/04 14:53:12 1.3
@@ -1002,19 +1002,6 @@
/**
- Set the level of this Logger.
-
- <p>Null values are admitted.
-
- @deprecated Please use {@link #setLevel} instead.
- */
- public
- void setPriority(Priority priority) {
- setLevel(priority);
- }
-
-
- /**
Set the resource bundle to be used with localized logging
methods {@link #l7dlog(Level,String,Throwable)} and {@link
#l7dlog(Level,String,Object[],Throwable)}.
1.12 +5 -5 jakarta-log4j/src/java/org/apache/log4j/Priority.java
Index: Priority.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Priority.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Priority.java 2001/09/04 14:49:50 1.11
+++ Priority.java 2001/09/04 14:53:12 1.12
@@ -22,11 +22,11 @@
*/
public class Priority extends Level {
- final static public Priority FATAL = new Priority(FATAL_INT, "FATAL", 0);
- final static public Priority ERROR = new Priority(ERROR_INT, "ERROR", 3);
- final static public Priority WARN = new Priority(WARN_INT, "WARN", 4);
- final static public Priority INFO = new Priority(INFO_INT, "INFO", 6);
- final static public Priority DEBUG = new Priority(DEBUG_INT, "DEBUG", 7);
+ //final static public Priority FATAL = new Priority(FATAL_INT, "FATAL", 0);
+ //final static public Priority ERROR = new Priority(ERROR_INT, "ERROR", 3);
+ //final static public Priority WARN = new Priority(WARN_INT, "WARN", 4);
+ //final static public Priority INFO = new Priority(INFO_INT, "INFO", 6);
+ //final static public Priority DEBUG = new Priority(DEBUG_INT, "DEBUG", 7);
/**
Instantiate a level object.
1.18 +2 -1 jakarta-log4j/src/java/org/apache/log4j/test/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile 2001/09/02 21:40:36 1.17
+++ Makefile 2001/09/04 14:53:13 1.18
@@ -29,7 +29,8 @@
CustomCategoryTest.java\
FQCNTest.java\
DRFATest.java\
- MDCStress.java
+ MDCStress.java\
+ HeavyLoad.java\
ifdef $(ISJDK1)
JSOURCES:=$(JSOURCES) UnitTestOR.java
1.6 +1 -0 jakarta-log4j/src/java/org/apache/log4j/test/Shallow.java
Index: Shallow.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/Shallow.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Shallow.java 2001/05/09 18:59:16 1.5
+++ Shallow.java 2001/09/04 14:53:13 1.6
@@ -83,6 +83,7 @@
cat.log(Priority.FATAL, "Message " + ++i, e);
root.log(Priority.FATAL, "Message " + i, e);
+ root.setPriority(Priority.FATAL);
// It is always a good idea to call this method when exiting an
// application.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
