You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-cvs@jakarta.apache.org by ce...@apache.org on 2001/09/27 23:22:38 UTC
cvs commit: jakarta-log4j/src/java/org/apache/log4j/xml DOMConfigurator.java
ceki 01/09/27 14:22:38
Modified: src/java/org/apache/log4j Appender.java
BasicConfigurator.java Hierarchy.java
PropertyConfigurator.java
src/java/org/apache/log4j/or RendererMap.java
src/java/org/apache/log4j/spi Configurator.java
LoggerRepository.java
src/java/org/apache/log4j/test Makefile runAll
src/java/org/apache/log4j/xml DOMConfigurator.java
Added: src/java/org/apache/log4j/test EnableFlagTest.java
enableFlagTest
src/java/org/apache/log4j/test/witness enableFlagTest.1
enableFlagTest.2 enableFlagTest.3 enableFlagTest.4
enableFlagTest.5 enableFlagTest.6 enableFlagTest.7
Removed: src/java/org/apache/log4j/test ShippedCodeFlagTest.java
src/java/org/apache/log4j/test/witness shippedCodeFlagTest.1
shippedCodeFlagTest.2 shippedCodeFlagTest.3
shippedCodeFlagTest.4
Log:
- The log4j.disable directive has been replaced with log4j.enable.
- Documentation changes.
Revision Changes Path
1.7 +3 -1 jakarta-log4j/src/java/org/apache/log4j/Appender.java
Index: Appender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Appender.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Appender.java 2001/07/13 07:52:41 1.6
+++ Appender.java 2001/09/27 21:22:37 1.7
@@ -56,7 +56,9 @@
void close();
/**
- Log in Appender specific way. */
+ Log in <code>Appender</code> specific way. When appropriate,
+ Loggers will call the <code>doAppend</code> method of appender
+ implementations in order to log. */
public
void doAppend(LoggingEvent event);
1.20 +2 -109 jakarta-log4j/src/java/org/apache/log4j/BasicConfigurator.java
Index: BasicConfigurator.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/BasicConfigurator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BasicConfigurator.java 2001/09/05 06:45:28 1.19
+++ BasicConfigurator.java 2001/09/27 21:22:37 1.20
@@ -31,124 +31,17 @@
@author Ceki Gülcü */
public class BasicConfigurator {
- /**
- <p><code>DISABLE_OVERRIDE_KEY</code> is the name of the constant
- holding the string value <b>log4j.disableOverride</b>.
-
- <p>Setting the system property <b>log4j.disableOverride</b> to
- "true" or any other value than "false" overrides the effects of
- all methods {@link Hierarchy#disable}, {@link
- Hierarchy#disableAll}, {@link Hierarchy#disableDebug} and {@link
- Hierarchy#disableInfo}. Thus, enabling normal evaluation of logging
- requests, i.e. according to the <a
- href="../../../../manual.html#selectionRule">Basic Selection Rule</a>.
-
- <p>If both <code>log4j.disableOverride</code> and a
- <code>log4j.disable</code> options are present, then
- <code>log4j.disableOverride</code> as the name indicates
- overrides any <code>log4j.disable</code> options.
-
- @since 0.8.5 */
- public static final String DISABLE_OVERRIDE_KEY = "log4j.disableOverride";
-
- /**
- <p><code>DISABLE_KEY</code> is the name of the constant
- holding the string value <b>log4j.disable</b>.
-
- <p>Setting the system property <b>log4j.disable</b> to DEBUG,
- INFO, WARN, ERROR or FATAL is equivalent to calling the {@link
- Hierarchy#disable} method with the corresponding level.
-
- <p>If both <code>log4j.disableOverride</code> and a
- <code>log4j.disable</code> options are present, then
- <code>log4j.disableOverride</code> as the name indicates
- overrides any <code>log4j.disable</code> options.
-
- @since 1.1 */
- public static final String DISABLE_KEY = "log4j.disable";
-
-
- /**
- Special level value signifying inherited behaviour. The
- current value of this string constant is <b>inherited</b>.
-
- */
- public static final String INHERITED = "inherited";
-
-
- // Check if value of(DISABLE_OVERRIDE_KEY) system property is set.
- // If it is set to "true" or any value other than "false", then set
- // static variable Category.disable to Category.DISABLE_OVERRIDE.
- static {
- String override = OptionConverter.getSystemProperty(DISABLE_OVERRIDE_KEY, null);
- if(override != null) {
- //Category.defaultHierarchy.setDisableOverride(override);
- } else { // check for log4j.disable only in absence of log4j.disableOverride
- String disableStr = OptionConverter.getSystemProperty(DISABLE_KEY, null);
- if(disableStr != null) {
- LogManager.getLoggerRepository().disable(disableStr);
- }
- }
- }
-
-
protected BasicConfigurator() {
}
/**
- Used by subclasses to add a renderer to the hierarchy passed as parameter.
- */
- protected
- static
- void addRenderer(RendererSupport repository, String renderedClassName,
- String renderingClassName) {
- LogLog.debug("Rendering class: ["+renderingClassName+"], Rendered class: ["+
- renderedClassName+"].");
- ObjectRenderer renderer = (ObjectRenderer)
- OptionConverter.instantiateByClassName(renderingClassName,
- ObjectRenderer.class,
- null);
- if(renderer == null) {
- LogLog.error("Could not instantiate renderer ["+renderingClassName+"].");
- return;
- } else {
- try {
- Class renderedClass = Loader.loadClass(renderedClassName);
- repository.setRenderer(renderedClass, renderer);
- } catch(ClassNotFoundException e) {
- LogLog.error("Could not find class ["+renderedClassName+"].", e);
- }
- }
- }
-
- /**
- See {@link Hierarchy#disable(String)}.
-
- @deprecated Use <code>Category.getDefaultHierarchy().disable()</code> instead. */
- public
- static
- void disable(String levelStr) {
- Category.getDefaultHierarchy().disable(levelStr);
- }
-
- /**
- See {@link Hierarchy#disable(Level)}.
-
- @deprecated Use <code>Category.getDefaultHierarchy().disable(p)</code> instead. */
- public
- static
- void disable(Level p) {
-
- }
-
- /**
Add a {@link FileAppender} that uses {@link PatternLayout} using
the {@link PatternLayout#TTCC_CONVERSION_PATTERN} and prints to
<code>System.out</code> to the root category. */
static
public
void configure() {
- Category root = Category.getRoot();
+ Logger root = Logger.getRoot();
root.addAppender(new ConsoleAppender(
new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)));
}
@@ -160,7 +53,7 @@
static
public
void configure(Appender appender) {
- Category root = Category.getRoot();
+ Logger root = Logger.getRoot();
root.addAppender(appender);
}
1.35 +17 -3 jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java
Index: Hierarchy.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Hierarchy.java 2001/09/24 22:43:04 1.34
+++ Hierarchy.java 2001/09/27 21:22:37 1.35
@@ -256,6 +256,20 @@
}
/**
+ The string form of {@link enable(Level)}.
+ */
+ public
+ void enable(String levelStr) {
+ Level l = Level.toLevel(levelStr, null);
+ if(l != null) {
+ enable(l);
+ } else {
+ LogLog.warn("Could not convert ["+levelStr+"] to Level.");
+ }
+ }
+
+
+ /**
Enable logging for logging requests with level <code>l</code> or
higher. By default all levels are enabled.
@@ -429,9 +443,9 @@
}
/**
- @deprecated See {@link #getEnable} for similar functionality.
- */
-
+ This methid will Return <code>true</code> if this repository is
+ disabled for <code>level</code> passes as parameter and false otherwise.
+ */
public
boolean isDisabled(int level) {
return enableInt > level;
1.43 +11 -17 jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- PropertyConfigurator.java 2001/09/26 10:42:08 1.42
+++ PropertyConfigurator.java 2001/09/27 21:22:37 1.43
@@ -78,8 +78,7 @@
@author Ceki Gülcü
@author Anders Kristensen
@since 0.8.1 */
-public class PropertyConfigurator extends BasicConfigurator
- implements Configurator {
+public class PropertyConfigurator implements Configurator {
/**
Used internally to keep track of configured appenders.
@@ -95,6 +94,7 @@
static final String ROOT_LOGGER_PREFIX = "log4j.rootLogger";
static final String APPENDER_PREFIX = "log4j.appender.";
static final String RENDERER_PREFIX = "log4j.renderer.";
+ static final String ENABLE_PREFIX = "log4j.enable";
/** Key for specifying the {@link org.apache.log4j.spi.LoggerFactory
LoggerFactory}. Currently set to "<code>log4j.loggerFactory</code>". */
@@ -396,18 +396,12 @@
LogLog.setInternalDebugging(OptionConverter.toBoolean(value, true));
}
- // Check if the config file overides the shipped code flag.
- //String override = properties.getProperty(
- // BasicConfigurator.DISABLE_OVERRIDE_KEY);
- //hierarchy.overrideAsNeeded(override);
-
- //if(override == null) {
- String disableStr = properties.getProperty(BasicConfigurator.DISABLE_KEY);
- if(disableStr != null)
- hierarchy.disable(disableStr);
- //}
-
-
+ String enableStr = properties.getProperty(ENABLE_KEY);
+ if(enableStr != null) {
+ LogLog.debug("Parsing enable string ["+enableStr+"]");
+ hierarchy.enable(enableStr);
+ }
+
configureRootCategory(properties, hierarchy);
configureLoggerFactory(properties);
parseCatsAndRenderers(properties, hierarchy);
@@ -533,8 +527,8 @@
String renderedClass = key.substring(RENDERER_PREFIX.length());
String renderingClass = OptionConverter.findAndSubst(key, props);
if(hierarchy instanceof RendererSupport) {
- addRenderer((RendererSupport) hierarchy, renderedClass,
- renderingClass);
+ RendererMap.addRenderer((RendererSupport) hierarchy, renderedClass,
+ renderingClass);
}
}
}
@@ -582,7 +576,7 @@
// If the level value is inherited, set category level value to
// null. We also check that the user has not specified inherited for the
// root category.
- if(levelStr.equalsIgnoreCase(BasicConfigurator.INHERITED) &&
+ if(levelStr.equalsIgnoreCase(INHERITED) &&
!loggerName.equals(INTERNAL_ROOT_NAME)) {
logger.setLevel(null);
} else {
1.7 +31 -0 jakarta-log4j/src/java/org/apache/log4j/or/RendererMap.java
Index: RendererMap.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/or/RendererMap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RendererMap.java 2001/01/14 20:50:20 1.6
+++ RendererMap.java 2001/09/27 21:22:37 1.7
@@ -7,6 +7,10 @@
package org.apache.log4j.or;
+import org.apache.log4j.spi.RendererSupport;
+import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.helpers.Loader;
+import org.apache.log4j.helpers.OptionConverter;
import java.util.Hashtable;
/**
@@ -24,6 +28,33 @@
RendererMap() {
map = new Hashtable();
}
+
+ /**
+ Add a renderer to a hierarchy passed as parameter.
+ */
+ static
+ public
+ void addRenderer(RendererSupport repository, String renderedClassName,
+ String renderingClassName) {
+ LogLog.debug("Rendering class: ["+renderingClassName+"], Rendered class: ["+
+ renderedClassName+"].");
+ ObjectRenderer renderer = (ObjectRenderer)
+ OptionConverter.instantiateByClassName(renderingClassName,
+ ObjectRenderer.class,
+ null);
+ if(renderer == null) {
+ LogLog.error("Could not instantiate renderer ["+renderingClassName+"].");
+ return;
+ } else {
+ try {
+ Class renderedClass = Loader.loadClass(renderedClassName);
+ repository.setRenderer(renderedClass, renderer);
+ } catch(ClassNotFoundException e) {
+ LogLog.error("Could not find class ["+renderedClassName+"].", e);
+ }
+ }
+ }
+
/**
Find the appropriate renderer for the class type of the
1.7 +21 -0 jakarta-log4j/src/java/org/apache/log4j/spi/Configurator.java
Index: Configurator.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/Configurator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Configurator.java 2001/09/05 06:45:29 1.6
+++ Configurator.java 2001/09/27 21:22:38 1.7
@@ -17,6 +17,27 @@
@author Anders Kristensen
*/
public interface Configurator {
+
+ /**
+ <p><code>ENABLE_KEY</code> is the name of the constant
+ holding the string value <b>log4j.enable</b>.
+
+ <p>Setting the system property <b>log4j.disable</b> to DEBUG,
+ INFO, WARN, ERROR or FATAL is equivalent to calling the {@link
+ Hierarchy#disable} method with the corresponding level.
+
+ @since 1.2 */
+ public static final String ENABLE_KEY = "log4j.enable";
+
+
+ /**
+ Special level value signifying inherited behaviour. The
+ current value of this string constant is <b>inherited</b>.
+ */
+ public static final String INHERITED = "inherited";
+
+
+
/**
Interpret a resource pointed by a URL and set up log4j accordingly.
1.6 +3 -3 jakarta-log4j/src/java/org/apache/log4j/spi/LoggerRepository.java
Index: LoggerRepository.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/LoggerRepository.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoggerRepository.java 2001/09/25 10:29:04 1.5
+++ LoggerRepository.java 2001/09/27 21:22:38 1.6
@@ -12,12 +12,12 @@
boolean isDisabled(int level);
- public
- void disable(String val);
-
public
void enable(Level level);
+ public
+ void enable(String val);
+
public
void emitNoAppenderWarning(Category cat);
1.20 +1 -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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile 2001/09/04 18:44:48 1.19
+++ Makefile 2001/09/27 21:22:38 1.20
@@ -6,7 +6,6 @@
StressNDC.java\
StressAsyncAppender.java\
Min.java Base64.java\
- ShippedCodeFlagTest.java\
ConfigurationFileParsing.java\
MultipleAppenders.java\
PatternTest.java\
@@ -30,6 +29,7 @@
FQCNTest.java\
DRFATest.java\
MDCStress.java\
+ EnableFlagTest.java\
# HeavyLoad.java\
1.10 +1 -1 jakarta-log4j/src/java/org/apache/log4j/test/runAll
Index: runAll
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/runAll,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- runAll 2001/09/25 10:06:36 1.9
+++ runAll 2001/09/27 21:22:38 1.10
@@ -6,10 +6,10 @@
./minreg simple || die "minreg simple FAILED.";
./minreg ttcc || die "minreg ttcc FAILED.";
./shallow || die "shallow test FAILED."
-./shippedCodeFlag || die "shippedCodeFlag test FAILED."
./defaultInit || die "defaultInit test FAILED."
./propConfig || die "propConfig test FAILED."
./getOptions || die "getOptions test FAILED."
+./enableFlagTest || die "enableFlagTest test FAILED."
./multipleAppenders || die "multipleAppenders test FAILED."
./confParsing || die "confParsing test FAILED."
./customCategory || die "customCategory test FAILED."
1.1 jakarta-log4j/src/java/org/apache/log4j/test/EnableFlagTest.java
Index: EnableFlagTest.java
===================================================================
package org.apache.log4j.test;
import org.apache.log4j.*;
public class EnableFlagTest {
static Logger logger = Logger.getLogger(EnableFlagTest.class);
public static void main( String[] argv) {
String type = null;
if(argv.length == 1)
type = argv[0];
else
Usage("Wrong number of arguments.");
PropertyConfigurator.configure(type);
logger.debug("m1");
logger.info("m2");
logger.warn("m3");
logger.error("m4");
logger.fatal("m5");
}
static
void Usage(String msg) {
System.err.println(msg);
System.err.println( "Usage: java org.apache.log4j.test.ShippedCodeFlagTest configFile");
System.exit(1);
}
}
1.1 jakarta-log4j/src/java/org/apache/log4j/test/enableFlagTest
Index: enableFlagTest
===================================================================
#!/bin/bash
# Read the .functions file
. .functions
# If set, allows to skip tests
declare -i start=$1
WITNESS=witness/enableFlagTest
function testSCF {
type=$1
d=$2
deleteFile $TEMP
echo -n "EnableFlagTest $TEST "
java $d org.apache.log4j.test.EnableFlagTest $type
check $WITNESS.$TEST $TEMP; echo " - OK."
}
TEST=1
if [ $TEST -ge $start ]; then
echo "log4j.rootCategory=,A" > $LCF
lecho "log4j.enable=OFF"
lecho "log4j.appender.A=org.apache.log4j.FileAppender"
lecho "log4j.appender.A.File=$TEMP"
lecho "log4j.appender.A.layout=org.apache.log4j.PatternLayout"
lecho "log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n"
testSCF $LCF
fi
TEST=2
if [ $TEST -ge $start ]; then
echo "log4j.rootCategory=,A" > $LCF
lecho "log4j.enable=FATAL"
lecho "log4j.appender.A=org.apache.log4j.FileAppender"
lecho "log4j.appender.A.File=$TEMP"
lecho "log4j.appender.A.layout=org.apache.log4j.PatternLayout"
lecho "log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n"
testSCF $LCF
fi
TEST=3
if [ $TEST -ge $start ]; then
echo "log4j.rootCategory=,A" > $LCF
lecho "log4j.enable=ERROR"
lecho "log4j.appender.A=org.apache.log4j.FileAppender"
lecho "log4j.appender.A.File=$TEMP"
lecho "log4j.appender.A.layout=org.apache.log4j.PatternLayout"
lecho "log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n"
testSCF $LCF
fi
TEST=4
if [ $TEST -ge $start ]; then
echo "log4j.rootCategory=,A" > $LCF
lecho "log4j.enable=WARN"
lecho "log4j.appender.A=org.apache.log4j.FileAppender"
lecho "log4j.appender.A.File=$TEMP"
lecho "log4j.appender.A.layout=org.apache.log4j.PatternLayout"
lecho "log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n"
testSCF $LCF
fi
TEST=5
if [ $TEST -ge $start ]; then
echo "log4j.rootCategory=,A" > $LCF
lecho "log4j.enable=INFO"
lecho "log4j.appender.A=org.apache.log4j.FileAppender"
lecho "log4j.appender.A.File=$TEMP"
lecho "log4j.appender.A.layout=org.apache.log4j.PatternLayout"
lecho "log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n"
testSCF $LCF
fi
TEST=6
if [ $TEST -ge $start ]; then
echo "log4j.rootCategory=,A" > $LCF
lecho "log4j.enable=DEBUG"
lecho "log4j.appender.A=org.apache.log4j.FileAppender"
lecho "log4j.appender.A.File=$TEMP"
lecho "log4j.appender.A.layout=org.apache.log4j.PatternLayout"
lecho "log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n"
testSCF $LCF
fi
TEST=7
if [ $TEST -ge $start ]; then
echo "log4j.rootCategory=,A" > $LCF
lecho "log4j.enable=ALL"
lecho "log4j.appender.A=org.apache.log4j.FileAppender"
lecho "log4j.appender.A.File=$TEMP"
lecho "log4j.appender.A.layout=org.apache.log4j.PatternLayout"
lecho "log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n"
testSCF $LCF
fi
1.1 jakarta-log4j/src/java/org/apache/log4j/test/witness/enableFlagTest.1
<<Binary file>>
1.1 jakarta-log4j/src/java/org/apache/log4j/test/witness/enableFlagTest.2
Index: enableFlagTest.2
===================================================================
FATAL [main] test.EnableFlagTest = m5
1.1 jakarta-log4j/src/java/org/apache/log4j/test/witness/enableFlagTest.3
Index: enableFlagTest.3
===================================================================
ERROR [main] test.EnableFlagTest = m4
FATAL [main] test.EnableFlagTest = m5
1.1 jakarta-log4j/src/java/org/apache/log4j/test/witness/enableFlagTest.4
Index: enableFlagTest.4
===================================================================
WARN [main] test.EnableFlagTest = m3
ERROR [main] test.EnableFlagTest = m4
FATAL [main] test.EnableFlagTest = m5
1.1 jakarta-log4j/src/java/org/apache/log4j/test/witness/enableFlagTest.5
Index: enableFlagTest.5
===================================================================
INFO [main] test.EnableFlagTest = m2
WARN [main] test.EnableFlagTest = m3
ERROR [main] test.EnableFlagTest = m4
FATAL [main] test.EnableFlagTest = m5
1.1 jakarta-log4j/src/java/org/apache/log4j/test/witness/enableFlagTest.6
Index: enableFlagTest.6
===================================================================
DEBUG [main] test.EnableFlagTest = m1
INFO [main] test.EnableFlagTest = m2
WARN [main] test.EnableFlagTest = m3
ERROR [main] test.EnableFlagTest = m4
FATAL [main] test.EnableFlagTest = m5
1.1 jakarta-log4j/src/java/org/apache/log4j/test/witness/enableFlagTest.7
Index: enableFlagTest.7
===================================================================
DEBUG [main] test.EnableFlagTest = m1
INFO [main] test.EnableFlagTest = m2
WARN [main] test.EnableFlagTest = m3
ERROR [main] test.EnableFlagTest = m4
FATAL [main] test.EnableFlagTest = m5
1.36 +11 -19 jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java
Index: DOMConfigurator.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- DOMConfigurator.java 2001/09/24 23:40:48 1.35
+++ DOMConfigurator.java 2001/09/27 21:22:38 1.36
@@ -3,7 +3,7 @@
*
* This software is published under the terms of the Apache Software
* License version 1.1, a copy of which has been included with this
- * distribution in the LICENSE.APL file. */
+ * distribution in the LICENSE.txt file. */
package org.apache.log4j.xml;
@@ -15,6 +15,7 @@
import java.lang.reflect.Method;
import org.apache.log4j.*;
import org.apache.log4j.spi.*;
+import org.apache.log4j.or.RendererMap;
import org.apache.log4j.helpers.*;
import org.apache.log4j.config.PropertySetter;
@@ -55,7 +56,7 @@
@author Anders Kristensen
@since 0.8.3 */
-public class DOMConfigurator extends BasicConfigurator implements Configurator {
+public class DOMConfigurator implements Configurator {
static final String CONFIGURATION_TAG = "log4j:configuration";
static final String OLD_CONFIGURATION_TAG = "configuration";
@@ -77,8 +78,7 @@
static final String ERROR_HANDLER_TAG = "errorHandler";
static final String REF_ATTR = "ref";
static final String ADDITIVITY_ATTR = "additivity";
- static final String DISABLE_OVERRIDE_ATTR = "disableOverride";
- static final String DISABLE_ATTR = "disable";
+ static final String ENABLE_ATTR = "enable";
static final String CONFIG_DEBUG_ATTR = "configDebug";
static final String INTERNAL_DEBUG_ATTR = "debug";
static final String RENDERING_CLASS_ATTR = "renderingClass";
@@ -453,7 +453,8 @@
String renderingClass = subst(element.getAttribute(RENDERING_CLASS_ATTR));
String renderedClass = subst(element.getAttribute(RENDERED_CLASS_ATTR));
if(hierarchy instanceof RendererSupport) {
- addRenderer((RendererSupport) hierarchy, renderedClass, renderingClass);
+ RendererMap.addRenderer((RendererSupport) hierarchy, renderedClass,
+ renderingClass);
}
}
@@ -470,7 +471,7 @@
String priStr = subst(element.getAttribute(VALUE_ATTR));
LogLog.debug("Level value for "+catName+" is ["+priStr+"].");
- if(BasicConfigurator.INHERITED.equals(priStr)) {
+ if(INHERITED.equals(priStr)) {
if(isRoot) {
LogLog.error("Root level cannot be inherited. Ignoring directive.");
} else {
@@ -712,19 +713,10 @@
LogLog.setInternalDebugging(OptionConverter.toBoolean(confDebug, true));
}
- String override = subst(element.getAttribute(DISABLE_OVERRIDE_ATTR));
- LogLog.debug("Disable override=\"" + override +"\".");
- // if the log4j.dtd is not specified in the XML file, then the
- // DISABLE_OVERRIDE attribute is returned as the empty string when
- // it is not specified in the XML file.
- if(!override.equals("") && !override.equals("null")) {
- //hierarchy.overrideAsNeeded(override);
- }
-
- String disableStr = subst(element.getAttribute(DISABLE_ATTR));
- LogLog.debug("Disable =\"" + disableStr +"\".");
- if(!"".equals(disableStr) && !"null".equals(disableStr)) {
- hierarchy.disable(disableStr);
+ String enableStr = subst(element.getAttribute(ENABLE_ATTR));
+ LogLog.debug("Enable =\"" + enableStr +"\".");
+ if(!"".equals(enableStr) && !"null".equals(enableStr)) {
+ hierarchy.enable(enableStr);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-cvs-help@jakarta.apache.org