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/05/09 21:40:08 UTC
cvs commit: jakarta-log4j/src/xdocs download.xml
ceki 01/05/09 12:40:07
Modified: docs HISTORY
src/java/org/apache/log4j/test pattern
src/java/org/apache/log4j/test/witness pattern.15
src/java/org/apache/log4j/xml DOMConfigurator.java
src/xdocs download.xml
Log:
Fixed bug 1686.
Revision Changes Path
1.46 +17 -0 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- HISTORY 2001/04/26 17:30:58 1.45
+++ HISTORY 2001/05/09 19:39:49 1.46
@@ -5,6 +5,23 @@
client code.
[***] Changes requiring important modifications to existing client code.
+ May 9, 2001
+
+ - Release of version 1.1b7
+
+ - Made BasicConfigurator disable methods static as they were in log4j
+ 1.0.4. Thanks to Francisco Marin for reporting the bug. [*]
+
+ - Corrected a two related deadlock problems introduced while fixing
+ bug 1505. Thanks to joelr@viair.com for reporting the problem. [*]
+
+ - The configureAndWatch methods in Configurators did not close the
+ configuration file, preventing its editing. See bug 1686. [*]
+
+ - In DOMConfigurator.setParameter special charater conversion now
+ preceeds variable substitution. This change was suggested by Steven
+ Velez. The vast majority of users should be oblivious to it. [*]
+
April 26, 2001
- Release of version 1.1b6
1.5 +9 -9 jakarta-log4j/src/java/org/apache/log4j/test/pattern
Index: pattern
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/pattern,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pattern 2001/02/13 21:18:43 1.4
+++ pattern 2001/05/09 19:39:54 1.5
@@ -185,12 +185,12 @@
testPattern NONE
fi
-TEST=15
-if [ $TEST -ge $start ]; then
- echo "log4j.rootCategory=DEBUG, testAppender" > $LCF
- lecho "log4j.appender.testAppender=org.apache.log4j.FileAppender"
- lecho "log4j.appender.testAppender.File= $TEMP "
- lecho "log4j.appender.testAppender.Append=false"
- lecho "log4j.appender.testAppender.layout=org.apache.log4j.HTMLLayout"
- testPattern HTML
-fi
+#TEST=15
+#if [ $TEST -ge $start ]; then
+# echo "log4j.rootCategory=DEBUG, testAppender" > $LCF
+# lecho "log4j.appender.testAppender=org.apache.log4j.FileAppender"
+# lecho "log4j.appender.testAppender.File= $TEMP "
+# lecho "log4j.appender.testAppender.Append=false"
+# lecho "log4j.appender.testAppender.layout=org.apache.log4j.HTMLLayout"
+# testPattern HTML
+#fi
1.3 +156 -134 jakarta-log4j/src/java/org/apache/log4j/test/witness/pattern.15
Index: pattern.15
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/witness/pattern.15,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pattern.15 2001/03/28 16:30:34 1.2
+++ pattern.15 2001/05/09 19:39:58 1.3
@@ -1,204 +1,226 @@
-<html><body>
-<table border="1" cellpadding="2">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>Log4J Log Messages</title>
+<style type="text/css">
+<!--
+body, table {font-family: arial,sans-serif; font-size: x-small;}
+th {background: #336699; color: #FFFFFF; text-align: left;}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF" topmargin="6" leftmargin="6">
+<hr size="1" noshade>
+Log session start time Wed May 09 21:32:04 GMT+02:00 2001<br>
+<br>
+<table cellspacing="0" cellpadding="4" border="1" bordercolor="#224466" width="100%">
<tr>
-<th>Time</th><th>Thread</th><th>Priority</th><th>Category</th><th>NDC</th><th>Message</th></tr>
+<th>Time</th>
+<th>Thread</th>
+<th>Priority</th>
+<th>Category</th>
+<th>Message</th>
+</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td>DEBUG</td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 0</td>
+<tr>
+<td>0</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#339933">DEBUG</font></td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 0</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td>DEBUG</td>
-<td>root</td>
-<td>null</td>
-<td>Message 0</td>
+<tr>
+<td>10</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#339933">DEBUG</font></td>
+<td title="root category">root</td>
+<td title="Message">Message 0</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td>INFO</td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 1</td>
+<tr>
+<td>10</td>
+<td title="main thread">main</td>
+<td title="Priority">INFO</td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 1</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td>INFO</td>
-<td>root</td>
-<td>null</td>
-<td>Message 1</td>
+<tr>
+<td>10</td>
+<td title="main thread">main</td>
+<td title="Priority">INFO</td>
+<td title="root category">root</td>
+<td title="Message">Message 1</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">WARN</font></td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 2</td>
+<tr>
+<td>10</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>WARN</strong></font></td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 2</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">WARN</font></td>
-<td>root</td>
-<td>null</td>
-<td>Message 2</td>
+<tr>
+<td>10</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>WARN</strong></font></td>
+<td title="root category">root</td>
+<td title="Message">Message 2</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">ERROR</font></td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 3</td>
+<tr>
+<td>10</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>ERROR</strong></font></td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 3</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">ERROR</font></td>
-<td>root</td>
-<td>null</td>
-<td>Message 3</td>
+<tr>
+<td>20</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>ERROR</strong></font></td>
+<td title="root category">root</td>
+<td title="Message">Message 3</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">FATAL</font></td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 4</td>
+<tr>
+<td>30</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>FATAL</strong></font></td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 4</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">FATAL</font></td>
-<td>root</td>
-<td>null</td>
-<td>Message 4</td>
+<tr>
+<td>30</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>FATAL</strong></font></td>
+<td title="root category">root</td>
+<td title="Message">Message 4</td>
</tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td>DEBUG</td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 5</td>
+<tr>
+<td>30</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#339933">DEBUG</font></td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 5</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
</td></tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td>DEBUG</td>
-<td>root</td>
-<td>null</td>
-<td>Message 5</td>
+<tr>
+<td>40</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#339933">DEBUG</font></td>
+<td title="root category">root</td>
+<td title="Message">Message 5</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
</td></tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td>INFO</td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 6</td>
+<tr>
+<td>40</td>
+<td title="main thread">main</td>
+<td title="Priority">INFO</td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 6</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
</td></tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td>INFO</td>
-<td>root</td>
-<td>null</td>
-<td>Message 6</td>
+<tr>
+<td>40</td>
+<td title="main thread">main</td>
+<td title="Priority">INFO</td>
+<td title="root category">root</td>
+<td title="Message">Message 6</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
</td></tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">WARN</font></td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 7</td>
+<tr>
+<td>40</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>WARN</strong></font></td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 7</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
</td></tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">WARN</font></td>
-<td>root</td>
-<td>null</td>
-<td>Message 7</td>
+<tr>
+<td>40</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>WARN</strong></font></td>
+<td title="root category">root</td>
+<td title="Message">Message 7</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
</td></tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">ERROR</font></td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 8</td>
+<tr>
+<td>40</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>ERROR</strong></font></td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 8</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
</td></tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">ERROR</font></td>
-<td>root</td>
-<td>null</td>
-<td>Message 8</td>
+<tr>
+<td>40</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>ERROR</strong></font></td>
+<td title="root category">root</td>
+<td title="Message">Message 8</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
</td></tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">FATAL</font></td>
-<td>org.apache.log4j.test.PatternTest</td>
-<td>null</td>
-<td>Message 9</td>
+<tr>
+<td>40</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>FATAL</strong></font></td>
+<td title="org.apache.log4j.test.PatternTest category">org.apache.log4j.test.PatternTest</td>
+<td title="Message">Message 9</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
</td></tr>
-<tr><td>XXX</td>
-<td>main</td>
-<td><font color="#FF0000">FATAL</font></td>
-<td>root</td>
-<td>null</td>
-<td>Message 9</td>
+<tr>
+<td>40</td>
+<td title="main thread">main</td>
+<td title="Priority"><font color="#993300"><strong>FATAL</strong></font></td>
+<td title="root category">root</td>
+<td title="Message">Message 9</td>
</tr>
-<tr><td colspan="7">java.lang.Exception: Just testing
+<tr><td bgcolor="#993300" style="color:White; font-size : xx-small;" colspan="6">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)
<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)
-</td></tr></table></body></html>
\ No newline at end of file
+</td></tr>
+</table>
+<br>
+</body></html>
\ No newline at end of file
1.18 +11 -3 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DOMConfigurator.java 2001/04/26 17:31:06 1.17
+++ DOMConfigurator.java 2001/05/09 19:40:02 1.18
@@ -461,8 +461,9 @@
protected
void setParameter(Element elem, PropertySetter propSetter) {
String name = subst(elem.getAttribute(NAME_ATTR));
- String value = subst(elem.getAttribute(VALUE_ATTR));
- propSetter.setProperty(name, OptionConverter.convertSpecialChars(value));
+ String value = (elem.getAttribute(VALUE_ATTR));
+ value = subst(OptionConverter.convertSpecialChars(value));
+ propSetter.setProperty(name, value);
}
@@ -513,12 +514,19 @@
public
void doConfigure(String filename, Hierarchy hierarchy) {
+ FileInputStream fis = null;
try {
- doConfigure(new FileInputStream(filename), hierarchy);
+ fis = new FileInputStream(filename);
+ doConfigure(fis, hierarchy);
} catch(IOException e) {
LogLog.error("Could not open ["+filename+"].", e);
+ } finally {
+ if (fis != null) {
+ fis.close();
+ }
}
}
+
public
void doConfigure(URL url, Hierarchy hierarchy) {
1.19 +5 -5 jakarta-log4j/src/xdocs/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/download.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- download.xml 2001/04/26 17:31:06 1.18
+++ download.xml 2001/05/09 19:40:06 1.19
@@ -32,17 +32,17 @@
-->
-<section name="log4j version 1.1beta6 (final-release candidate)">
+<section name="log4j version 1.1beta7 (final-release candidate)">
-<p>Downlaod version 1.1beta6 (final-release candiate) including
+<p>Downlaod version 1.1beta7 (final-release candiate) including
<i>full source code</i>, class files and documentation in <a
-href="../jakarta-log4j-1.1b6.tar.gz"><b>TAR.GZ</b></a> format or in <a
-href="../jakarta-log4j-1.1b6.zip"><b>ZIP</b></a> format. You may elect
+href="../jakarta-log4j-1.1b7.tar.gz"><b>TAR.GZ</b></a> format or in <a
+href="../jakarta-log4j-1.1b7.zip"><b>ZIP</b></a> format. You may elect
to browse log4j <a href="documentation.html"><b>documentation</b></a>
online. This release candidate should be sanctioned as the official
1.1 release after a short period of probation.</p>
-<p>Version 1.1b6 is the 21st major public release of log4j. It is 100%
+<p>Version 1.1b7 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
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-cvs-help@jakarta.apache.org