ceki 01/05/20 08:03:07
Modified: build build.xml
docs HISTORY contactUs.html documentation.html
download.html earlier.html history.html index.html
src/java/org/apache/log4j PropertyConfigurator.java
src/java/org/apache/log4j/examples MyCategory.java mycat.bad
mycat.good
src/java/org/apache/log4j/net SMTPAppender.java
src/xdocs download.xml
Log:
Modified SMTPAppender for easier subclassing.
Prepating release 1.1.1.
Revision Changes Path
1.34 +1 -1 jakarta-log4j/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 2001/05/20 07:13:54 1.33
+++ build.xml 2001/05/20 15:03:06 1.34
@@ -9,7 +9,7 @@
<!-- ================================================================= -->
<project name="log4j" default="usage" basedir=".." >
- <property name="version" value="1.1"/>
+ <property name="version" value="1.1.1"/>
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
1.49 +9 -0 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- HISTORY 2001/05/20 07:13:57 1.48
+++ HISTORY 2001/05/20 15:03:06 1.49
@@ -5,6 +5,15 @@
client code.
[***] Changes requiring important modifications to existing client code.
+ May 20, 2001
+
+ - Release of version 1.1.1.
+
+ - Added missing custom priority support in PropertyConfigurator. [*]
+
+ - Made a number of fields protected instead of default access in
+ SMTPAppender. [*]
+
May 19, 2001
- Release of version 1.1.
1.9 +13 -7 jakarta-log4j/docs/contactUs.html
Index: contactUs.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/contactUs.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- contactUs.html 2001/05/09 20:14:02 1.8
+++ contactUs.html 2001/05/20 15:03:06 1.9
@@ -14,7 +14,7 @@
<meta name="author" value="Ceki
Gulcu">
<meta name="email" value="[EMAIL PROTECTED]">
- <title>Log4j project - log4j project</title>
+ <title>Log4j project - Contact us</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -119,6 +119,7 @@
<a name="Reporting tools"><strong>Reporting tools</strong></a>
</font>
</td></tr>
+ <tr><td><br/></td></tr>
<tr><td>
<blockquote>
<p>Bugs should be reported by using the
@@ -127,7 +128,9 @@
and the <a href="HISTORY">project history file</a> to see if the problem is already
known.</p>
<p>Support requests should be sent
to the log4j-user list (see below).</p>
</blockquote>
+ </p>
</td></tr>
+ <tr><td><br/></td></tr>
</table>
<table border="0" cellspacing="0"
cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
@@ -135,27 +138,30 @@
<a name="Mailing lists"><strong>Mailing lists</strong></a>
</font>
</td></tr>
+ <tr><td><br/></td></tr>
<tr><td>
<blockquote>
- <p>New releases and important bug-fixes are
anounced at the
+ <p>New releases and important bug-fixes are
announced at the
<em>log4j-announce</em> list. You can subscribe to the log4j-announce
list, or change your existing subscription <a
href="http://lists.sourceforge.net/mailman/listinfo/log4j-announce";>online</a>.
The traffic on this list is extremely low and you are encouraged to
subscribe to this list if you are using log4j.</p>
<p>Discussion on log4j and logging
in general are held on the
<em>log4j-user</em> mailing list. This list is <a
href="http://marc.theaimsgroup.com/?l=log4j-user&r=1&w=2";>archived</a>.
-To post a message to all its members, send email to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>.
-To subscribe to the log4j-users list send an email to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>.</p>
+To post a message to all its members, send e-mail to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>.
+To subscribe to the log4j-users list send an e-mail to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>.</p>
<p>Development related discussions
are held on the <em>log4j-dev</em> mailing
list. This list is <a
href="http://marc.theaimsgroup.com/?l=log4j-dev&r=1&w=2";>archived</a>. To post
a message to all its members,
-send email to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>. To
subscribe to the log4j-dev list send an email to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>.</p>
+send e-mail to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>. To
subscribe to the log4j-dev list send an e-mail to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>.</p>
<p>All developers are encouraged to
subscribe to the
<em>log4j-cvs</em> list which will notify you of CVS commits to the
repository. This list is <a
href="http://marc.theaimsgroup.com/?l=log4j-cvs&r=1&w=2";>archived</a>.
-To post a message to all its members, send email to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>. To
-subscribe to the log4j-cvs list send an email to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>.</p>
+To post a message to all its members, send e-mail to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>. To
+subscribe to the log4j-cvs list send an e-mail to <A
HREF="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</A>.</p>
</blockquote>
+ </p>
</td></tr>
+ <tr><td><br/></td></tr>
</table>
</td>
</tr>
1.11 +4 -1 jakarta-log4j/docs/documentation.html
Index: documentation.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/documentation.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- documentation.html 2001/04/21 13:21:42 1.10
+++ documentation.html 2001/05/20 15:03:06 1.11
@@ -14,7 +14,7 @@
<meta name="author" value="Ceki
Gulcu">
<meta name="email" value="[EMAIL PROTECTED]">
- <title>Log4j project - log4j project</title>
+ <title>Log4j project - Documentation</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -119,6 +119,7 @@
<a name="log4j documentation"><strong>log4j documentation</strong></a>
</font>
</td></tr>
+ <tr><td><br/></td></tr>
<tr><td>
<blockquote>
<p>The following documentation is included with
the standard log4j
@@ -161,7 +162,9 @@
</p>
</ul>
</blockquote>
+ </p>
</td></tr>
+ <tr><td><br/></td></tr>
</table>
</td>
</tr>
1.26 +13 -7 jakarta-log4j/docs/download.html
Index: download.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/download.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- download.html 2001/05/18 20:45:16 1.25
+++ download.html 2001/05/20 15:03:06 1.26
@@ -14,7 +14,7 @@
<meta name="author" value="Ceki
Gulcu">
<meta name="email" value="[EMAIL PROTECTED]">
- <title>Log4j project - log4j project</title>
+ <title>Log4j project - Download</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -116,19 +116,20 @@
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <a name="log4j version 1.1"><strong>log4j version 1.1</strong></a>
+ <a name="log4j version 1.1.1"><strong>log4j version 1.1.1</strong></a>
</font>
</td></tr>
+ <tr><td><br/></td></tr>
<tr><td>
<blockquote>
- <p>Downlaod version 1.1 including <i>full
source code</i>, class files
+ <p>Download version 1.1.1 including <i>full
source code</i>, class files
and documentation in
-<a href="../jakarta-log4j-1.1.tar.gz"><b>TAR.GZ</b></a> format or in
-<a href="../jakarta-log4j-1.1.zip"><b>ZIP</b></a> format. You may
+<a href="../jakarta-log4j-1.1.1.tar.gz"><b>TAR.GZ</b></a> format or in
+<a href="../jakarta-log4j-1.1.1.zip"><b>ZIP</b></a> format. You may
elect to browse log4j <a href="documentation.html"><b>documentation</b></a> online.
</p>
- <p><a
href="http://www.javaworld.com/javaworld/jw-05-2001/jw-0504-finalists.html";><img
src="images/ecaward_finalist_logo.gif" align="right" border="0" /></a>Version 1.1 is
the 21st major public release of
-log4j. It is 100% backward compatible with log4j version 1.0.x.</p>
+ <p><a
href="http://www.javaworld.com/javaworld/jw-05-2001/jw-0504-finalists.html";><img
src="images/ecaward_finalist_logo.gif" align="right" border="0" /></a>Version 1.1.1 is
the 21st major public release of
+log4j. It is 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
paleontologist.</p>
@@ -136,7 +137,9 @@
users can now fetch log4j in RPM format at <a
href="http://rpmized.free.fr";>http://rpmized.free.fr</a> or
alternatively at <a
href="ftp://ftp.falsehope.com/home/gomez/log4j/";>ftp://ftp.falsehope.com/home/gomez/log4j/</a>.</p>
</blockquote>
+ </p>
</td></tr>
+ <tr><td><br/></td></tr>
</table>
<table border="0" cellspacing="0"
cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
@@ -144,6 +147,7 @@
<a name="Third-party software"><strong>Third-party software</strong></a>
</font>
</td></tr>
+ <tr><td><br/></td></tr>
<tr><td>
<blockquote>
<dl>
@@ -173,7 +177,9 @@
to the <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
list.</p>
</blockquote>
+ </p>
</td></tr>
+ <tr><td><br/></td></tr>
</table>
</td>
</tr>
1.11 +3 -0 jakarta-log4j/docs/earlier.html
Index: earlier.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/earlier.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- earlier.html 2001/04/21 13:21:43 1.10
+++ earlier.html 2001/05/20 15:03:06 1.11
@@ -119,6 +119,7 @@
<a name="Older distributions of the log4j package"><strong>Older
distributions of the log4j package</strong></a>
</font>
</td></tr>
+ <tr><td><br/></td></tr>
<tr><td>
<blockquote>
<hr />
@@ -134,7 +135,9 @@
</dl>
</blockquote>
+ </p>
</td></tr>
+ <tr><td><br/></td></tr>
</table>
</td>
</tr>
1.13 +5 -2 jakarta-log4j/docs/history.html
Index: history.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/history.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- history.html 2001/04/21 13:21:43 1.12
+++ history.html 2001/05/20 15:03:06 1.13
@@ -14,7 +14,7 @@
<meta name="author" value="Ceki
Gulcu">
<meta name="email" value="[EMAIL PROTECTED]">
- <title>Log4j project - log4j project</title>
+ <title>Log4j project - Project history</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -116,9 +116,10 @@
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <a name="Project History"><strong>Project History</strong></a>
+ <a name="Project history"><strong>Project history</strong></a>
</font>
</td></tr>
+ <tr><td><br/></td></tr>
<tr><td>
<blockquote>
<p>The <a href="HISTORY"><b>project
history</b></a> gives a brief
@@ -144,7 +145,9 @@
Apache.</p>
<p>The log4j logo was designed and
kindly donated by <a href="http://www.cyberlab.ch";><IMG src="images/cyberlab15.gif"
ALT="Cyberlab S.A." ALIGN="abscenter" /></a> of Switzerland.</p>
</blockquote>
+ </p>
</td></tr>
+ <tr><td><br/></td></tr>
</table>
</td>
</tr>
1.10 +8 -5 jakarta-log4j/docs/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/index.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- index.html 2001/04/21 13:21:44 1.9
+++ index.html 2001/05/20 15:03:06 1.10
@@ -14,7 +14,7 @@
<meta name="author" value="Ceki
Gulcu">
<meta name="email" value="[EMAIL PROTECTED]">
- <title>Log4j project - log4j project</title>
+ <title>Log4j project - Introduction</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -119,6 +119,7 @@
<a name="Introduction"><strong>Introduction</strong></a>
</font>
</td></tr>
+ <tr><td><br/></td></tr>
<tr><td>
<blockquote>
<p>Inserting log statements into your code is a
low-tech method for
@@ -127,7 +128,7 @@
distributed applications.</p>
<p>On the other hand, some people
argue that log statements pollute
source code and decrease legibility. (We believe that the contrary is
-true). In the Java language where a pre-processor is not available,
+true). In the Java language where a preprocessor is not available,
log statements increase the size of the code and reduce its speed,
even when logging is turned off. Given that a reasonably sized
application may contain thousands of log statements, speed is of
@@ -151,16 +152,18 @@
<code>OutputStream</code>, a <code>java.io.Writer</code>, a remote
log4j server, a remote Unix Syslog daemon or even a NT Event logger.</p>
<p>On a 233 MHz ThinkPad running
JDK 1.1.7B, it costs about 46
-nano-seconds to determine if that statement should be logged or
-not. Actual logging is also quite fast, ranging from 79 micro-seconds
-using the SimpleLayout, 164 micro-seconds using the TTCCLayout and
+nanoseconds to determine if that statement should be logged or
+not. Actual logging is also quite fast, ranging from 79 microseconds
+using the SimpleLayout, 164 microseconds using the TTCCLayout and
around a millisecond when printing exceptions. The performance of the
PatternLayout is almost as good as the dedicated layouts, except that
it is a lot more flexible.</p>
<p>The package is being constantly
improved thanks to input from users
and code contributed by authors in the community.</p>
</blockquote>
+ </p>
</td></tr>
+ <tr><td><br/></td></tr>
</table>
</td>
</tr>
1.23 +7 -8
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- PropertyConfigurator.java 2001/05/20 14:03:31 1.22
+++ PropertyConfigurator.java 2001/05/20 15:03:07 1.23
@@ -145,10 +145,9 @@
custom priority value can be specified in the form
<code>priority#classname</code>.
- <p>If one of the optional priority value is specified, then the
- root priority is set to the corresponding priority. If no
- priority value is specified, then the root priority remains
- untouched.
+ <p>If a priority value is specified, then the root priority is set
+ to the corresponding priority. If no priority value is specified,
+ then the root priority remains untouched.
<p>The root category can be assigned multiple appenders.
@@ -161,10 +160,10 @@
log4j.category.category_name=[priority|INHERITED], appenderName, appenderName,
...
</pre>
- <p>The meaning of the priority value is discussed above in
- relation to the root category. In addition however, the value
- INHERITED can be optionally specified meaning that the named
- category should inherit its priority from the category hierarchy.
+ <p>The meaning of the optional priority value is discussed above
+ in relation to the root category. In addition however, the value
+ INHERITED can be specified meaning that the named category should
+ inherit its priority from the category hierarchy.
<p>If no priority value is supplied, then the priority of the
named category remains untouched.
1.7 +6 -1 jakarta-log4j/src/java/org/apache/log4j/examples/MyCategory.java
Index: MyCategory.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/MyCategory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MyCategory.java 2001/05/20 14:03:32 1.6
+++ MyCategory.java 2001/05/20 15:03:07 1.7
@@ -10,6 +10,7 @@
import org.apache.log4j.*;
import org.apache.log4j.spi.CategoryFactory;
import org.apache.log4j.xml.DOMConfigurator;
+import org.apache.log4j.xml.examples.XPriority;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.helpers.LogLog;
@@ -87,7 +88,6 @@
super(name);
}
-
/**
Overrides the standard debug method by appending " world" at the
end of each message. */
@@ -104,6 +104,11 @@
static
Category getInstance(String name) {
return Category.getInstance(name, myFactory);
+ }
+
+ public
+ void trace(String message) {
+ super.log(XPriority.TRACE, message);
}
}
1.5 +1 -1 jakarta-log4j/src/java/org/apache/log4j/examples/mycat.bad
Index: mycat.bad
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/mycat.bad,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mycat.bad 2001/05/20 14:03:32 1.4
+++ mycat.bad 2001/05/20 15:03:07 1.5
@@ -4,7 +4,7 @@
log4j.appender.A1=org.apache.log4j.ConsoleAppender
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%c - %m%n
+log4j.appender.A1.layout.ConversionPattern=%5p [%t] %c - %m%n
# Set the priority of "some.cat" to TRACE (defined in
# org.apache.log4j.xml.examples.XPriority). This will actually have
1.6 +1 -1 jakarta-log4j/src/java/org/apache/log4j/examples/mycat.good
Index: mycat.good
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/mycat.good,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mycat.good 2001/05/20 14:03:32 1.5
+++ mycat.good 2001/05/20 15:03:07 1.6
@@ -11,7 +11,7 @@
log4j.appender.A1=org.apache.log4j.ConsoleAppender
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=[%t] %c - %m%n
+log4j.appender.A1.layout.ConversionPattern=%5p [%t] %c - %m%n
# Set the priority of "some.cat" to TRACE (defined in
1.23 +14 -15 jakarta-log4j/src/java/org/apache/log4j/net/SMTPAppender.java
Index: SMTPAppender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SMTPAppender.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SMTPAppender.java 2001/04/03 16:37:24 1.22
+++ SMTPAppender.java 2001/05/20 15:03:07 1.23
@@ -46,18 +46,18 @@
@author Ceki Gülcü
@since 1.0 */
public class SMTPAppender extends AppenderSkeleton {
- String to;
- String from;
- String subject;
- String smtpHost;
- int bufferSize = 512;
-
- CyclicBuffer cb = new CyclicBuffer(bufferSize);
- Session session;
- Message msg;
- boolean locationInfo = false;
+ private String to;
+ private String from;
+ private String subject;
+ private String smtpHost;
+ private int bufferSize = 512;
+ private boolean locationInfo = false;
+ protected CyclicBuffer cb = new CyclicBuffer(bufferSize);
+ protected Message msg;
+
+
/**
A string constant used in naming the <em>To</em> field of
outgoing e-mail output file. Current value of this string
@@ -192,9 +192,10 @@
if (smtpHost != null)
props.put("mail.smtp.host", smtpHost);
- session = Session.getDefaultInstance(props, null);
- //session.setDebug(true);
- msg = new MimeMessage(session);
+
+ Session session = Session.getDefaultInstance(props, null);
+ //session.setDebug(true);
+ msg = new MimeMessage(session);
try {
if (from != null)
@@ -412,8 +413,6 @@
void setFrom(String from) {
this.from = from;
}
-
-
/**
The <b>Subject</b> option takes a string value which should be a
1.23 +6 -6 jakarta-log4j/src/xdocs/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/download.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- download.xml 2001/05/20 10:43:43 1.22
+++ download.xml 2001/05/20 15:03:07 1.23
@@ -32,12 +32,12 @@
-->
-<section name="log4j version 1.1">
+<section name="log4j version 1.1.1">
-<p>Download version 1.1 including <i>full source code</i>, class files
+<p>Download version 1.1.1 including <i>full source code</i>, class files
and documentation in
-<a href="../jakarta-log4j-1.1.tar.gz"><b>TAR.GZ</b></a> format or in
-<a href="../jakarta-log4j-1.1.zip"><b>ZIP</b></a> format. You may
+<a href="../jakarta-log4j-1.1.1.tar.gz"><b>TAR.GZ</b></a> format or in
+<a href="../jakarta-log4j-1.1.1.zip"><b>ZIP</b></a> format. You may
elect to browse log4j <a
href="documentation.html"><b>documentation</b></a> online.
</p>
@@ -45,8 +45,8 @@
<p><a
href="http://www.javaworld.com/javaworld/jw-05-2001/jw-0504-finalists.html";><img
src="images/ecaward_finalist_logo.gif" align="right"
-border="0"/></a>Version 1.1 is the 21st major public release of
-log4j. It is 100% backward compatible with log4j version 1.0.x.</p>
+border="0"/></a>Version 1.1.1 is the 21st major public release of
+log4j. It is 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
