sdeboy 2004/09/10 13:12:19
Modified: src/java/org/apache/log4j/chainsaw
ChainsawCyclicBufferTableModel.java
. build.xml
src/java/org/apache/log4j/chainsaw/layout
DefaultDetailLayout.html
src/java/org/apache/log4j/chainsaw/help release-notes.html
src/java/org/apache/log4j/varia LogFilePatternReceiver.java
Log:
- modified file, line, method and class checks in tablemodel to avoid null pointers
- added PRE tags around message to display multiline messages correctly in
detail/tooltips
- logfilepatternreceiver is now more accurate when checking exception lines
- logfilepatternreceiver now escapes # characters by default in the pattern so that
regular expression matching succeeds
- logfilepatternreceiver matches now work with empty strings (.* instead of .+)
- build now provides debug information for Chainsaw classes
Revision Changes Path
1.37 +4 -4
logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
Index: ChainsawCyclicBufferTableModel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChainsawCyclicBufferTableModel.java 7 Sep 2004 17:16:02 -0000 1.36
+++ ChainsawCyclicBufferTableModel.java 10 Sep 2004 20:12:18 -0000 1.37
@@ -410,25 +410,25 @@
case ChainsawColumns.INDEX_CLASS_COL_NAME:
return ((info == null)
- || ((info != null) && info.getClassName().equals("?"))) ? ""
+ || ((info != null) && "?".equals(info.getClassName()))) ? ""
: info
.getClassName();
case ChainsawColumns.INDEX_FILE_COL_NAME:
return ((info == null)
- || ((info != null) && info.getFileName().equals("?"))) ? ""
+ || ((info != null) && "?".equals(info.getFileName()))) ? ""
: info
.getFileName();
case ChainsawColumns.INDEX_LINE_COL_NAME:
return ((info == null)
- || ((info != null) && info.getLineNumber().equals("?"))) ? ""
+ || ((info != null) && "?".equals(info.getLineNumber()))) ? ""
: info
.getLineNumber();
case ChainsawColumns.INDEX_METHOD_COL_NAME:
return ((info == null)
- || ((info != null) && info.getMethodName().equals("?"))) ? ""
+ || ((info != null) && "?".equals(info.getMethodName()))) ? ""
: info
.getMethodName();
1.111 +1 -0 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- build.xml 8 Sep 2004 13:14:04 -0000 1.110
+++ build.xml 10 Sep 2004 20:12:18 -0000 1.111
@@ -370,6 +370,7 @@
<target name="build.chainsaw" depends="init, chainsawCheck, build.core"
if="chainsaw-libraries-present">
<javac deprecation="${deprecation}"
srcdir="${java.source.dir}"
+ debug="on"
destdir="${javac.dest}"
includes="${stem}/chainsaw/**/*.java,${stem}/rule/*.java,${stem}/varia/ExpressionFilter.java,${stem}/varia/LogFilePatternReceiver*.java"
excludes="${stem}/chainsaw/vfs/*.java">
1.8 +1 -1
logging-log4j/src/java/org/apache/log4j/chainsaw/layout/DefaultDetailLayout.html
Index: DefaultDetailLayout.html
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/layout/DefaultDetailLayout.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultDetailLayout.html 14 Jun 2004 22:53:56 -0000 1.7
+++ DefaultDetailLayout.html 10 Sep 2004 20:12:18 -0000 1.8
@@ -3,7 +3,7 @@
<TR><TD><B>Logger</B><TD>%c</td></tr>
<TR><TD><B>Time</B><TD>%d</td></tr>
<TR><TD><B>Thread</B><TD>%t</td></tr>
-<TR><TD><B>Message</B><TD>%m</td></tr>
+<TR><TD><B>Message</B><TD><pre>%m</pre></td></tr>
<TR><TD><B>NDC</B><TD>%x</td></tr>
<TR><TD><B>Class</B><TD>%C</td></tr>
<TR><TD><B>Method</B><TD>%M</td></tr>
1.43 +10 -0
logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html
Index: release-notes.html
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- release-notes.html 9 Sep 2004 08:34:14 -0000 1.42
+++ release-notes.html 10 Sep 2004 20:12:18 -0000 1.43
@@ -9,6 +9,16 @@
<h1>1.99.99</h2>
+<h2>10 September 2004</h2>
+<ul>
+<li>Modified file, line, method and class checks in tablemodel to avoid null
pointers</li>
+<li>Added PRE tags around message to display multiline messages correctly in
detail/tooltips</li>
+<li>LogFilePatternReceiver is now more accurate when checking exception lines</li>
+<li>LogFilePatternReceiver now escapes # characters by default in the pattern so
that regular expression matching succeeds</li>
+<li>LogFilePatternReceiver matches now work with empty strings (.* instead of
.+)</li>
+<li>Build now provides debug information for Chainsaw classes</li>
+</ul>
+
<h2>9 September 2004</h2>
<ul>
<li>Rewrote LogFilePatternReceiver to add support for multi-line messages and
improved parsing logic. To use this receiver you must now have the ORO library in
your classpath (ORO is included in the WebStart version).</li>
1.17 +5 -2
logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java
Index: LogFilePatternReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- LogFilePatternReceiver.java 9 Sep 2004 08:34:14 -0000 1.16
+++ LogFilePatternReceiver.java 10 Sep 2004 20:12:18 -0000 1.17
@@ -149,8 +149,10 @@
private static final String LINE = "LINE";
private static final String METHOD = "METHOD";
- private static final String EXCEPTION_PATTERN = "\t.*";
- private static final String REGEXP_WILDCARD = ".+";
+
+ //all lines other than first line of exception begin with tab followed by 'at'
followed by text
+ private static final String EXCEPTION_PATTERN = "\tat.*";
+ private static final String REGEXP_WILDCARD = ".*";
private static final String PATTERN_WILDCARD = "*";
private static final String GROUP = "(" + REGEXP_WILDCARD + ")";
@@ -581,6 +583,7 @@
input = replace("]", "\\]", input);
input = replace("{", "\\{", input);
input = replace("}", "\\}", input);
+ input = replace("#", "\\#", input);
return input;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
