You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-cvs@jakarta.apache.org by ce...@apache.org on 2001/02/13 22:18:47 UTC
cvs commit: jakarta-log4j/org/apache/log4j/test/witness pattern.15
ceki 01/02/13 13:18:47
Modified: org/apache/log4j HTMLLayout.java
org/apache/log4j/test filter.pl pattern
Added: org/apache/log4j/test/witness pattern.15
Log:
Documentation changes. Test file updates.
Revision Changes Path
1.11 +11 -4 jakarta-log4j/org/apache/log4j/HTMLLayout.java
Index: HTMLLayout.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/HTMLLayout.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HTMLLayout.java 2001/01/26 13:27:45 1.10
+++ HTMLLayout.java 2001/02/13 21:18:38 1.11
@@ -14,7 +14,11 @@
import java.io.PrintWriter;
import java.io.Writer;
+/**
+ This layout outputs events in a HTML table.
+ @author Ceki Gülcü
+ */
public class HTMLLayout extends Layout {
protected final int BUF_SIZE = 256;
@@ -35,10 +39,7 @@
// Print no location info by default
boolean locationInfo = false;
- public
- void activateOptions() {
- }
-
+
public
String format(LoggingEvent event) {
@@ -142,6 +143,9 @@
}
+ /**
+ Returns a String consisting of one element {@link
+ #LOCATION_INFO_OPTION}. */
public
String[] getOptionStrings() {
return new String[] {LOCATION_INFO_OPTION};
@@ -159,6 +163,9 @@
}
+ /**
+ The HTML layout handles the throwable contained in logging
+ events. Hence, this method return <code>false</code>. */
public
boolean ignoresThrowable() {
return false;
1.3 +36 -5 jakarta-log4j/org/apache/log4j/test/filter.pl
Index: filter.pl
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/test/filter.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filter.pl 2001/01/20 16:02:21 1.2
+++ filter.pl 2001/02/13 21:18:42 1.3
@@ -1,7 +1,7 @@
# Usage: perl filter.pl input output exceptionString layout
# where exceptionString is the string to filter in stack traces
-# layout is one of NONE|LINE_NUMBER|RELATIVE|DATE|ABSOLUTE|ISO8601
+# layout is one of NONE|LINE_NUMBER|RELATIVE|DATE|ABSOLUTE|ISO8601|HTML
#
$INPUT=$ARGV[0];
@@ -17,11 +17,11 @@
if ($LAYOUT =~ "NONE") {
doNoneFilter();
-}
-elsif($LAYOUT =~ "LINE_NUMBER") {
+} elsif($LAYOUT =~ "LINE_NUMBER") {
doLineNumberFilter();
-}
-else {
+} elsif($LAYOUT =~ "HTML") {
+ doHTMLFilter();
+} else {
doFilter($LAYOUT);
}
@@ -36,6 +36,37 @@
sub doNoneFilter {
while(<IN>) {
print OUT;
+ }
+}
+
+sub doHTMLFilter {
+ while(<IN>) {
+ if(/\($EXSTR\.java:\d*\)/) {
+ s/\($EXSTR\.java:\d+\)/\($EXSTR\.java:XXX\)/g;
+ }
+ elsif(/\(Compiled Code\)/) {
+ s/\(Compiled Code\)$/\($EXSTR\.java:XXX\)/g;
+ }
+ elsif(/<tr><td>\d+<\/td>/) {
+ s/<tr><td>\d+<\/td>/<tr><td>XXX<\/td>/;
+ }
+ print OUT ;
+ }
+}
+
+sub doLineNumberFilter {
+ while(<IN>) {
+ if(/\($EXSTR\.java:\d*\)/) {
+ s/\($EXSTR\.java:\d+\)$/\($EXSTR\.java:XXX\)/;
+ print OUT;
+ }
+ elsif(/\(Compiled Code\)/) {
+ s/\(Compiled Code\)$/\($EXSTR\.java:XXX\)/;
+ print OUT;
+ }
+ else {
+ print OUT;
+ }
}
}
1.4 +1 -1 jakarta-log4j/org/apache/log4j/test/pattern
Index: pattern
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/test/pattern,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pattern 2001/02/13 17:37:34 1.3
+++ pattern 2001/02/13 21:18:43 1.4
@@ -192,5 +192,5 @@
lecho "log4j.appender.testAppender.File= $TEMP "
lecho "log4j.appender.testAppender.Append=false"
lecho "log4j.appender.testAppender.layout=org.apache.log4j.HTMLLayout"
- testPattern NONE
+ testPattern HTML
fi
1.1 jakarta-log4j/org/apache/log4j/test/witness/pattern.15
Index: pattern.15
===================================================================
<html><body>
<table border="1" cellpadding="2">
<tr>
<th>Time</th><th>Thread</th><th>Priority</th><th>Category</th><th>NDC</th><th>Message</th></tr>
<tr><td>XXX</td>
<td>main</td>
<td>DEBUG</td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 0</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td>DEBUG</td>
<td>root</td>
<td>null</td>
<td>Message 0</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td>INFO</td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 1</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td>INFO</td>
<td>root</td>
<td>null</td>
<td>Message 1</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">WARN</font></td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 2</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">WARN</font></td>
<td>root</td>
<td>null</td>
<td>Message 2</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">ERROR</font></td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 3</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">ERROR</font></td>
<td>root</td>
<td>null</td>
<td>Message 3</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">FATAL</font></td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 4</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">FATAL</font></td>
<td>root</td>
<td>null</td>
<td>Message 4</td>
</tr>
<tr><td>XXX</td>
<td>main</td>
<td>DEBUG</td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 5</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr>
<tr><td>XXX</td>
<td>main</td>
<td>DEBUG</td>
<td>root</td>
<td>null</td>
<td>Message 5</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr>
<tr><td>XXX</td>
<td>main</td>
<td>INFO</td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 6</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr>
<tr><td>XXX</td>
<td>main</td>
<td>INFO</td>
<td>root</td>
<td>null</td>
<td>Message 6</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">WARN</font></td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 7</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">WARN</font></td>
<td>root</td>
<td>null</td>
<td>Message 7</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">ERROR</font></td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 8</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">ERROR</font></td>
<td>root</td>
<td>null</td>
<td>Message 8</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">FATAL</font></td>
<td>org.apache.log4j.test.PatternTest</td>
<td>null</td>
<td>Message 9</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr>
<tr><td>XXX</td>
<td>main</td>
<td><font color="#FF0000">FATAL</font></td>
<td>root</td>
<td>null</td>
<td>Message 9</td>
</tr>
<tr><td colspan="7">java.lang.Exception: Just testing
<br> at org.apache.log4j.test.PatternTest.test(PatternTest.java:XXX)<br> at org.apache.log4j.test.PatternTest.main(PatternTest.java:XXX)</td></tr></table></body></html>