ceki 02/05/24 05:58:44 Modified: docs Tag: v1_2-branch HISTORY manual.html src/java/org/apache/log4j Tag: v1_2-branch PropertyConfigurator.java src/java/org/apache/log4j/helpers Tag: v1_2-branch NullEnumeration.java SyslogWriter.java src/java/org/apache/log4j/spi Tag: v1_2-branch ThrowableInformation.java src/xdocs Tag: v1_2-branch download.xml Log: Minor documentation chages, one in particular to satisfy bug report #9291. Fixed bug #9285 where the SyslogAppender would incorrectly compute the length of the datagram to send to the remote syslogd host. Reported by Mamoru Kadota. Fixed bug #8505 where the stack trace of exception would not be properly printed on the Compaq tru64 Unix platform. [*]. Initially Reported by Fabrice Claes and later Espen H. Kolstad who also provided the fix. Release of version 1.2.3 is pending. Revision Changes Path No revision No revision 1.97.2.4 +16 -2 jakarta-log4j/docs/HISTORY Index: HISTORY =================================================================== RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v retrieving revision 1.97.2.3 retrieving revision 1.97.2.4 diff -u -r1.97.2.3 -r1.97.2.4 --- HISTORY 22 May 2002 17:15:18 -0000 1.97.2.3 +++ HISTORY 24 May 2002 12:58:42 -0000 1.97.2.4 @@ -5,9 +5,23 @@ client code. [***] Changes requiring important modifications to existing client code. + + May ??, 2002, + + - Release of version 1.2.3 + + - Fixed bug #9285 where the SyslogAppender would incorrectly compute + the length of the datagram to send to the remote syslogd host. + Reported by Mamoru Kadota. [*] + + - Fixed bug #8505 where the stack trace of exception would not be + properly printed on the Compaq tru64 Unix platform. [*]. Initially + Reported by Fabrice Claes and later Espen H. Kolstad who also + provided the fix. [*] + May 22nd, 2002 - - Relase of version 1.2.2 + - Release of version 1.2.2 - Log4j now configurators admit NULL as a valid level value. NULL has the same meaning as the previously available INHERITED value. Both @@ -21,7 +35,7 @@ May 17th, 2002 - - Relase of version 1.2.1 + - Release of version 1.2.1 - This minor release fixes bug #9155 reported by Nicko Cadell. LoggingEvent.getMDCCopy() method now sets mdcCopyLookupRequired 1.33.2.2 +3 -3 jakarta-log4j/docs/manual.html Index: manual.html =================================================================== RCS file: /home/cvs/jakarta-log4j/docs/manual.html,v retrieving revision 1.33.2.1 retrieving revision 1.33.2.2 diff -u -r1.33.2.1 -r1.33.2.2 --- manual.html 15 May 2002 16:08:29 -0000 1.33.2.1 +++ manual.html 24 May 2002 12:58:43 -0000 1.33.2.2 @@ -814,9 +814,9 @@ <ol> - <li>Skip default initialization if the system property - <b>log4j.defaultInitOverride</b> is set to any value other than - "false". + <li>Setting the <b>log4j.defaultInitOverride</b> system property to + any other value then "false" will cause log4j to skip the default + initialization procedure (this procedure). <p><li>Set the <code>resource</code> string variable to the value of the <b>log4j.configuration</b> system property. <em>The preferred No revision No revision 1.54.2.2 +5 -4 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.54.2.1 retrieving revision 1.54.2.2 diff -u -r1.54.2.1 -r1.54.2.2 --- PropertyConfigurator.java 22 May 2002 17:15:18 -0000 1.54.2.1 +++ PropertyConfigurator.java 24 May 2002 12:58:43 -0000 1.54.2.2 @@ -175,7 +175,7 @@ <p>For non-root categories the syntax is almost the same: <pre> - log4j.logger.logger_name=[level|INHERITED], appenderName, appenderName, ... + log4j.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ... </pre> <p>The meaning of the optional level value is discussed above @@ -187,9 +187,10 @@ named logger remains untouched. <p>By default categories inherit their level from the - hierarchy. However, if you set the level of a logger and - later decide that that logger should inherit its level, then - you should specify INHERITED as the value for the level value. + hierarchy. However, if you set the level of a logger and later + decide that that logger should inherit its level, then you should + specify INHERITED as the value for the level value. NULL is a + synonym for INHERITED. <p>Similar to the root logger syntax, each <i>appenderName</i> (separated by commas) will be attached to the named logger. No revision No revision 1.4.2.1 +1 -3 jakarta-log4j/src/java/org/apache/log4j/helpers/NullEnumeration.java Index: NullEnumeration.java =================================================================== RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/NullEnumeration.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- NullEnumeration.java 5 Jul 2001 19:09:42 -0000 1.4 +++ NullEnumeration.java 24 May 2002 12:58:43 -0000 1.4.2.1 @@ -25,9 +25,7 @@ NullEnumeration() { } - public - static - NullEnumeration getInstance() { + public static NullEnumeration getInstance() { return instance; } 1.3.2.1 +2 -2 jakarta-log4j/src/java/org/apache/log4j/helpers/SyslogWriter.java Index: SyslogWriter.java =================================================================== RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/SyslogWriter.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- SyslogWriter.java 5 Jul 2001 19:09:47 -0000 1.3 +++ SyslogWriter.java 24 May 2002 12:58:43 -0000 1.3.2.1 @@ -61,8 +61,8 @@ public void write(String string) throws IOException { - DatagramPacket packet = new DatagramPacket(string.getBytes(), - string.length(), + byte[] bytes = string.getBytes(); + DatagramPacket packet = new DatagramPacket(bytes, bytes.length, address, SYSLOG_PORT); if(this.ds != null) No revision No revision 1.8.2.1 +51 -31 jakarta-log4j/src/java/org/apache/log4j/spi/ThrowableInformation.java Index: ThrowableInformation.java =================================================================== RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/ThrowableInformation.java,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- ThrowableInformation.java 26 Mar 2002 22:22:58 -0000 1.8 +++ ThrowableInformation.java 24 May 2002 12:58:43 -0000 1.8.2.1 @@ -12,10 +12,18 @@ import java.util.Vector; /** - - - - */ + * ThrowableInformation is log4j's internal representation of + * throwables. It essentially consists of a string array, called + * 'rep', where the first element, that is rep[0], represents the + * string representation of the throwable (i.e. the value you get + * when you do throwable.toString()) and subsequent elements + * correspond the stack trace with the top most entry of the stack + * corresponding to the second entry of the 'rep' array that is + * rep[1]. + * + * @author Ceki Gülcü + * + * */ public class ThrowableInformation implements java.io.Serializable { static final long serialVersionUID = -4748765566864322735L; @@ -41,12 +49,20 @@ VectorWriter vw = new VectorWriter(); throwable.printStackTrace(vw); rep = vw.toStringArray(); - vw.clear(); return rep; } } } +/** + * VectorWriter is a seemingly trivial implemtantion of PrintWriter. + * The throwable instance that we are trying to represnt is asked to + * print itself to a VectorWriter. + * + * By our design choice, r string representation of the throwable + * does not contain any line separators. It follows that println() + * methods of VectorWriter ignore the 'ln' part. + * */ class VectorWriter extends PrintWriter { private Vector v; @@ -56,34 +72,27 @@ v = new Vector(); } - // Support for Orion - public - void print(Object o) { + public void print(Object o) { v.addElement(o.toString()); } - // Support for Orion - public - void print(char[] s) { - v.addElement(new String(s)); + public void print(char[] chars) { + v.addElement(new String(chars)); } - // Support for Orion - public - void print(String s) { + public void print(String s) { v.addElement(s); } - public - void println(Object o) { + public void println(Object o) { v.addElement(o.toString()); } // JDK 1.1.x apprenly uses this form of println while in // printStackTrace() public - void println(char[] s) { - v.addElement(new String(s)); + void println(char[] chars) { + v.addElement(new String(chars)); } public @@ -91,8 +100,23 @@ v.addElement(s); } - public - String[] toStringArray() { + public void write(char[] chars) { + v.addElement(new String(chars)); + } + + public void write(char[] chars, int off, int len) { + v.addElement(new String(chars, off, len)); + } + + public void write(String s, int off, int len) { + v.addElement(s.substring(off, off+len)); + } + + public void write(String s) { + v.addElement(s); + } + + public String[] toStringArray() { int len = v.size(); String[] sa = new String[len]; for(int i = 0; i < len; i++) { @@ -101,24 +125,20 @@ return sa; } - public - void clear() { - v.setSize(0); - } } class NullWriter extends Writer { - public - void close() { + public void close() { + // blank } - public - void flush() { + public void flush() { + // blank } - public - void write(char[] cbuf, int off, int len) { + public void write(char[] cbuf, int off, int len) { + // blank } } No revision No revision 1.53.2.3 +13 -5 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.2 retrieving revision 1.53.2.3 diff -u -r1.53.2.2 -r1.53.2.3 --- download.xml 22 May 2002 17:15:21 -0000 1.53.2.2 +++ download.xml 24 May 2002 12:58:44 -0000 1.53.2.3 @@ -9,14 +9,22 @@ <meta name="keywords" content="java, logging, tracing, component, framework, API, log4j"/> <body> - <section name="log4j version 1.2.2"> - <p>log4j 1.2.2 is now available in <a - href="../jakarta-log4j-1.2.2.tar.gz"><b>TAR.GZ</b></a> format - or in <a href="../jakarta-log4j-1.2.2.zip"><b>ZIP</b></a> + <section name="log4j version 1.2.3"> + <p>log4j 1.2.3 is available in <a + href="../jakarta-log4j-1.2.3.tar.gz"><b>TAR.GZ</b></a> format + or in <a href="../jakarta-log4j-1.2.3.zip"><b>ZIP</b></a> format. </p> - <p>This minor release fixes bug #9155 reported by Nicko + <p>Minor release 1.2.2 responds to bug #9305. When loading + component classes, log4j will now first attempt to use the + Thread Context Loader and if that fails, it will use + Class.forName. In log4j 1.2 and 1.2.1, only Class.forName was + used and the TCL was ignored. + </p> + + + <p>The 1.2.1 (minor release) fixed bug #9155 reported by Nicko Cadell. With the exception of this bug fix and some documentation improvements, it is identical to log4j 1.2 final.
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>