ceki 01/09/05 01:33:11 Modified: src/java/org/apache/log4j Category.java src/java/org/apache/log4j/test extSupport src/java/org/apache/log4j/test/witness getOptions.1 Log: Relaxed input parameters in log() methods so that they now accept Priority objects instead of Level objects. This fixes backward-compatibilities issues. Revision Changes Path 1.49 +4 -4 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.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- Category.java 2001/09/05 06:45:28 1.48 +++ Category.java 2001/09/05 08:33:11 1.49 @@ -477,7 +477,7 @@ This method creates a new logging event and logs the event without further checks. */ protected - void forcedLog(String fqcn, Level level, Object message, Throwable t) { + void forcedLog(String fqcn, Priority level, Object message, Throwable t) { callAppenders(new LoggingEvent(fqcn, this, level, message, t)); } @@ -852,7 +852,7 @@ @return boolean True if this category is enabled for <code>level</code>. */ public - boolean isEnabledFor(Level level) { + boolean isEnabledFor(Priority level) { if(repository.isDisabled(level.level)) return false; return level.isGreaterOrEqual(this.getChainedLevel()); @@ -925,7 +925,7 @@ This generic form is intended to be used by wrappers. */ public - void log(Level level, Object message, Throwable t) { + void log(Priority level, Object message, Throwable t) { if(repository.isDisabled(level.level)) { return; } @@ -937,7 +937,7 @@ This generic form is intended to be used by wrappers. */ public - void log(Level level, Object message) { + void log(Priority level, Object message) { if(repository.isDisabled(level.level)) { return; } 1.2 +1 -0 jakarta-log4j/src/java/org/apache/log4j/test/extSupport Index: extSupport =================================================================== RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/extSupport,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- extSupport 2001/06/27 21:34:32 1.1 +++ extSupport 2001/09/05 08:33:11 1.2 @@ -19,6 +19,7 @@ } +echo "-- $OUTPUT" declare -i TEST 1.6 +11 -11 jakarta-log4j/src/java/org/apache/log4j/test/witness/getOptions.1 Index: getOptions.1 =================================================================== RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/witness/getOptions.1,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- getOptions.1 2001/09/02 20:05:40 1.5 +++ getOptions.1 2001/09/05 08:33:11 1.6 @@ -1,11 +1,11 @@ -log4j.appender.f.Append=false -log4j.appender.f.BufferSize=8192 -log4j.appender.f.BufferedIO=false -log4j.appender.f.File=temp -log4j.appender.f.ImmediateFlush=true -log4j.appender.f.layout.ContentType=text/plain -log4j.appender.f.layout.ConversionPattern=%m%n -log4j.appender.f.layout=org.apache.log4j.PatternLayout -log4j.appender.f=org.apache.log4j.FileAppender -log4j.category.org.apache.log4j=INFO, f -log4j.rootCategory=DEBUG, f +log4j.appender.f.Append=false +log4j.appender.f.BufferedIO=false +log4j.appender.f.BufferSize=8192 +log4j.appender.f.File=temp +log4j.appender.f.ImmediateFlush=true +log4j.appender.f.layout.ContentType=text/plain +log4j.appender.f.layout.ConversionPattern=%m%n +log4j.appender.f.layout=org.apache.log4j.PatternLayout +log4j.appender.f=org.apache.log4j.FileAppender +log4j.category.org.apache.log4j=INFO, f +log4j.rootCategory=DEBUG, f --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]