ceki 02/03/11 15:43:46
Modified: . build.xml
docs HISTORY
src/java/org/apache/log4j Category.java
src/java/org/apache/log4j/net SocketNode.java
tests/src/java/org/apache/log4j LoggerTestCase.java
tests/src/java/org/apache/log4j/customLogger XLogger.java
Log:
- In the Category class, the .getChainedPriority method has been
replaced with getEffectiveLevel method. [*]
Revision Changes Path
1.21 +1 -1 jakarta-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 18 Feb 2002 21:46:45 -0000 1.20
+++ build.xml 11 Mar 2002 23:43:45 -0000 1.21
@@ -14,7 +14,7 @@
<!-- prefixed with "env". -->
<property environment="env"/>
- <property name="version" value="1.2beta3"/>
+ <property name="version" value="1.2beta5"/>
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
1.85 +18 -4 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- HISTORY 22 Feb 2002 10:39:55 -0000 1.84
+++ HISTORY 11 Mar 2002 23:43:45 -0000 1.85
@@ -9,18 +9,32 @@
- Release of version 1.2
+ (beta5)
+
+ - In the Category class, the .getChainedPriority method has been
+ replaced with getEffectiveLevel method. [*]
(beta4)
- - Replaced the custom class loading based on he thread context class
- loader with a simple Class.forName() call. Thanks to Dave Herman
- on explaining the issues involved. See
+ - Replaced the custom class loading based on the thread context class
+ loader with a simple Class.forName() call. This solves two allied
+ but distinct problems encountered when using Ant with JUnit
+ although the bug is more general. In one instance of the
+ problem, log4j would throw java.lang.NoClassDefFoundError for
+ org/apache/log4j/AppenderSkeleton where log4j.jar and related
+ classes were clearly available to the Ant classloader. In another
+ incarnation, log4j would reject a custom appender claiming that it is
+ not assignable to a org.apache.log4j.Appender variable. This would
+ occur when log4j.jar was available to both the Ant classloader and the
+ system classloader.
+
+ Thanks to Dave Herman for providing detailed scenarios exposing
+ the issues involved. See
http://forum.java.sun.com/thread.jsp?forum=38&thread=70946
http://forum.java.sun.com/thread.jsp?forum=38&thread=70946#479697
http://marc.theaimsgroup.com/?l=ant-user&m=101139178705895&w=2
for more details. [*]
-Class.forName(clazz);
(beta3)
1.63 +33 -19 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Category.java 11 Feb 2002 22:20:30 -0000 1.62
+++ Category.java 11 Mar 2002 23:43:45 -0000 1.63
@@ -249,7 +249,7 @@
void debug(Object message) {
if(repository.isDisabled(Level.DEBUG_INT))
return;
- if(Level.DEBUG.isGreaterOrEqual(this.getChainedLevel())) {
+ if(Level.DEBUG.isGreaterOrEqual(this.getEffectiveLevel())) {
forcedLog(FQCN, Level.DEBUG, message, null);
}
}
@@ -268,7 +268,7 @@
void debug(Object message, Throwable t) {
if(repository.isDisabled(Level.DEBUG_INT))
return;
- if(Level.DEBUG.isGreaterOrEqual(this.getChainedLevel()))
+ if(Level.DEBUG.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, Level.DEBUG, message, t);
}
@@ -303,7 +303,7 @@
void error(Object message) {
if(repository.isDisabled(Level.ERROR_INT))
return;
- if(Level.ERROR.isGreaterOrEqual(this.getChainedLevel()))
+ if(Level.ERROR.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, Level.ERROR, message, null);
}
@@ -320,7 +320,7 @@
void error(Object message, Throwable t) {
if(repository.isDisabled(Level.ERROR_INT))
return;
- if(Level.ERROR.isGreaterOrEqual(this.getChainedLevel()))
+ if(Level.ERROR.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, Level.ERROR, message, t);
}
@@ -362,7 +362,7 @@
void fatal(Object message) {
if(repository.isDisabled(Level.FATAL_INT))
return;
- if(Level.FATAL.isGreaterOrEqual(this.getChainedLevel()))
+ if(Level.FATAL.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, Level.FATAL, message, null);
}
@@ -379,7 +379,7 @@
void fatal(Object message, Throwable t) {
if(repository.isDisabled(Level.FATAL_INT))
return;
- if(Level.FATAL.isGreaterOrEqual(this.getChainedLevel()))
+ if(Level.FATAL.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, Level.FATAL, message, t);
}
@@ -439,7 +439,7 @@
quickly as possible.
*/
public
- Level getChainedLevel() {
+ Level getEffectiveLevel() {
for(Category c = this; c != null; c=c.parent) {
if(c.level != null)
return c.level;
@@ -448,6 +448,20 @@
}
/**
+
+ @deprecated Has been replaced by the {@link #getEffectiveLevel}
+ method. */
+ public
+ Priority getChainedPriority() {
+ for(Category c = this; c != null; c=c.parent) {
+ if(c.level != null)
+ return c.level;
+ }
+ return null; // If reached will cause an NullPointerException.
+ }
+
+
+ /**
Returns all the currently defined categories in the default
hierarchy as an {@link java.util.Enumeration Enumeration}.
@@ -676,7 +690,7 @@
void info(Object message) {
if(repository.isDisabled(Level.INFO_INT))
return;
- if(Level.INFO.isGreaterOrEqual(this.getChainedLevel()))
+ if(Level.INFO.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, Level.INFO, message, null);
}
@@ -693,7 +707,7 @@
void info(Object message, Throwable t) {
if(repository.isDisabled(Level.INFO_INT))
return;
- if(Level.INFO.isGreaterOrEqual(this.getChainedLevel()))
+ if(Level.INFO.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, Level.INFO, message, t);
}
@@ -747,7 +761,7 @@
boolean isDebugEnabled() {
if(repository.isDisabled( Level.DEBUG_INT))
return false;
- return Level.DEBUG.isGreaterOrEqual(this.getChainedLevel());
+ return Level.DEBUG.isGreaterOrEqual(this.getEffectiveLevel());
}
/**
@@ -762,7 +776,7 @@
boolean isEnabledFor(Priority level) {
if(repository.isDisabled(level.level))
return false;
- return level.isGreaterOrEqual(this.getChainedLevel());
+ return level.isGreaterOrEqual(this.getEffectiveLevel());
}
/**
@@ -776,7 +790,7 @@
boolean isInfoEnabled() {
if(repository.isDisabled(Level.INFO_INT))
return false;
- return Level.INFO.isGreaterOrEqual(this.getChainedLevel());
+ return Level.INFO.isGreaterOrEqual(this.getEffectiveLevel());
}
@@ -793,7 +807,7 @@
if(repository.isDisabled(priority.level)) {
return;
}
- if(priority.isGreaterOrEqual(this.getChainedLevel())) {
+ if(priority.isGreaterOrEqual(this.getEffectiveLevel())) {
String msg = getResourceBundleString(key);
// if message corresponding to 'key' could not be found in the
// resource bundle, then default to 'key'.
@@ -817,7 +831,7 @@
if(repository.isDisabled(priority.level)) {
return;
}
- if(priority.isGreaterOrEqual(this.getChainedLevel())) {
+ if(priority.isGreaterOrEqual(this.getEffectiveLevel())) {
String pattern = getResourceBundleString(key);
String msg;
if(pattern == null)
@@ -836,7 +850,7 @@
if(repository.isDisabled(priority.level)) {
return;
}
- if(priority.isGreaterOrEqual(this.getChainedLevel()))
+ if(priority.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, priority, message, t);
}
@@ -848,7 +862,7 @@
if(repository.isDisabled(priority.level)) {
return;
}
- if(priority.isGreaterOrEqual(this.getChainedLevel()))
+ if(priority.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, priority, message, null);
}
@@ -866,7 +880,7 @@
if(repository.isDisabled(level.level)) {
return;
}
- if(level.isGreaterOrEqual(this.getChainedLevel())) {
+ if(level.isGreaterOrEqual(this.getEffectiveLevel())) {
forcedLog(callerFQCN, level, message, t);
}
}
@@ -1020,7 +1034,7 @@
if(repository.isDisabled( Level.WARN_INT))
return;
- if(Level.WARN.isGreaterOrEqual(this.getChainedLevel()))
+ if(Level.WARN.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, Level.WARN, message, null);
}
@@ -1037,7 +1051,7 @@
void warn(Object message, Throwable t) {
if(repository.isDisabled(Level.WARN_INT))
return;
- if(Level.WARN.isGreaterOrEqual(this.getChainedLevel()))
+ if(Level.WARN.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, Level.WARN, message, t);
}
}
1.16 +1 -1 jakarta-log4j/src/java/org/apache/log4j/net/SocketNode.java
Index: SocketNode.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SocketNode.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SocketNode.java 11 Feb 2002 12:22:53 -0000 1.15
+++ SocketNode.java 11 Mar 2002 23:43:45 -0000 1.16
@@ -68,7 +68,7 @@
event = (LoggingEvent) ois.readObject();
remoteLogger = hierarchy.getLogger(event.categoryName);
event.logger = remoteLogger;
- if(event.level.isGreaterOrEqual(remoteLogger.getChainedLevel())) {
+ if(event.level.isGreaterOrEqual(remoteLogger.getEffectiveLevel())) {
remoteLogger.callAppenders(event);
}
}
1.2 +1 -1
jakarta-log4j/tests/src/java/org/apache/log4j/LoggerTestCase.java
Index: LoggerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/LoggerTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggerTestCase.java 18 Feb 2002 21:43:32 -0000 1.1
+++ LoggerTestCase.java 11 Mar 2002 23:43:46 -0000 1.2
@@ -313,7 +313,7 @@
Logger a0 = h.getLogger("a");
assertEquals("a", a0.getName());
assertNull(a0.getLevel());
- assertSame(Level.ERROR, a0.getChainedLevel());
+ assertSame(Level.ERROR, a0.getEffectiveLevel());
Logger a1 = h.getLogger("a");
assertSame(a0, a1);
1.2 +4 -4
jakarta-log4j/tests/src/java/org/apache/log4j/customLogger/XLogger.java
Index: XLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/customLogger/XLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XLogger.java 22 Feb 2002 18:09:27 -0000 1.1
+++ XLogger.java 11 Mar 2002 23:43:46 -0000 1.2
@@ -65,7 +65,7 @@
void lethal(String message, Throwable t) {
if(repository.isDisabled(XLevel.LETHAL_INT))
return;
- if(XLevel.LETHAL.isGreaterOrEqual(this.getChainedLevel()))
+ if(XLevel.LETHAL.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, XLevel.LETHAL, message, t);
}
@@ -76,7 +76,7 @@
void lethal(String message) {
if(repository.isDisabled(XLevel.LETHAL_INT))
return;
- if(XLevel.LETHAL.isGreaterOrEqual(this.getChainedLevel()))
+ if(XLevel.LETHAL.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, XLevel.LETHAL, message, null);
}
@@ -110,7 +110,7 @@
void trace(String message, Throwable t) {
if(repository.isDisabled(XLevel.TRACE_INT))
return;
- if(XLevel.TRACE.isGreaterOrEqual(this.getChainedLevel()))
+ if(XLevel.TRACE.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, XLevel.TRACE, message, t);
}
@@ -121,7 +121,7 @@
void trace(String message) {
if(repository.isDisabled(XLevel.TRACE_INT))
return;
- if(XLevel.TRACE.isGreaterOrEqual(this.getChainedLevel()))
+ if(XLevel.TRACE.isGreaterOrEqual(this.getEffectiveLevel()))
forcedLog(FQCN, XLevel.TRACE, message, null);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
