ceki 01/04/17 12:59:41
Modified: build build.xml siteBuild.xml
docs HISTORY contactUs.html documentation.html
download.html earlier.html history.html index.html
src/java/org/apache/log4j/config PropertyGetter.java
PropertySetter.java
src/java/org/apache/log4j/helpers OptionConverter.java
src/java/org/apache/log4j/test UnitTestOptionConverter.java
unitTest
src/xdocs download.xml earlier.xml velocity.properties
Log:
Preparing 1.1b2 for release
Revision Changes Path
1.18 +1 -0 jakarta-log4j/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 2001/04/03 16:39:14 1.17
+++ build.xml 2001/04/17 19:59:12 1.18
@@ -303,6 +303,7 @@
<javadoc sourcepath="${java.source.dir}"
destdir="${javadoc.dest}"
packagenames="org.apache.log4j,
+ org.apache.log4j.config,
org.apache.log4j.examples,
org.apache.log4j.examples.appserver,
org.apache.log4j.helpers,
1.4 +4 -4 jakarta-log4j/build/siteBuild.xml
Index: siteBuild.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build/siteBuild.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- siteBuild.xml 2001/03/21 06:49:50 1.3
+++ siteBuild.xml 2001/04/17 19:59:13 1.4
@@ -3,8 +3,8 @@
<!-- Initialization properties -->
<property name="project.name" value="log4j.site"/>
- <property name="docs.src" value="src/xdocs"/>
- <property name="docs.dest" value="docs"/>
+ <property name="docs.src" value="./src/xdocs"/>
+ <property name="docs.dest" value="./docs"/>
<target name="prepare">
<available classname="org.apache.velocity.anakia.AnakiaTask"
@@ -23,12 +23,12 @@
classname="org.apache.velocity.anakia.AnakiaTask"/>
<anakia basedir="${docs.src}" destdir="${docs.dest}/"
extension=".html"
- style="./site.vsl"
+ style="site.vsl"
projectFile="stylesheets/project.xml"
excludes="**/stylesheets/**, empty.xml"
includes="**/*.xml"
lastModifiedCheck="true"
- velocityPropertiesFile="${docs.src}/velocity.properties">
+ templatePath="../jakarta-site2/xdocs/stylesheets">
</anakia>
<!--
<copy todir="${docs.dest}/images" filtering="no">
1.31 +6 -1 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- HISTORY 2001/04/14 06:57:21 1.30
+++ HISTORY 2001/04/17 19:59:17 1.31
@@ -6,7 +6,7 @@
[***] Changes requiring important modifications to existing client code.
- April ??, 2001
+ April 17, 2001
- Release of version 1.1b2
@@ -21,6 +21,11 @@
- Added 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
+ method for more information. Note that the <priority> element in
+ log4j.dtd remains unaffected by this change. [*]
- Added the setQuietMode(booelan) method to LogLog. In quiet mode
LogLog will not output anything even in case of errors. [*]
1.5 +7 -7 jakarta-log4j/docs/contactUs.html
Index: contactUs.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/contactUs.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- contactUs.html 2001/02/14 13:17:29 1.4
+++ contactUs.html 2001/04/17 19:59:18 1.5
@@ -25,7 +25,7 @@
<a href="http://jakarta.apache.org"><img
src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/"><img src="images/logo.jpg" alt="The log4j
project" border="0"/></a>
+<a href="http://jakarta.apache.org/"><img src="./images/logo.jpg" alt="The log4j
project" border="0"/></a>
</td>
</tr>
</table>
@@ -37,7 +37,7 @@
<tr>
<!-- LEFT SIDE NAVIGATION -->
<td valign="top" nowrap="true">
- <strong>Log4j Project</strong>
+ <p><strong>Log4j Project</strong></p>
<ul>
<li> <a href="./index.html">Introduction</a>
</li>
@@ -50,7 +50,7 @@
<li> <a href="./history.html">History</a>
</li>
</ul>
- <strong>Get Involved</strong>
+ <p><strong>Get Involved</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/getinvolved.html">Overview</a>
</li>
@@ -63,7 +63,7 @@
<li> <a href="http://jakarta.apache.org/site/bugs.html">Bug
Database</a>
</li>
</ul>
- <strong>Other Projects</strong>
+ <p><strong>Other Projects</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/ant/index.html">Ant</a>
</li>
@@ -90,7 +90,7 @@
<li> <a
href="http://jakarta.apache.org/watchdog/index.html">Watchdog</a>
</li>
</ul>
- <strong>Misc</strong>
+ <p><strong>Misc</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/whoweare.html">Who We Are</a>
</li>
@@ -106,7 +106,7 @@
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <strong>Reporting tools</strong>
+ <a name="Reporting tools"><strong>Reporting tools</strong></a>
</font>
</td></tr>
<tr><td>
@@ -121,7 +121,7 @@
<table border="0" cellspacing="0"
cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <strong>Mailing lists</strong>
+ <a name="Mailing lists"><strong>Mailing lists</strong></a>
</font>
</td></tr>
<tr><td>
1.8 +6 -6 jakarta-log4j/docs/documentation.html
Index: documentation.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/documentation.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- documentation.html 2001/02/14 13:17:30 1.7
+++ documentation.html 2001/04/17 19:59:19 1.8
@@ -25,7 +25,7 @@
<a href="http://jakarta.apache.org"><img
src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/"><img src="images/logo.jpg" alt="The log4j
project" border="0"/></a>
+<a href="http://jakarta.apache.org/"><img src="./images/logo.jpg" alt="The log4j
project" border="0"/></a>
</td>
</tr>
</table>
@@ -37,7 +37,7 @@
<tr>
<!-- LEFT SIDE NAVIGATION -->
<td valign="top" nowrap="true">
- <strong>Log4j Project</strong>
+ <p><strong>Log4j Project</strong></p>
<ul>
<li> <a href="./index.html">Introduction</a>
</li>
@@ -50,7 +50,7 @@
<li> <a href="./history.html">History</a>
</li>
</ul>
- <strong>Get Involved</strong>
+ <p><strong>Get Involved</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/getinvolved.html">Overview</a>
</li>
@@ -63,7 +63,7 @@
<li> <a href="http://jakarta.apache.org/site/bugs.html">Bug
Database</a>
</li>
</ul>
- <strong>Other Projects</strong>
+ <p><strong>Other Projects</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/ant/index.html">Ant</a>
</li>
@@ -90,7 +90,7 @@
<li> <a
href="http://jakarta.apache.org/watchdog/index.html">Watchdog</a>
</li>
</ul>
- <strong>Misc</strong>
+ <p><strong>Misc</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/whoweare.html">Who We Are</a>
</li>
@@ -106,7 +106,7 @@
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <strong>log4j documentation</strong>
+ <a name="log4j documentation"><strong>log4j documentation</strong></a>
</font>
</td></tr>
<tr><td>
1.16 +20 -16 jakarta-log4j/docs/download.html
Index: download.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/download.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- download.html 2001/03/04 23:57:18 1.15
+++ download.html 2001/04/17 19:59:19 1.16
@@ -25,7 +25,7 @@
<a href="http://jakarta.apache.org"><img
src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/"><img src="images/logo.jpg" alt="The log4j
project" border="0"/></a>
+<a href="http://jakarta.apache.org/"><img src="./images/logo.jpg" alt="The log4j
project" border="0"/></a>
</td>
</tr>
</table>
@@ -37,7 +37,7 @@
<tr>
<!-- LEFT SIDE NAVIGATION -->
<td valign="top" nowrap="true">
- <strong>Log4j Project</strong>
+ <p><strong>Log4j Project</strong></p>
<ul>
<li> <a href="./index.html">Introduction</a>
</li>
@@ -50,7 +50,7 @@
<li> <a href="./history.html">History</a>
</li>
</ul>
- <strong>Get Involved</strong>
+ <p><strong>Get Involved</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/getinvolved.html">Overview</a>
</li>
@@ -63,7 +63,7 @@
<li> <a href="http://jakarta.apache.org/site/bugs.html">Bug
Database</a>
</li>
</ul>
- <strong>Other Projects</strong>
+ <p><strong>Other Projects</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/ant/index.html">Ant</a>
</li>
@@ -90,7 +90,7 @@
<li> <a
href="http://jakarta.apache.org/watchdog/index.html">Watchdog</a>
</li>
</ul>
- <strong>Misc</strong>
+ <p><strong>Misc</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/whoweare.html">Who We Are</a>
</li>
@@ -106,42 +106,46 @@
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <strong>log4j version 1.0.4, dated 2001-01-12</strong>
+ <a name="log4j version 1.1beta2 (release candidate)"><strong>log4j
version 1.1beta2 (release candidate)</strong></a>
</font>
</td></tr>
<tr><td>
<blockquote>
- <p>Download the complete package including
<i>full source code</i>,
-class files and documentation in <a
href="../jakarta-log4j-1.0.4.tgz"><b>TGZ</b></a> format or in <a
href="../jakarta-log4j-1.0.4.zip"><b>ZIP</b></a> format. You may elect
+ <p>Downlaod version 1.1beta2 (release candiate)
including <i>full
+source code</i>, class files and documentation in <a
href="../jakarta-log4j-1.1b2.tar.gz"><b>TAR.GZ</b></a> format or in <a
href="../jakarta-log4j-1.1b2.zip"><b>ZIP</b></a> format. You may elect
to browse log4j <a href="documentation.html"><b>documentation</b></a>
online.</p>
- <p>Version 1.0.4 is the 20th major
public release of log4j.</p>
- <p>Thanks to <a
href="mailto:[EMAIL PROTECTED]">Henri Gomez</a>, Linux
-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>
+ <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%
+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>
+ <p>Thanks to <a
href="mailto:[EMAIL PROTECTED]">Henri Gomez</a>, Linux
+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>
</td></tr>
</table>
<table border="0" cellspacing="0"
cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <strong>log4j version 1.1 beta1</strong>
+ <a name="log4j version 1.0.4, dated 2001-01-12"><strong>log4j version
1.0.4, dated 2001-01-12</strong></a>
</font>
</td></tr>
<tr><td>
<blockquote>
- <p>Version 1.1beta1 is also available online in
<a href="../jakarta-log4j-1.1b1.tar.gz"><b>TGZ</b></a> format or in <a
href="../jakarta-log4j-1.1b1.zip"><b>ZIP</b></a> format.
-</p>
+ <p>Download the complete package including
<i>full source code</i>,
+class files and documentation in <a
href="../jakarta-log4j-1.0.4.tgz"><b>TGZ</b></a> format or in <a
href="../jakarta-log4j-1.0.4.zip"><b>ZIP</b></a> format.</p>
+ <p>Version 1.0.4 is the 20th major
public release of log4j.</p>
</blockquote>
</td></tr>
</table>
<table border="0" cellspacing="0"
cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <strong>Third-party software</strong>
+ <a name="Third-party software"><strong>Third-party software</strong></a>
</font>
</td></tr>
<tr><td>
1.8 +17 -6 jakarta-log4j/docs/earlier.html
Index: earlier.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/earlier.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- earlier.html 2001/02/14 13:17:30 1.7
+++ earlier.html 2001/04/17 19:59:20 1.8
@@ -25,7 +25,7 @@
<a href="http://jakarta.apache.org"><img
src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/"><img src="images/logo.jpg" alt="The log4j
project" border="0"/></a>
+<a href="http://jakarta.apache.org/"><img src="./images/logo.jpg" alt="The log4j
project" border="0"/></a>
</td>
</tr>
</table>
@@ -37,7 +37,7 @@
<tr>
<!-- LEFT SIDE NAVIGATION -->
<td valign="top" nowrap="true">
- <strong>Log4j Project</strong>
+ <p><strong>Log4j Project</strong></p>
<ul>
<li> <a href="./index.html">Introduction</a>
</li>
@@ -50,7 +50,7 @@
<li> <a href="./history.html">History</a>
</li>
</ul>
- <strong>Get Involved</strong>
+ <p><strong>Get Involved</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/getinvolved.html">Overview</a>
</li>
@@ -63,7 +63,7 @@
<li> <a href="http://jakarta.apache.org/site/bugs.html">Bug
Database</a>
</li>
</ul>
- <strong>Other Projects</strong>
+ <p><strong>Other Projects</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/ant/index.html">Ant</a>
</li>
@@ -90,7 +90,7 @@
<li> <a
href="http://jakarta.apache.org/watchdog/index.html">Watchdog</a>
</li>
</ul>
- <strong>Misc</strong>
+ <p><strong>Misc</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/whoweare.html">Who We Are</a>
</li>
@@ -106,7 +106,7 @@
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <strong>Older distributions of the log4j package</strong>
+ <a name="Older distributions of the log4j package"><strong>Older
distributions of the log4j package</strong></a>
</font>
</td></tr>
<tr><td>
@@ -121,6 +121,17 @@
<dd>
Download full package in <a href="../jakarta-log4j-1.0.4.tgz">TGZ</a> format.
</dd>
+
+ <dt><b>jakarta-log4j-1.1b1</b></dt>
+ <dd>
+ Download full package in <a href="../jakarta-log4j-1.1b1.tar.tgz">TAR.GZ</a>
format.
+ </dd>
+
+ <dt><b>jakarta-log4j-1.1b2</b></dt>
+ <dd>
+ Download full package in <a href="../jakarta-log4j-1.1b2.tar.tgz">TAR.GZ</a>
format.
+ </dd>
+
</dl>
</blockquote>
1.10 +6 -6 jakarta-log4j/docs/history.html
Index: history.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/history.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- history.html 2001/02/23 22:12:41 1.9
+++ history.html 2001/04/17 19:59:20 1.10
@@ -25,7 +25,7 @@
<a href="http://jakarta.apache.org"><img
src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/"><img src="images/logo.jpg" alt="The log4j
project" border="0"/></a>
+<a href="http://jakarta.apache.org/"><img src="./images/logo.jpg" alt="The log4j
project" border="0"/></a>
</td>
</tr>
</table>
@@ -37,7 +37,7 @@
<tr>
<!-- LEFT SIDE NAVIGATION -->
<td valign="top" nowrap="true">
- <strong>Log4j Project</strong>
+ <p><strong>Log4j Project</strong></p>
<ul>
<li> <a href="./index.html">Introduction</a>
</li>
@@ -50,7 +50,7 @@
<li> <a href="./history.html">History</a>
</li>
</ul>
- <strong>Get Involved</strong>
+ <p><strong>Get Involved</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/getinvolved.html">Overview</a>
</li>
@@ -63,7 +63,7 @@
<li> <a href="http://jakarta.apache.org/site/bugs.html">Bug
Database</a>
</li>
</ul>
- <strong>Other Projects</strong>
+ <p><strong>Other Projects</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/ant/index.html">Ant</a>
</li>
@@ -90,7 +90,7 @@
<li> <a
href="http://jakarta.apache.org/watchdog/index.html">Watchdog</a>
</li>
</ul>
- <strong>Misc</strong>
+ <p><strong>Misc</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/whoweare.html">Who We Are</a>
</li>
@@ -106,7 +106,7 @@
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <strong>Project History</strong>
+ <a name="Project History"><strong>Project History</strong></a>
</font>
</td></tr>
<tr><td>
1.8 +6 -6 jakarta-log4j/docs/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/index.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- index.html 2001/02/14 13:17:30 1.7
+++ index.html 2001/04/17 19:59:21 1.8
@@ -25,7 +25,7 @@
<a href="http://jakarta.apache.org"><img
src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
</td>
<td align="right">
-<a href="http://jakarta.apache.org/"><img src="images/logo.jpg" alt="The log4j
project" border="0"/></a>
+<a href="http://jakarta.apache.org/"><img src="./images/logo.jpg" alt="The log4j
project" border="0"/></a>
</td>
</tr>
</table>
@@ -37,7 +37,7 @@
<tr>
<!-- LEFT SIDE NAVIGATION -->
<td valign="top" nowrap="true">
- <strong>Log4j Project</strong>
+ <p><strong>Log4j Project</strong></p>
<ul>
<li> <a href="./index.html">Introduction</a>
</li>
@@ -50,7 +50,7 @@
<li> <a href="./history.html">History</a>
</li>
</ul>
- <strong>Get Involved</strong>
+ <p><strong>Get Involved</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/getinvolved.html">Overview</a>
</li>
@@ -63,7 +63,7 @@
<li> <a href="http://jakarta.apache.org/site/bugs.html">Bug
Database</a>
</li>
</ul>
- <strong>Other Projects</strong>
+ <p><strong>Other Projects</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/ant/index.html">Ant</a>
</li>
@@ -90,7 +90,7 @@
<li> <a
href="http://jakarta.apache.org/watchdog/index.html">Watchdog</a>
</li>
</ul>
- <strong>Misc</strong>
+ <p><strong>Misc</strong></p>
<ul>
<li> <a
href="http://jakarta.apache.org/site/whoweare.html">Who We Are</a>
</li>
@@ -106,7 +106,7 @@
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <strong>Introduction</strong>
+ <a name="Introduction"><strong>Introduction</strong></a>
</font>
</td></tr>
<tr><td>
1.3 +4 -1
jakarta-log4j/src/java/org/apache/log4j/config/PropertyGetter.java
Index: PropertyGetter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/config/PropertyGetter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertyGetter.java 2001/04/17 17:13:52 1.2
+++ PropertyGetter.java 2001/04/17 19:59:27 1.3
@@ -16,6 +16,7 @@
import org.apache.log4j.Priority;
import org.apache.log4j.helpers.LogLog;
+
/**
Used for inferring configuration information for a log4j's component.
@@ -32,7 +33,9 @@
/**
Create a new PropertySetter for the specified Object. This is done
- in prepartion for invoking {@link #getProperties(PropertyCallback,String)} one
or more times.
+ in prepartion for invoking {@link
+ #getProperties(PropertyGetter.PropertyCallback, String)} one or
+ more times.
@param obj the object for which to set properties */
public
1.4 +4 -6
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropertySetter.java 2001/04/17 17:13:54 1.3
+++ PropertySetter.java 2001/04/17 19:59:28 1.4
@@ -8,7 +8,10 @@
package org.apache.log4j.config;
-import java.beans.*;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
import java.io.*;
import java.lang.reflect.*;
import java.util.*;
@@ -134,11 +137,6 @@
@param name name of the property
@param value String value of the property
- @throws PropertySetterException
- if no setter exists for the named property,
- or if the setter takes an unkown argument type, i.e. one
- other than String, int, and boolean,
- or if the setter method isn't public
*/
public
void setProperty(String name, String value) {
1.15 +2 -2
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- OptionConverter.java 2001/04/17 17:14:02 1.14
+++ OptionConverter.java 2001/04/17 19:59:31 1.15
@@ -158,7 +158,7 @@
object. <p> If <code>value</code> is of form
"priority#classname", then the specified class' toPriority method
is called to process the specified priority string; if no '#'
- character is present, then the default {@link org.log4j.Priority}
+ character is present, then the default {@link org.apache.log4j.Priority}
class is used to process the priority value.
<p> If any error occurs while converting the value to a priority,
@@ -207,7 +207,7 @@
result = (Priority) o;
} catch(ClassNotFoundException e) {
- LogLog.error("custom priority class [" + clazz + "] could not be added.");
+ LogLog.error("custom priority class [" + clazz + "] not found.");
} catch(NoSuchMethodException e) {
LogLog.error("custom priority class [" + clazz + "]"
+ " does not have a constructor which takes one string parameter", e);
1.2 +8 -0
jakarta-log4j/src/java/org/apache/log4j/test/UnitTestOptionConverter.java
Index: UnitTestOptionConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/UnitTestOptionConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnitTestOptionConverter.java 2001/04/17 17:14:10 1.1
+++ UnitTestOptionConverter.java 2001/04/17 19:59:33 1.2
@@ -116,6 +116,13 @@
assertEquals(p, null);
}
+ public
+ void toPriorityTest5() {
+ String val = "INFO#org.apache.log4j.xml.TOTO";
+ Priority p = OptionConverter.toPriority(val, null);
+ assertEquals(p, null);
+ }
+
public
static
@@ -130,6 +137,7 @@
suite.addTest(new UnitTestOptionConverter("toPriorityTest2"));
suite.addTest(new UnitTestOptionConverter("toPriorityTest3"));
suite.addTest(new UnitTestOptionConverter("toPriorityTest4"));
+ suite.addTest(new UnitTestOptionConverter("toPriorityTest5"));
return suite;
}
1.6 +2 -2 jakarta-log4j/src/java/org/apache/log4j/test/unitTest
Index: unitTest
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/unitTest,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unitTest 2001/01/23 22:07:43 1.5
+++ unitTest 2001/04/17 19:59:34 1.6
@@ -7,10 +7,10 @@
exit 1
fi
-java junit.textui.TestRunner org.apache.log4j.test.UnitTestVarSubst
+java junit.textui.TestRunner org.apache.log4j.test.UnitTestOptionConverter
if [ $? != 0 ]; then
- echo "UnitTestVarSubst failed."
+ echo "UnitTestOptionConverter failed."
exit 1
fi
1.13 +23 -15 jakarta-log4j/src/xdocs/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/download.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- download.xml 2001/02/27 23:05:19 1.12
+++ download.xml 2001/04/17 19:59:37 1.13
@@ -9,8 +9,6 @@
<body>
-<section name="log4j version 1.0.4, dated 2001-01-12">
-
<!--
<table CELLSPACING="8" CELLPADDING="4" FGCOLOR="gray"
BORDER="0" WIDTH="25%" ALIGN="RIGHT" VALIGN="TOP">
@@ -33,14 +31,25 @@
</table>
-->
-<p>Download the complete package including <i>full source code</i>,
-class files and documentation in <a
-href="../jakarta-log4j-1.0.4.tgz"><b>TGZ</b></a> format or in <a
-href="../jakarta-log4j-1.0.4.zip"><b>ZIP</b></a> format. You may elect
+
+<section name="log4j version 1.1beta2 (release candidate)">
+
+<p>Downlaod version 1.1beta2 (release candiate) including <i>full
+source code</i>, class files and documentation in <a
+href="../jakarta-log4j-1.1b2.tar.gz"><b>TAR.GZ</b></a> format or in <a
+href="../jakarta-log4j-1.1b2.zip"><b>ZIP</b></a> format. You may elect
to browse log4j <a href="documentation.html"><b>documentation</b></a>
online.</p>
-<p>Version 1.0.4 is the 20th major public release of log4j.</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 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
+paleontologist.</p>
<p>Thanks to <a href="mailto:[EMAIL PROTECTED]">Henri Gomez</a>, Linux
users can now fetch log4j in RPM format at <a
@@ -48,20 +57,19 @@
alternatively at <a
href="ftp://ftp.falsehope.com/home/gomez/log4j/">ftp://ftp.falsehope.com/home/gomez/log4j/</a>.</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>
</section>
-<section name="log4j version 1.1 beta1">
+<section name="log4j version 1.0.4, dated 2001-01-12">
-<p>Version 1.1beta1 is also available online in <a
-href="../jakarta-log4j-1.1b1.tar.gz"><b>TGZ</b></a> format or in <a
-href="../jakarta-log4j-1.1b1.zip"><b>ZIP</b></a> format.
-</p>
+<p>Download the complete package including <i>full source code</i>,
+class files and documentation in <a
+href="../jakarta-log4j-1.0.4.tgz"><b>TGZ</b></a> format or in <a
+href="../jakarta-log4j-1.0.4.zip"><b>ZIP</b></a> format.</p>
+<p>Version 1.0.4 is the 20th major public release of log4j.</p>
</section>
+
<section name="Third-party software">
1.3 +13 -0 jakarta-log4j/src/xdocs/earlier.xml
Index: earlier.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/earlier.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- earlier.xml 2001/01/14 20:50:21 1.2
+++ earlier.xml 2001/04/17 19:59:38 1.3
@@ -21,6 +21,19 @@
<dd>
Download full package in <a href="../jakarta-log4j-1.0.4.tgz">TGZ</a> format.
</dd>
+
+ <dt><b>jakarta-log4j-1.1b1</b></dt>
+ <dd>
+ Download full package in <a
+ href="../jakarta-log4j-1.1b1.tar.tgz">TAR.GZ</a> format.
+ </dd>
+
+ <dt><b>jakarta-log4j-1.1b2</b></dt>
+ <dd>
+ Download full package in <a
+ href="../jakarta-log4j-1.1b2.tar.tgz">TAR.GZ</a> format.
+ </dd>
+
</dl>
1.5 +2 -1 jakarta-log4j/src/xdocs/velocity.properties
Index: velocity.properties
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/velocity.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- velocity.properties 2001/02/14 12:45:19 1.4
+++ velocity.properties 2001/04/17 19:59:38 1.5
@@ -1,2 +1,3 @@
-resource.loader.1.resource.path=../../jakarta-site2/xdocs/stylesheets
+resource.loader.1.resource.path=../../../jakarta-site2/xdocs/stylesheets
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
