ceki 01/06/20 22:19:48
Modified: docs critique.html plan.html
src/java/org/apache/log4j HTMLLayout.java
src/java/org/apache/log4j/helpers BoundedFIFO.java
src/java/org/apache/log4j/xml/examples extension1.xml
extension2.xml sample1.xml sample2.xml sample3.xml
Log:
- Updated sample xml files to use ConsoleAppender instead of the FileAppender.
- Small optimizing change to HTMLLayout.java
- Misc. typo corrections
Revision Changes Path
1.13 +26 -16 jakarta-log4j/docs/critique.html
Index: critique.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/critique.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- critique.html 2001/06/19 18:45:23 1.12
+++ critique.html 2001/06/21 05:19:43 1.13
@@ -181,7 +181,7 @@
to use log4j.
<ul>
-<li><a
href="http://www.jcorporate.com/html/products/expresso/logging.html";>Espresso
Framework</a>
+<li><a
href="http://www.jcorporate.com/html/products/expresso/logging.html";>Expresso
Framework</a>
<li><a href="http://www.free-project.org/";>Free E-Democracy Project</a>
<li><a href="http://java.freehep.org";>FreeHEP</a>
<li><a href="http://www.jboss.org";>JBoss</a>
@@ -305,7 +305,7 @@
Microsystems. <em>The address of the JSR47 experts group mailing list
is considered confidential information.</em> I do not know it myself.
-<p>Over one hundred individuals, including some from very large
+<p>Well over one hundred individuals, including some from very large
accounts, have written to Sun to express their concern, in their vast
majority pushing for the adoption of log4j. Their names and the
content of their request are listed below. I am very grateful for
@@ -366,7 +366,7 @@
<li><p><a href="pub-support/LewisGardner.html">Lewis Gardner</a> <!-- -->
<li><p><a href="pub-support/DanielSavarese.html">Daniel F. Savarese</a> <!-- -->
<li><p><a href="pub-support/PayamMirrashidi.html">Payam Mirrashidi</a> <!-- -->
-<li><p><a href="pub-support/BruceDeen.html">Bruce W. Deen</a>
+<li><p><a href="pub-support/BruceDeen.html">Bruce W. Deen</a> <!-- -->
<li><p><a href="pub-support/EmilyBache.html">Emily Bache</a> and her <a
href="pub-support/EmilyBache2.html">follow up</a> <!-- -->
<li><p><a href="pub-support/JulienDubois.html">Julien Dubois</a> <!-- -->
<li><p><a href="pub-support/AlefArendsen.html">Alef Arendsen</a> <!-- -->
@@ -418,22 +418,32 @@
<li><p><a href="pub-support/AxelBoness.html">Axel Boness</a> <!-- -->
<li><p><a href="pub-support/EdHowland.html">Ed Howland</a> <!-- -->
<li><p><a href="pub-support/FredericSoulier.html">Frederic Soulier</a> <!-- -->
+<li><p><a href="pub-support/NathanQuinlan.html">Nathan Quinlan</a> <!-- -->
+<li><p><a href="pub-support/LaurentCornelis.html">Laurent Cornelis</a>
+<li><p><a href="pub-support/RomainGuy.html">Romain Guy</a> <!-- -->
+<li><p><a href="pub-support/OliverBurn.html">Oliver Burn</a> <!-- -->
+<li><p><a href="pub-support/JonathanKeatley.html">Jonathan C. Keatley</a>
+<li><p><a href="pub-support/YannickMenager.html">Yannick Menager</a> <!-- -->
+<li><p><a href="pub-support/JeromeLacoste.html">Jérôme Lacoste</a>
+<li><p><a href="pub-support/FabienModoux.html">Fabien Modoux</a> <!-- -->
+<li><p><a href="pub-support/YuriyYatsyk.html">Yuriy Yatsyk</a> <!-- -->
+<li><p><a href="pub-support/AndreCusson.html">Andre Cusson</a>
+<li><p><a href="pub-support/RahulBhargava.html">Rahul Bhargava</a>
<!--
-
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
-<li><p><a href="pub-support/ .html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
+<li><p><a href="pub-support/.html"></a>
-->
1.2 +1 -1 jakarta-log4j/docs/plan.html
Index: plan.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/plan.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plan.html 2001/06/19 07:24:35 1.1
+++ plan.html 2001/06/21 05:19:44 1.2
@@ -12,7 +12,7 @@
</center>
<p>Here is my proposed plan for the next major log4j release. As
customary, there is no scheduled release date. It will be ready when
-its ready. Your comments and suggestions are most welcome.
+it is ready. Your comments and suggestions are most welcome.
<p>After we get appropriate feedback we can proceed with a vote.
1.20 +11 -12 jakarta-log4j/src/java/org/apache/log4j/HTMLLayout.java
Index: HTMLLayout.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/HTMLLayout.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- HTMLLayout.java 2001/04/30 22:51:46 1.19
+++ HTMLLayout.java 2001/06/21 05:19:45 1.20
@@ -306,7 +306,7 @@
//what was sent in.
if( input == null || input.length() == 0 ) {
- return input;
+ return input;
}
//Use a StringBuffer in lieu of String concatenation -- it is
@@ -315,17 +315,16 @@
StringBuffer buf = new StringBuffer(input.length() + 6);
char ch = ' ';
- for(int i=0; i < input.length(); i++) {
- ch = input.charAt(i);
- if(ch == '<') {
- buf.append("<");
- }
- else if(ch == '>') {
- buf.append(">");
- }
- else {
- buf.append(ch);
- }
+ int len = input.length();
+ for(int i=0; i < len; i++) {
+ ch = input.charAt(i);
+ if(ch == '<') {
+ buf.append("<");
+ } else if(ch == '>') {
+ buf.append(">");
+ } else {
+ buf.append(ch);
+ }
}
return buf.toString();
1.5 +3 -0 jakarta-log4j/src/java/org/apache/log4j/helpers/BoundedFIFO.java
Index: BoundedFIFO.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/BoundedFIFO.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BoundedFIFO.java 2001/01/24 22:41:24 1.4
+++ BoundedFIFO.java 2001/06/21 05:19:46 1.5
@@ -7,6 +7,7 @@
*/
// Contributors: Mathias Bogaert
+// [EMAIL PROTECTED]
package org.apache.log4j.helpers;
@@ -48,6 +49,8 @@
return null;
LoggingEvent r = buf[first];
+ buf[first] = null; // help garbage collection
+
if(++first == maxSize) {
first = 0;
}
1.4 +3 -4
jakarta-log4j/src/java/org/apache/log4j/xml/examples/extension1.xml
Index: extension1.xml
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/extension1.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- extension1.xml 2001/06/18 09:13:16 1.3
+++ extension1.xml 2001/06/21 05:19:46 1.4
@@ -5,9 +5,8 @@
-<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
- <appender name="STDOUT" class="org.apache.log4j.FileAppender">
- <param name="File" value="System.out" />
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+ <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%d %-5p [%t] %C{2} (%F:%L) - %m\n"/>
@@ -15,7 +14,7 @@
</appender>
<!-- Note the class attribute! -->
- <category name="org.log4j.xml"
+ <category name="org.apache.log4j.xml"
class="org.apache.log4j.xml.examples.XCategory">
<priority value="info" />
</category>
1.4 +1 -2
jakarta-log4j/src/java/org/apache/log4j/xml/examples/extension2.xml
Index: extension2.xml
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/extension2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- extension2.xml 2001/06/18 09:13:18 1.3
+++ extension2.xml 2001/06/21 05:19:46 1.4
@@ -11,8 +11,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
- <appender name="STDOUT" class="org.apache.log4j.FileAppender">
- <param name="File" value="System.out" />
+ <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%d %-5p [%t] %c %C{3} (%F:%L) - %m\n"/>
1.6 +1 -2 jakarta-log4j/src/java/org/apache/log4j/xml/examples/sample1.xml
Index: sample1.xml
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/sample1.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sample1.xml 2001/06/18 09:13:19 1.5
+++ sample1.xml 2001/06/21 05:19:47 1.6
@@ -3,8 +3,7 @@
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
- <appender name="STDOUT" class="org.apache.log4j.FileAppender">
- <param name="File" value="System.out" />
+ <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
1.6 +1 -3 jakarta-log4j/src/java/org/apache/log4j/xml/examples/sample2.xml
Index: sample2.xml
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/sample2.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sample2.xml 2001/06/18 09:13:20 1.5
+++ sample2.xml 2001/06/21 05:19:47 1.6
@@ -11,9 +11,7 @@
</layout>
</appender>
- <appender name="STDOUT" class="org.apache.log4j.FileAppender">
- <param name="File" value="System.out" />
-
+ <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
1.6 +1 -2 jakarta-log4j/src/java/org/apache/log4j/xml/examples/sample3.xml
Index: sample3.xml
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/sample3.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sample3.xml 2001/06/18 09:13:21 1.5
+++ sample3.xml 2001/06/21 05:19:47 1.6
@@ -11,8 +11,7 @@
value="%t %-5p %c{2} - %m%n"/>
</layout>
</appender>
- <appender name="STDOUT" class="org.apache.log4j.FileAppender">
- <param name="File" value="System.out"/>
+ <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
