ceki 01/04/18 10:21:16
Modified: build build.xml
docs HISTORY download.html
src/java/org/apache/log4j RollingFileAppender.java
src/xdocs download.xml
Log:
Preparing to release 1.1b3.
Misc. documentation updatees.
Revision Changes Path
1.22 +2 -2 jakarta-log4j/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 2001/04/18 08:44:04 1.21
+++ build.xml 2001/04/18 17:21:01 1.22
@@ -9,7 +9,7 @@
<!-- ================================================================= -->
<project name="log4j" default="usage" basedir=".." >
- <property name="version" value="1.1b2"/>
+ <property name="version" value="1.1b3"/>
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
@@ -331,7 +331,7 @@
<!-- ================================================================= -->
<!-- Build a complete distribution. Results go to ${dist.images} -->
<!-- ================================================================= -->
- <target name="dist" depends="init">
+ <target name="dist" depends="init, clean, jar, javadoc">
<delete verbose="true">
<fileset dir=".">
1.34 +9 -0 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- HISTORY 2001/04/18 08:44:07 1.33
+++ HISTORY 2001/04/18 17:21:05 1.34
@@ -5,6 +5,15 @@
client code.
[***] Changes requiring important modifications to existing client code.
+ April 18, 2001
+
+ - Release of version 1.1b3
+
+ - Added a RollingFileAppenderBeanInfo class that fakes the
+ maxFileSize JavaBeans property as a String type instead of a long.
+ This allows us to resuscitate setMaxFileSize(long) method which was
+ removed in 1.1b2 breaking 100% backward compatibility. This addition
+ restores 100% backward compatibility. [*]
April 18, 2001
1.18 +4 -4 jakarta-log4j/docs/download.html
Index: download.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/download.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- download.html 2001/04/17 22:32:19 1.17
+++ download.html 2001/04/18 17:21:07 1.18
@@ -106,18 +106,18 @@
<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.1beta2 (release candidate)"><strong>log4j
version 1.1beta2 (release candidate)</strong></a>
+ <a name="log4j version 1.1beta3 (release candidate)"><strong>log4j
version 1.1beta3 (release candidate)</strong></a>
</font>
</td></tr>
<tr><td>
<blockquote>
- <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
+ <p>Downlaod version 1.1beta3 (release candiate)
including <i>full
+source code</i>, class files and documentation in <a
href="../jakarta-log4j-1.1b3.tar.gz"><b>TAR.GZ</b></a> format or in <a
href="../jakarta-log4j-1.1b3.zip"><b>ZIP</b></a> format. You may elect
to browse log4j <a href="documentation.html"><b>documentation</b></a>
online.</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%
+ <p>Version 1.1b3 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
1.11 +107 -76 jakarta-log4j/src/java/org/apache/log4j/RollingFileAppender.java
Index: RollingFileAppender.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/RollingFileAppender.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RollingFileAppender.java 2001/04/18 16:24:16 1.10
+++ RollingFileAppender.java 2001/04/18 17:21:11 1.11
@@ -26,7 +26,7 @@
RollingFileAppender extends FileAppender to backup the log files when
they reach a certain size.
- @author <a HREF="mailto:[EMAIL PROTECTED]">Heinz Richter</a>
+ @author Heinz Richter
@author Ceki Gülcü
*/
@@ -97,6 +97,25 @@
RollingFileAppender(Layout layout, String filename) throws IOException {
super(layout, filename);
}
+
+ /**
+ Returns the value of the <b>MaxBackupIndex</b> option.
+ */
+ public
+ int getMaxBackupIndex() {
+ return maxBackupIndex;
+ }
+
+ /**
+ Get the maximum size that the output file is allowed to reach
+ before being rolled over to backup files.
+
+ @since 1.1
+ */
+ public
+ long getMaximumFileSize() {
+ return maxFileSize;
+ }
/**
Retuns the option names for this component, namely {@link
@@ -106,89 +125,15 @@
@deprecated We now use JavaBeans introspection to configure
components. Options strings are no longer needed.
- FileAppender}. */
+ */
public
String[] getOptionStrings() {
return OptionConverter.concatanateArrays(super.getOptionStrings(),
new String[] {MAX_FILE_SIZE_OPTION, MAX_BACKUP_INDEX_OPTION});
}
-
- /**
-
- @deprecated Use the setter method for the option directly instead
- of the generic <code>setOption</code> method.
- */
- public
- void setOption(String key, String value) {
- super.setOption(key, value);
- if(key.equalsIgnoreCase(MAX_FILE_SIZE_OPTION)) {
- maxFileSize = OptionConverter.toFileSize(value, maxFileSize + 1);
- }
- else if(key.equalsIgnoreCase(MAX_BACKUP_INDEX_OPTION)) {
- maxBackupIndex = OptionConverter.toInt(value, maxBackupIndex);
- }
- }
-
/**
- Set the maximum number of backup files to keep around.
-
- <p>The <b>MaxBackupIndex</b> option determines how many backup
- files are kept before the oldest is erased. This option takes
- a positive integer value. If set to zero, then there will be no
- backup files and the log file will be truncated when it reaches
- <code>MaxFileSize</code>.
- */
- public
- void setMaxBackupIndex(int maxBackups) {
- this.maxBackupIndex = maxBackups;
- }
-
- /**
- Returns the value of the <b>MaxBackupIndex</b> option.
- */
- public
- int getMaxBackupIndex() {
- return maxBackupIndex;
- }
-
- /**
- Set the maximum size that the output file is allowed to reach
- before being rolled over to backup files.
- */
- public
- void setMaxFileSize(long maxFileSize) {
- this.maxFileSize = maxFileSize;
- }
-
- /**
- Set the maximum size that the output file is allowed to reach
- before being rolled over to backup files.
-
- <p>In configuration files, the <b>MaxFileSize</b> option takes an
- long integer in the range 0 - 2^63. You can specify the value
- with the suffixes "KB", "MB" or "GB" so that the integer is
- interpreted being expressed respectively in kilobytes, megabytes
- or gigabytes. For example, the value "10KB" will be interpreted
- as 10240.
- */
- public
- void setMaxFileSize(String value) {
- maxFileSize = OptionConverter.toFileSize(value, maxFileSize + 1);
- }
-
- public
- synchronized
- void setFile(String fileName, boolean append) throws IOException {
- super.setFile(fileName, append);
- if(append) {
- File f = new File(fileName);
- ((CountingQuietWriter) qw).setCount(f.length());
- }
- }
-
- /**
Implements the usual roll over behaviour.
<p>If <code>MaxBackupIndex</code> is positive, then files
@@ -245,6 +190,92 @@
catch(IOException e) {
LogLog.error("setFile("+fileName+", false) call failed.", e);
}
+ }
+
+ public
+ synchronized
+ void setFile(String fileName, boolean append) throws IOException {
+ super.setFile(fileName, append);
+ if(append) {
+ File f = new File(fileName);
+ ((CountingQuietWriter) qw).setCount(f.length());
+ }
+ }
+
+ /**
+
+ @deprecated Use the setter method for the option directly instead
+ of the generic <code>setOption</code> method.
+
+ */
+ public
+ void setOption(String key, String value) {
+ super.setOption(key, value);
+ if(key.equalsIgnoreCase(MAX_FILE_SIZE_OPTION)) {
+ maxFileSize = OptionConverter.toFileSize(value, maxFileSize + 1);
+ }
+ else if(key.equalsIgnoreCase(MAX_BACKUP_INDEX_OPTION)) {
+ maxBackupIndex = OptionConverter.toInt(value, maxBackupIndex);
+ }
+ }
+
+ /**
+ Set the maximum number of backup files to keep around.
+
+ <p>The <b>MaxBackupIndex</b> option determines how many backup
+ files are kept before the oldest is erased. This option takes
+ a positive integer value. If set to zero, then there will be no
+ backup files and the log file will be truncated when it reaches
+ <code>MaxFileSize</code>.
+ */
+ public
+ void setMaxBackupIndex(int maxBackups) {
+ this.maxBackupIndex = maxBackups;
+ }
+
+ /**
+ Set the maximum size that the output file is allowed to reach
+ before being rolled over to backup files.
+
+ @deprecated Use {@link #setMaximumFileSize} instead.
+ */
+ public
+ void setMaxFileSize(long maxFileSize) {
+ this.maxFileSize = maxFileSize;
+ }
+
+ /**
+ Set the maximum size that the output file is allowed to reach
+ before being rolled over to backup files.
+
+ <p>This method is equivalent to {@link #setMaxFileSize} except
+ that it is required for differentiating the setter taking a
+ <code>long</code> argument from the setter taking a
+ <code>String</code> argument by the JavaBeans {@link
+ java.beans.Introspector Introspector}.
+
+ @see setMaxFileSize(String)
+ */
+ public
+ void setMaximumFileSize(long maxFileSize) {
+ this.maxFileSize = maxFileSize;
+ }
+
+
+ /**
+ Set the maximum size that the output file is allowed to reach
+ before being rolled over to backup files.
+
+ <p>In configuration files, the <b>MaxFileSize</b> option takes an
+ long integer in the range 0 - 2^63. You can specify the value
+ with the suffixes "KB", "MB" or "GB" so that the integer is
+ interpreted being expressed respectively in kilobytes, megabytes
+ or gigabytes. For example, the value "10KB" will be interpreted
+ as 10240.
+ */
+ public
+ void setMaxFileSize(String value) {
+ maxFileSize = OptionConverter.toFileSize(value, maxFileSize + 1);
}
protected
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- download.xml 2001/04/17 19:59:37 1.13
+++ download.xml 2001/04/18 17:21:13 1.14
@@ -32,19 +32,19 @@
-->
-<section name="log4j version 1.1beta2 (release candidate)">
+<section name="log4j version 1.1beta3 (release candidate)">
-<p>Downlaod version 1.1beta2 (release candiate) including <i>full
+<p>Downlaod version 1.1beta3 (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
+href="../jakarta-log4j-1.1b3.tar.gz"><b>TAR.GZ</b></a> format or in <a
+href="../jakarta-log4j-1.1b3.zip"><b>ZIP</b></a> format. You may elect
to browse log4j <a href="documentation.html"><b>documentation</b></a>
online.</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%
+<p>Version 1.1b3 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
