ceki 2003/02/18 08:50:13
Modified: . Tag: v1_2-branch build.xml
docs Tag: v1_2-branch HISTORY manual.html
src/java/org/apache/log4j/helpers Tag: v1_2-branch
Transform.java
src/java/org/apache/log4j/net Tag: v1_2-branch
SocketAppender.java
src/java/org/apache/log4j/test/witness Tag: v1_2-branch
getOptions.1
src/xdocs Tag: v1_2-branch documentation.xml download.xml
Log:
- Fixed bug #11570 whereby XMLAppender would throw a
NullPointerException if the input message was null. Many thanks to
David Vandegrift for reporting the bug and to Hendrik Brummermann for
supplying the patch. [*]
- Fixed bug #12366 whereby various versions of Xerces would not parse
log4j configuration scripts expressed in XML format. [*]
- Fixed bug #15599. SocketAppender now honors ReconnectionDelay of 0.
Many thanks to Scott Schram for reporting the bug and providing the fix. [*]
Revision Changes Path
No revision
No revision
1.34.2.10 +1 -1 jakarta-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.xml,v
retrieving revision 1.34.2.9
retrieving revision 1.34.2.10
diff -u -r1.34.2.9 -r1.34.2.10
--- build.xml 9 Oct 2002 20:38:24 -0000 1.34.2.9
+++ build.xml 18 Feb 2003 16:50:11 -0000 1.34.2.10
@@ -17,7 +17,7 @@
<!-- prefixed with "env". -->
<property environment="env"/>
- <property name="version" value="1.2.7"/>
+ <property name="version" value="1.2.8"/>
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
No revision
No revision
1.97.2.15 +17 -0 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.97.2.14
retrieving revision 1.97.2.15
diff -u -r1.97.2.14 -r1.97.2.15
--- HISTORY 9 Oct 2002 20:38:25 -0000 1.97.2.14
+++ HISTORY 18 Feb 2003 16:50:11 -0000 1.97.2.15
@@ -5,6 +5,23 @@
client code.
[***] Changes requiring important modifications to existing client code.
+ - February 18th, 2003
+
+http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11570
+
+
+XML Appender throws NullPointerException when logging null
+
+ - Fixed bug #11570 whereby XMLAppender would throw a
+ NullPointerException if the input message was null. Many thanks to
+ David Vandegrift for reporting the bug and to Hendrik Brummermann for
+ supplying the patch. [*]
+
+ - Fixed bug #12366 whereby various versions of Xerces would not parse
+ log4j configuration scripts expressed in XML format. [*]
+
+ - Fixed bug #15599. SocketAppender now honors ReconnectionDelay of 0.
+ Many thanks to Scott Schram for reporting the bug and providing the fix. [*]
October 9th, 2002
1.33.2.3 +6 -5 jakarta-log4j/docs/manual.html
Index: manual.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/manual.html,v
retrieving revision 1.33.2.2
retrieving revision 1.33.2.3
diff -u -r1.33.2.2 -r1.33.2.3
--- manual.html 24 May 2002 12:58:43 -0000 1.33.2.2
+++ manual.html 18 Feb 2003 16:50:12 -0000 1.33.2.3
@@ -22,11 +22,12 @@
distribution. This document is based on the article <a
href="http://www.javaworld.com/jw-11-2000/jw-1122-log4j.html";>"Log4j
delivers control over logging"</a> published in November 2000
- edition of <a
- href="http://www.javaworld.com";>JavaWorld</a>. However, the
- present article contains more detailed and up to date
- information. The short manual also borrows some text from the
- book "log4j: the Manual" by the same author (yours truly).
+ edition of JavaWorld. However, the present article contains more
+ detailed and up to date information. The present short manual
+ also borrows some text from <a
+
href="http://www.flashline.com/components/view.jsp?prodid=4702&affiliateid=657173";>
+ "<em>The complete log4j manual</em>"</a> by the same author
+ (yours truly).
<h2>Abstract</h2>
No revision
No revision
1.1.2.2 +5 -1 jakarta-log4j/src/java/org/apache/log4j/helpers/Transform.java
Index: Transform.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/Transform.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Transform.java 11 Jun 2002 13:20:05 -0000 1.1.2.1
+++ Transform.java 18 Feb 2003 16:50:12 -0000 1.1.2.2
@@ -71,8 +71,12 @@
* @param str The String that is inserted into an existing CDATA Section within
buf.
* */
static public void appendEscapingCDATA(StringBuffer buf, String str) {
- int end = str.indexOf(CDATA_END);
+ if(str == null) {
+ buf.append("");
+ return;
+ }
+ int end = str.indexOf(CDATA_END);
if (end < 0) {
buf.append(str);
return;
No revision
No revision
1.12.2.2 +8 -3 jakarta-log4j/src/java/org/apache/log4j/net/SocketAppender.java
Index: SocketAppender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SocketAppender.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- SocketAppender.java 5 Jul 2002 11:08:19 -0000 1.12.2.1
+++ SocketAppender.java 18 Feb 2003 16:50:13 -0000 1.12.2.2
@@ -194,9 +194,14 @@
cleanUp();
oos = new ObjectOutputStream(new Socket(address, port).getOutputStream());
} catch(IOException e) {
- LogLog.error("Could not connect to remote log4j server at ["
- +address.getHostName()+"]. We will try again later.", e);
- fireConnector();
+
+ String msg = "Could not connect to remote log4j server at ["
+ +address.getHostName()+"].";
+ if(reconnectionDelay > 0) {
+ msg += " We will try again later.";
+ fireConnector(); // fire the connector thread
+ }
+ LogLog.error(msg, e);
}
}
No revision
No revision
1.7.2.1 +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.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- getOptions.1 28 Sep 2001 13:28:46 -0000 1.7
+++ getOptions.1 18 Feb 2003 16:50:13 -0000 1.7.2.1
@@ -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.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
No revision
No revision
1.15.2.6 +25 -6 jakarta-log4j/src/xdocs/documentation.xml
Index: documentation.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/documentation.xml,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -u -r1.15.2.5 -r1.15.2.6
--- documentation.xml 9 Oct 2002 20:38:26 -0000 1.15.2.5
+++ documentation.xml 18 Feb 2003 16:50:13 -0000 1.15.2.6
@@ -10,18 +10,22 @@
<section name="Official log4j documentation">
- <p>The following documentation is included with the standard log4j
- distribution and also browsable online:</p>
+ <p>With the exception of the complete manual, the following
+ documentation is included with the standard log4j distribution
+ and also browsable online:
+ </p>
<ul>
<p>
- <a
href="http://www.flashline.com/components/view.jsp?prodid=4702&affiliateid=657173";><img
align="right" src="images/coverSmall.png"></img></a>
- <li><a href="manual.html"><b>short manual</b></a>,
+ <a
+ href="https://www.qos.ch/shop/products/clm_t.jsp";><img
+ align="right" src="images/coverSmall.png"></img></a> <li><a
+ href="manual.html"><b>short manual</b></a>,
</li>
</p>
<p>
- <li><a
href="http://www.flashline.com/components/view.jsp?prodid=4702&affiliateid=657173";><b>complete
manual</b></a> (commercial),
+ <li><a href="https://www.qos.ch/shop/products/clm_t.jsp";><b>complete
manual</b></a> (commercial),
</li>
</p>
@@ -72,6 +76,9 @@
Build Flexible Logs With log4j</a> by Vikram Goyal
</li></p>
+ <p><li><a
+
href="http://supportweb.cs.bham.ac.uk/documentation/tutorials/docsystem/build/tutorials/log4j/log4j.html";>log4j</a>
+ by Ashley J.S Mills, University Of Birmingham</li></p>
<p><li><a
href="http://www.builder.com.com/article.jhtml?id=u00820020124kev01.htm";>
Add logging to your Java Applications</a> by Kevin Brown
@@ -94,7 +101,19 @@
</li></p>
- </ul>
+ <p><li> <a href="http://qos.ch/logging/sc.html";>Supporting the
+ log4j <code>RepositorySelector</code></a> by Ceki
+ Gülcü
+ </li></p>
+
+ <p><li> <a href="http://rei1.m-plify.com/log4j/";>Log4j class
+ diagrams</a>, courtesy of David Tonhofer
+ </li>
+ </p>
+
+ <p><li> <a href="http://www.jug-l.org/log4j.html";>Advanced
+ Log4j</a> Louisville JUG presentation by Jonathan Cowherd </li></p>
+ </ul>
<p>If you would like your log4j-relateed article to be listed
here, then please send a note to the <a
1.53.2.13 +21 -27 jakarta-log4j/src/xdocs/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/download.xml,v
retrieving revision 1.53.2.12
retrieving revision 1.53.2.13
diff -u -r1.53.2.12 -r1.53.2.13
--- download.xml 9 Oct 2002 20:38:26 -0000 1.53.2.12
+++ download.xml 18 Feb 2003 16:50:13 -0000 1.53.2.13
@@ -9,14 +9,14 @@
<meta name="keywords" content="java, logging, tracing, component, framework, API,
log4j"/>
<body>
- <section name="log4j version 1.2.7">
- <p>log4j 1.2.7 is available in <a
- href="../jakarta-log4j-1.2.7.tar.gz"><b>TAR.GZ</b></a> format
- or in <a href="../jakarta-log4j-1.2.7.zip"><b>ZIP</b></a>
+ <section name="log4j version 1.2.8">
+ <p>log4j 1.2.8 is available in <a
+ href="../jakarta-log4j-1.2.8.tar.gz"><b>TAR.GZ</b></a> format
+ or in <a href="../jakarta-log4j-1.2.8.zip"><b>ZIP</b></a>
format.
</p>
- <p>As of release 1.2.7 log4j now searches for the file log4j.xml
+ <p>As of release 1.2.8 log4j now searches for the file log4j.xml
as well as the file log4j.properties during
initialization. See the <a href="HISTORY">HISTORY</a> file for
the firther details.
@@ -42,14 +42,15 @@
renaming of the <code>CategoryFactory</code> class to
<code>LoggerFactory</code> class such that subclasses of
<code>Category</code> class must be modified and
- recompiled. By the way, <b>we strongly discourage casual users
- from subclassing the <code>Category</code> or
- <code>Logger</code> classes.</b>
+ recompiled. <em>The recommended pattern for extending the
+ <code>Logger</code> class is wrapping. Moreover, we strongly
+ discourage casual users from subclassing the
+ <code>Category</code> or <code>Logger</code> classes. </em>
</p>
<p>We also maintain a list of <a href="earlier.html">earlier
versions</a> of log4j for download, intended for the curious
- paleontologist -- there seems to be thousands of them!
+ paleontologist -- there seems to be quite a few of them!
</p>
@@ -76,33 +77,26 @@
<!--
============================================================================== -->
- <dt><a href="http://www.japhy.de/configLog4j";><b>configLog4j</b></a></dt>
+<!-- <dt><a href="http://www.japhy.de/configLog4j";><b>configLog4j</b></a></dt>
<dd>A graphical log4j configuration editor by Tobias
Dezulian.</dd>
-
+-->
<!--
============================================================================== -->
<dt>
<a
- href="http://support.klopotek.de/log4j/jdbc/index.html";><b>JDBCAppender</b></a>
+ href="http://www.mannhaupt.com/danko/projects/";><b>JDBCAppender</b></a>
+ </dt>
- </dt> <dd>A <code>JDBCAppender</code> by <a
- href="mailto:[EMAIL PROTECTED]";>Thomas Fenner</a>. Note
- that log4j 1.2 ships with another <code>JDBCAppender</code>
- written by Kevin Steppe.
+ <dd>A powerful <code>JDBCAppender</code> by Danko Mannhaupt
+ who continues the work of Thomas Fenner. You might find
+ this JDBCAppender more suitable then the one that ships with
+ log4j 1.2.
</dd>
<!--
============================================================================== -->
- <dt><a
- href="http://developer.jini.org/exchange/projects/log";><b>JINI
- logging service</b></a> (registration required)</dt>
-
- <dd>A log4j wrapper for JINI by Jerome Bernard.</dd>
-
- <!--
============================================================================== -->
-
<dt><a href="http://qos.ch/";><b>log4j<em>ME</em></b></a></dt>
<dd>Log4j<em>ME</em>, or log4j MiniEdition, is based on the
@@ -139,9 +133,9 @@
</dt>
<dd>Another full-featured graphical log viewer. After a merger
- with a service-orinted company and a change in
- business-orientation, the owners of LogFactor5 have decided
- to donate their product to the log4j project.
+ and the subsequent change in business-orientation, the
+ owners of LogFactor5 have decided to donate their product to
+ the log4j project.
</dd>
<!--
============================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
