ceki 01/04/17 15:32:48
Modified: . INSTALL
build build.xml
docs HISTORY documentation.html download.html
src/java/org/apache/log4j Category.java
PropertyConfigurator.java RollingFileAppender.java
src/java/org/apache/log4j/config PropertySetter.java
src/java/org/apache/log4j/helpers LogLog.java
OptionConverter.java
src/java/org/apache/log4j/net SyslogAppender.java
src/java/org/apache/log4j/test confParsing
src/java/org/apache/log4j/xml DOMConfigurator.java log4j.dtd
src/xdocs documentation.xml
Log:
- The "log4j.configDebug" system property has been replaced with the
"log4j.debug" system property altough it is still available.
Similarly, the "configDebug" attribute has been deprecated and
replaced with the "debug" attribute in log4j.dtd. [*]
Revision Changes Path
1.11 +4 -10 jakarta-log4j/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/jakarta-log4j/INSTALL,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- INSTALL 2001/03/20 16:28:58 1.10
+++ INSTALL 2001/04/17 22:32:10 1.11
@@ -21,7 +21,7 @@
You should see log statements appearing on the console.
5) Refer to the javadoc documentation and the user manual on how to
- include log statements into your own code.
+ include log statements in your own code.
=========
JAR files
@@ -45,7 +45,7 @@
The log4j distribution comes with pre-compiled classes. Log4j is based
-on JDK 1.1 with the following exceptions:
+on JDK 1.1 with the following additional requirements:
---------------------
Package org.log4j.xml
@@ -83,12 +83,6 @@
http://java.sun.com/products/jms/vendors.html
- ----------------
- TextPaneAppender
- ----------------
-
- The TextPaneAppender is based on Swing.
-
-----------------------
JUnit testing framework
-----------------------
@@ -104,8 +98,8 @@
==============
Like most java appilicatios today, log4j relies on ANT as its build
-tool. ANT is availale from "http://jakarta.apache.org/ant/index.html".
-ANT requires a build file called build.xml which is part of this
+tool. ANT is availale from "http://jakarta.apache.org/ant/". ANT
+requires a build file called build.xml which is part of this
distribution.
Alternatively, you might wish to use the GNU-Make build/compile
1.19 +5 -7 jakarta-log4j/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 2001/04/17 19:59:12 1.18
+++ build.xml 2001/04/17 22:32:13 1.19
@@ -258,7 +258,6 @@
includes="${stem}/*.class, ${stem}/xml/log4j.dtd,
${stem}/config/*.class,
${stem}/helpers/*.class,
- icons/**,
${stem}/spi/*.class,
${stem}/net/*.class,
${stem}/varia/*.class,
@@ -334,7 +333,7 @@
<!-- ================================================================= -->
<!-- Build a complete distribution. Results go to ${dist.images} -->
<!-- ================================================================= -->
- <target name="dist" depends="init, clean, jar, javadoc">
+ <target name="dist" depends="init, clean, jar">
<delete verbose="true">
<fileset dir=".">
@@ -369,22 +368,21 @@
<copy todir="${dist.tmp}/jakarta-log4j-${version}">
<fileset dir="${base}"
includes="make/**,
- xdocs/**,
+ src/**,
docs/**,
Makefile,
build/*
manifest.mf,
INSTALL,
LICENSE.APL,
- ${jar.dest}/*.jar,
+ dist/lib/*.jar,
org/**,
icons/**,
- ${javac.dest}/**,
+ dist/classes/**,
contribs/**"
excludes="make/make.loc,
**/*.bak,
- **/.#*,
- ${BSTEM}/xml/Transform.java"/>
+ **/.#*"/>
</copy>
<tar tarfile="${dist.images}/jakarta-log4j-${version}.tar"
1.32 +14 -5 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- HISTORY 2001/04/17 19:59:17 1.31
+++ HISTORY 2001/04/17 22:32:16 1.32
@@ -19,11 +19,11 @@
If you have a CVS checked out copy of log4j be sure to check out a
fresh copy. [*]
- - Added jar files required at build time to build/lib so that it is
- now possible to compile log4j out of the box. [*]
+ - Added a few jar files required at build time to build/lib so that
+ it is now possible to compile log4j out of the box. [*]
- - Whenever a priority parameter is expected in a configuration file
- one can now use a costom priority class. See OptionConverter.toPriority
+ - Whenever a priority parameter is expected in a configuration file,
+ one can now use a custom priority class. See OptionConverter.toPriority
method for more information. Note that the <priority> element in
log4j.dtd remains unaffected by this change. [*]
@@ -32,14 +32,23 @@
- Log4j components are now configured as JavaBeans. The setOption and
getOptionString methods have been deprecated in OptionHandler
- interface implemented by most log4j components. [*]
+ interface which is implemented by most log4j components. [*]
+ - The stack trace of a throwable passed in a logging statement is not
+ parsed into a stack array which is serializable. This allows cascading of
+ log4j servers to properly propagate throwable information. [*]
+
- In XML configuration files, the <configuration> element has been
deprecated and was replaced by the <log4j:configuration> element. [*]
The following perl command can help to migrate:
perl -p -i.bak -e "s/configuration/log4j:configuration/;" file1.xml .. fileN.xml
+
+ - The "log4j.configDebug" system property has been replaced with the
+ "log4j.debug" system property altough it is still available.
+ Similarly, the "configDebug" attribute has been deprecated and
+ replaced with the "debug" attribute in log4j.dtd. [*]
February 23, 2001
1.9 +1 -1 jakarta-log4j/docs/documentation.html
Index: documentation.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/documentation.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- documentation.html 2001/04/17 19:59:19 1.8
+++ documentation.html 2001/04/17 22:32:17 1.9
@@ -121,7 +121,7 @@
<p>
<li>
- <a href="../javadoc/index.html"><b>javadoc documentation</b></a>,
+ <a href="api/index.html"><b>javadoc documentation</b></a>,
</li>
</p>
1.17 +1 -1 jakarta-log4j/docs/download.html
Index: download.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/download.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- download.html 2001/04/17 19:59:19 1.16
+++ download.html 2001/04/17 22:32:19 1.17
@@ -117,7 +117,7 @@
online.</p>
<p>This release candidate should be
sanctioned as the official 1.1
release after a short period of probation.</p>
- <p>Version 1.1b2 is the 21th major
public release of log4j. It is 100%
+ <p>Version 1.1b2 is the 21st major
public release of log4j. It is 100%
backward compatible with log4j version 1.0.x.</p>
<p>We also maintain a list of <a
href="earlier.html">earlier
versions</a> of log4j for download, intended for the curious
1.25 +6 -7 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Category.java 2001/03/28 16:30:23 1.24
+++ Category.java 2001/04/17 22:32:22 1.25
@@ -457,11 +457,11 @@
}
/**
- Get the appenders contained in this category as an
- Enumeration.
+ Get the appenders contained in this category as an {@link
+ Enumeration}. If no appenders can be found, then a {@link NullEnumeration}
+ is returned.
- @return Enumeration An enumeration of the appenders in this category.
- */
+ @return Enumeration An enumeration of the appenders in this category. */
public
Enumeration getAllAppenders() {
if(aai == null)
@@ -473,9 +473,8 @@
/**
Look for the appender named as <code>name</code>.
- <p>Return the appender with that name if in the list. Return null
- otherwise.
- */
+ <p>Return the appender with that name if in the list. Return
+ <code>null</code> otherwise. */
public
Appender getAppender(String name) {
if(aai == null || name == null)
1.19 +7 -1
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PropertyConfigurator.java 2001/03/20 16:05:35 1.18
+++ PropertyConfigurator.java 2001/04/17 22:32:23 1.19
@@ -377,7 +377,13 @@
public
void doConfigure(Properties properties, Hierarchy hierarchy) {
- String value = properties.getProperty(LogLog.CONFIG_DEBUG_KEY);
+ String value = properties.getProperty(LogLog.DEBUG_KEY);
+ if(value == null) {
+ value = properties.getProperty(LogLog.CONFIG_DEBUG_KEY);
+ if(value != null)
+ LogLog.warn("[log4j.configDebug] is deprecated. Use [log4j.debug] instead.");
+ }
+
if(value != null) {
LogLog.setInternalDebugging(OptionConverter.toBoolean(value, true));
}
1.9 +5 -5 jakarta-log4j/src/java/org/apache/log4j/RollingFileAppender.java
Index: RollingFileAppender.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/RollingFileAppender.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RollingFileAppender.java 2001/04/03 16:37:10 1.8
+++ RollingFileAppender.java 2001/04/17 22:32:24 1.9
@@ -153,14 +153,14 @@
return maxBackupIndex;
}
- /**
+ /*
Set the maximum size that the output file is allowed to reach
before being rolled over to backup files.
*/
- public
- void setMaxFileSize(long maxFileSize) {
- this.maxFileSize = maxFileSize;
- }
+ //public
+ //void setMaxFileSize(long maxFileSize) {
+ //this.maxFileSize = maxFileSize;
+ //}
/**
Set the maximum size that the output file is allowed to reach
1.5 +7 -4
jakarta-log4j/src/java/org/apache/log4j/config/PropertySetter.java
Index: PropertySetter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/config/PropertySetter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PropertySetter.java 2001/04/17 19:59:28 1.4
+++ PropertySetter.java 2001/04/17 22:32:29 1.5
@@ -145,6 +145,8 @@
name = Introspector.decapitalize(name);
PropertyDescriptor prop = getPropertyDescriptor(name);
+ //LogLog.debug("---------Key: "+name+", type="+prop.getPropertyType());
+
if (prop == null) {
LogLog.warn("No such property [" + name + "] in "+
obj.getClass().getName()+"." );
@@ -153,7 +155,7 @@
setProperty(prop, name, value);
} catch (PropertySetterException ex) {
LogLog.warn("Failed to set property " + name +
- " to value \"" + value + "\": " + ex.getMessage());
+ " to value \"" + value + "\". " + ex.getMessage());
}
}
}
@@ -182,13 +184,14 @@
try {
arg = convertArg(value, paramTypes[0]);
} catch (Throwable t) {
- throw new PropertySetterException(t);
+ throw new PropertySetterException("Conversion to type ["+paramTypes[0]+
+ "] failed. Reason: "+t);
}
if (arg == null) {
throw new PropertySetterException(
- "Unknown property type: "+ paramTypes[0]);
+ "Conversion to type ["+paramTypes[0]+"] failed.");
}
- LogLog.debug("Setting property " + name + ": " + arg);
+ LogLog.debug("Setting property [" + name + "] to [" +arg+"].");
try {
setter.invoke(obj, new Object[] { arg });
} catch (Exception ex) {
1.7 +28 -10 jakarta-log4j/src/java/org/apache/log4j/helpers/LogLog.java
Index: LogLog.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/LogLog.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogLog.java 2001/03/20 16:05:44 1.6
+++ LogLog.java 2001/04/17 22:32:31 1.7
@@ -25,18 +25,30 @@
@author Ceki Gülcü
*/
public class LogLog {
+
+ /**
+ Defining this value makes log4j print log4j-internal debug
+ statements to <code>System.out</code>.
+
+ <p> The value of this string is <b>log4j.debug</b>.
+
+ <p>Note that the search for all option names is case sensitive. */
+ public static final String DEBUG_KEY="log4j.debug";
+
/**
- Defining this value makes configurators print debug statements to
- <code>System.out</code> while parsing configuration files.
+ Defining this value makes log4j components print log4j-internal
+ debug statements to <code>System.out</code>.
<p> The value of this string is <b>log4j.configDebug</b>.
- <p>Note that the search for all option names is case sensitive.
+ <p>Note that the search for all option names is case sensitive.
+
+ @deprecated Use {@link #DEBUG_KEY} instead.
*/
public static final String CONFIG_DEBUG_KEY="log4j.configDebug";
- protected static boolean configDebugEnabled = false;
+ protected static boolean debugEnabled = false;
/**
In quietMode not even errors generate any output.
@@ -48,9 +60,15 @@
private static final String WARN_PREFIX = "log4j:WARN ";
static {
- String key = OptionConverter.getSystemProperty(CONFIG_DEBUG_KEY, null);
- if(key != null)
- configDebugEnabled = OptionConverter.toBoolean(key, true);
+ String key = OptionConverter.getSystemProperty(DEBUG_KEY, null);
+
+ if(key == null) {
+ key = OptionConverter.getSystemProperty(CONFIG_DEBUG_KEY, null);
+ }
+
+ if(key != null) {
+ debugEnabled = OptionConverter.toBoolean(key, true);
+ }
}
/**
@@ -59,7 +77,7 @@
static
public
void setInternalDebugging(boolean enabled) {
- configDebugEnabled = enabled;
+ debugEnabled = enabled;
}
/**
@@ -69,7 +87,7 @@
public
static
void debug(String msg) {
- if(configDebugEnabled && !quietMode) {
+ if(debugEnabled && !quietMode) {
System.out.println(PREFIX+msg);
}
}
@@ -81,7 +99,7 @@
public
static
void debug(String msg, Throwable t) {
- if(configDebugEnabled && !quietMode) {
+ if(debugEnabled && !quietMode) {
System.out.println(PREFIX+msg);
if(t != null)
t.printStackTrace(System.out);
1.16 +6 -6
jakarta-log4j/src/java/org/apache/log4j/helpers/OptionConverter.java
Index: OptionConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/OptionConverter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- OptionConverter.java 2001/04/17 19:59:31 1.15
+++ OptionConverter.java 2001/04/17 22:32:32 1.16
@@ -207,21 +207,21 @@
result = (Priority) o;
} catch(ClassNotFoundException e) {
- LogLog.error("custom priority class [" + clazz + "] not found.");
+ LogLog.warn("custom priority class [" + clazz + "] not found.");
} catch(NoSuchMethodException e) {
- LogLog.error("custom priority class [" + clazz + "]"
+ LogLog.warn("custom priority class [" + clazz + "]"
+ " does not have a constructor which takes one string parameter", e);
} catch(java.lang.reflect.InvocationTargetException e) {
- LogLog.error("custom priority class [" + clazz + "]"
+ LogLog.warn("custom priority class [" + clazz + "]"
+ " could not be instantiated", e);
} catch(ClassCastException e) {
- LogLog.error("class [" + clazz
+ LogLog.warn("class [" + clazz
+ "] is not a subclass of org.apache.log4j.Priority", e);
} catch(IllegalAccessException e) {
- LogLog.error("class ["+clazz+
+ LogLog.warn("class ["+clazz+
"] cannot be instantiated due to access restrictions", e);
} catch(Exception e) {
- LogLog.error("class ["+clazz+"], priority ["+priorityName+
+ LogLog.warn("class ["+clazz+"], priority ["+priorityName+
"] conversion failed.", e);
}
return result;
1.11 +5 -2 jakarta-log4j/src/java/org/apache/log4j/net/SyslogAppender.java
Index: SyslogAppender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SyslogAppender.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SyslogAppender.java 2001/04/03 16:37:25 1.10
+++ SyslogAppender.java 2001/04/17 22:32:35 1.11
@@ -260,6 +260,9 @@
public
static
int getFacility(String facilityName) {
+ if(facilityName != null) {
+ facilityName = facilityName.trim();
+ }
if("KERN".equalsIgnoreCase(facilityName)) {
return LOG_KERN;
} else if("USER".equalsIgnoreCase(facilityName)) {
@@ -397,8 +400,8 @@
syslogFacility = getFacility(facilityName);
if (syslogFacility == -1) {
- System.err.println(facilityName +
- " is an unknown syslog facility. Defaulting to \"USER\".");
+ System.err.println("["+facilityName +
+ "] is an unknown syslog facility. Defaulting to [USER].");
syslogFacility = LOG_USER;
}
1.7 +8 -8 jakarta-log4j/src/java/org/apache/log4j/test/confParsing
Index: confParsing
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/confParsing,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- confParsing 2001/03/19 12:38:20 1.6
+++ confParsing 2001/04/17 22:32:38 1.7
@@ -130,7 +130,7 @@
D_FLAG=""
echo "18:25:32,394 [main] DEBUG testing - HELLO WORLD" > $TEMP
echo "log4j.rootCategory= DEBUG , testAppender" > $LCF
- lecho "log4j.configDebug="
+ lecho "log4j.debug="
lecho "log4j.appender.testAppender=org.apache.log4j.RollingFileAppender"
lecho "log4j.appender.testAppender.File=$TEMP"
lecho "log4j.appender.testAppender.Append= true"
@@ -146,7 +146,7 @@
if [ $TEST -ge $start ]; then
D_FLAG=""
echo "log4j.rootCategory= , testAppender" > $LCF
- lecho "log4j.configDebug="
+ lecho "log4j.debug="
lecho "log4j.appender.testAppender=org.apache.log4j.FileAppender"
lecho "log4j.appender.testAppender.File=$TEMP"
lecho "log4j.appender.testAppender.Append= false "
@@ -163,7 +163,7 @@
D_FLAG=""
echo "18:25:32,394 [main] DEBUG testing - HELLO WORLD" > $TEMP
echo "log4j.rootCategory= DEBUG , testAppender, inexistentAppender" > $LCF
- lecho "log4j.configDebug=false"
+ lecho "log4j.debug=false"
lecho "log4j.appender.testAppender=org.apache.log4j.RollingFileAppender"
lecho "log4j.appender.testAppender.File=$TEMP"
lecho "log4j.appender.testAppender.Append= true"
@@ -181,7 +181,7 @@
if [ $TEST -ge $start ]; then
D_FLAG=""
echo "log4j.rootCategory= DEBUG , testAppender" > $LCF
- lecho "log4j.configDebug=false"
+ lecho "log4j.debug=false"
lecho "log4j.appender.testAppender=org.apache.log4j.FileAppender"
# Note the spaces
lecho "log4j.appender.testAppender.File=System.out "
@@ -195,7 +195,7 @@
if [ $TEST -ge $start ]; then
D_FLAG=""
echo "log4j.rootCategory= DEBUG , testAppender" > $LCF
- lecho "log4j.configDebug=false"
+ lecho "log4j.debug=false"
lecho "log4j.appender.testAppender=org.apache.log4j.ConsoleAppender"
lecho "log4j.appender.testAppender.Target= System.out "
# lecho "log4j.appender.testAppender.Append= true "
@@ -210,7 +210,7 @@
if [ $TEST -ge $start ]; then
D_FLAG=""
echo "log4j.rootCategory= DEBUG , testAppender" > $LCF
- lecho "log4j.configDebug=false"
+ lecho "log4j.debug=false"
lecho "log4j.appender.testAppender=org.apache.log4j.FileAppender"
# We escape the dollar sign to avoid substitution at the shell level.
lecho "log4j.appender.testAppender.File=\${user.dir}/$TEMP"
@@ -256,7 +256,7 @@
if [ $TEST -ge $start ]; then
D_FLAG=""
echo "log4j.rootCategory= , testAppender" > $LCF
- lecho "log4j.configDebug=true"
+ lecho "log4j.debug=true"
lecho "log4j.appender.testAppender=org.apache.log4j.net.SyslogAppender"
lecho "log4j.appender.testAppender.SyslogHost=localhost"
lecho "log4j.appender.testAppender.Facility= LOCAL0 "
@@ -275,7 +275,7 @@
if [ $TEST -ge $start ]; then
D_FLAG=""
echo "log4j.rootCategory= , testAppender" > $LCF
- lecho "log4j.configDebug=true"
+ lecho "log4j.debug=true"
lecho "log4j.appender.testAppender=org.apache.log4j.net.SyslogAppender"
lecho "log4j.appender.testAppender.SyslogHost=localhost"
lecho "log4j.appender.testAppender.Facility="
1.15 +17 -7 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DOMConfigurator.java 2001/04/17 17:14:20 1.14
+++ DOMConfigurator.java 2001/04/17 22:32:42 1.15
@@ -77,6 +77,7 @@
static final String DISABLE_OVERRIDE_ATTR = "disableOverride";
static final String DISABLE_ATTR = "disable";
static final String CONFIG_DEBUG_ATTR = "configDebug";
+ static final String INTERNAL_DEBUG_ATTR = "debug";
static final String RENDERING_CLASS_ATTR = "renderingClass";
static final String RENDERED_CLASS_ATTR = "renderedClass";
@@ -607,17 +608,25 @@
}
}
- String confDebug = subst(element.getAttribute(CONFIG_DEBUG_ATTR));
- LogLog.debug("configDebug attribute= \"" + confDebug +"\".");
+ String debugAttrib = subst(element.getAttribute(INTERNAL_DEBUG_ATTR));
+
+ LogLog.debug("debug attribute= \"" + debugAttrib +"\".");
// if the log4j.dtd is not specified in the XML file, then the
- // configDebug attribute is returned as the empty string when it
- // is not specified in the XML file.
+ // "debug" attribute is returned as the empty string.
+ if(!debugAttrib.equals("") && !debugAttrib.equals("null")) {
+ LogLog.setInternalDebugging(OptionConverter.toBoolean(debugAttrib, true));
+ }
+ else
+ LogLog.debug("Ignoring " + INTERNAL_DEBUG_ATTR + " attribute.");
+
+
+ String confDebug = subst(element.getAttribute(CONFIG_DEBUG_ATTR));
if(!confDebug.equals("") && !confDebug.equals("null")) {
+ LogLog.warn("The \""+CONFIG_DEBUG_ATTR+"\" attribute is deprecated.");
+ LogLog.warn("Use the \""+INTERNAL_DEBUG_ATTR+"\" attribute instead.");
LogLog.setInternalDebugging(OptionConverter.toBoolean(confDebug, true));
}
- else
- LogLog.debug("Ignoring " + CONFIG_DEBUG_ATTR + " attribute.");
-
+
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
@@ -659,6 +668,7 @@
}
}
}
+
protected
String subst(String value) {
1.6 +7 -5 jakarta-log4j/src/java/org/apache/log4j/xml/log4j.dtd
Index: log4j.dtd
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/log4j.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- log4j.dtd 2001/04/13 00:01:18 1.5
+++ log4j.dtd 2001/04/17 22:32:42 1.6
@@ -19,16 +19,18 @@
<!-- By default, disableOverride is "null", meaning that we -->
<!-- do not touch the disable flag. -->
-<!-- Setting the configDebug attribute enables the printing of -->
-<!-- internal log4j statements from within configurators. -->
+<!-- Setting the "debug" or "configDebug" attributes enable the printing -->
+<!-- of internal log4j logging statements. -->
+<!-- The "debug" and "configDebug" attributes are equivalent altough -->
+<!-- the latter is deprecated and should no longer be used. -->
+<!-- By default, debug and configDebug attributes are "null", meaning -->
+<!-- that we not touch internal log4j logging settings. -->
-<!-- By default, configDebug is "null", meaning that we not touch the -->
-<!-- the configDebug variable. -->
-
<!ATTLIST log4j:configuration
disable (debug|info|warn|error|fatal|null) "null"
disableOverride (true|false|null) "null"
+ debug (true|false|null) "null"
configDebug (true|false|null) "null"
>
1.4 +1 -1 jakarta-log4j/src/xdocs/documentation.xml
Index: documentation.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/documentation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- documentation.xml 2001/01/11 19:48:45 1.3
+++ documentation.xml 2001/04/17 22:32:46 1.4
@@ -21,7 +21,7 @@
<p>
<li>
- <a href="../javadoc/index.html"><b>javadoc documentation</b></a>,
+ <a href="api/index.html"><b>javadoc documentation</b></a>,
</li>
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
