You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2010/03/28 06:40:15 UTC
svn commit: r928338 - in /logging/log4j/trunk: src/changes/
src/main/java/org/apache/log4j/ src/main/java/org/apache/log4j/helpers/
src/main/java/org/apache/log4j/pattern/ tests/ tests/input/pattern/
tests/src/java/org/apache/log4j/ tests/src/java/org/...
Author: carnold
Date: Sun Mar 28 04:40:14 2010
New Revision: 928338
URL: http://svn.apache.org/viewvc?rev=928338&view=rev
Log:
Bug 48902: Add %throwable{n} pattern (plus bring pattern layout tests into default test run)
Modified:
logging/log4j/trunk/src/changes/changes.xml
logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedPatternLayout.java
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/MDCKeySetExtractor.java
logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/CachedDateFormat.java
logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/DatePatternConverter.java
logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/PropertiesPatternConverter.java
logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/ThrowableInformationPatternConverter.java
logging/log4j/trunk/tests/build.xml
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout.mdc.1.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout1.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout10.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout11.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout12.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout13.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout14.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout15.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout16.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout2.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout3.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout4.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout5.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout6.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout7.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout8.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout9.properties
logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java
Modified: logging/log4j/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Sun Mar 28 04:40:14 2010
@@ -105,6 +105,7 @@
<action action="fix" issue="49006">Eclipse Java Compiler and gcj do not support -source=1.2.</action>
<action action="fix" issue="49007">CachedDateFormatTest fails on Apache Harmony.</action>
<action action="add" issue="49010">Add %p{-2} pattern to EnhancedPatternLayout to drop two leading elements from name.</action>
+ <action action="add" issue="48902">Add %throwable{n} and {-n} pattern to EnhancedPatternLayout to print n or drop last n lines.</action>
</release>
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedPatternLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedPatternLayout.java?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedPatternLayout.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedPatternLayout.java Sun Mar 28 04:40:14 2010
@@ -286,11 +286,14 @@ import org.apache.log4j.spi.LoggingEvent
<td>
<p>Used to output the Throwable trace that has been bound to the LoggingEvent, by
- default this will output the full trace as one would normally find by a call to Throwable.printStackTrace().
- The throwable conversion word can be followed by an option in the form <b>%throwable{short}</b>
- which will only output the first line of the ThrowableInformation, or <b>%throwable{none}</b> which
- will suppress the stack trace. If no %throwable pattern is provided, the appender may provide its
- rendering of the exception.</p>
+ default this will output the full trace as one would normally
+ find by a call to Throwable.printStackTrace().
+ <b>%throwable{short}</b> or <b>%throwable{1}</b> will output the first line of
+ stack trace. <b>throwable{none}</b> or <b>throwable{0}</b> will suppress
+ the stack trace. <b>%throwable{n}</b> will output n lines of stack trace
+ if a positive integer or omit the last -n lines if a negative integer.
+ If no %throwable pattern is specified, the appender will take
+ responsibility to output the stack trace as it sees fit.</p>
</td>
</tr>
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/MDCKeySetExtractor.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/MDCKeySetExtractor.java?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/MDCKeySetExtractor.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/MDCKeySetExtractor.java Sun Mar 28 04:40:14 2010
@@ -20,7 +20,6 @@ import org.apache.log4j.spi.LoggingEvent
import org.apache.log4j.pattern.LogEvent;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import java.util.Set;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/CachedDateFormat.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/CachedDateFormat.java?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/CachedDateFormat.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/CachedDateFormat.java Sun Mar 28 04:40:14 2010
@@ -35,6 +35,10 @@ import java.util.TimeZone;
*/
public final class CachedDateFormat extends DateFormat {
/**
+ * Serialization version.
+ */
+ private static final long serialVersionUID = 1;
+ /**
* Constant used to represent that there was no change
* observed when changing the millisecond count.
*/
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/DatePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/DatePatternConverter.java?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/DatePatternConverter.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/DatePatternConverter.java Sun Mar 28 04:40:14 2010
@@ -71,7 +71,11 @@ public final class DatePatternConverter
* default time zone before each format and parse request.
*/
private static class DefaultZoneDateFormat extends DateFormat {
- /**
+ /**
+ * Serialization version ID.
+ */
+ private static final long serialVersionUID = 1;
+ /**
* Wrapped instance of DateFormat.
*/
private final DateFormat dateFormat;
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/PropertiesPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/PropertiesPatternConverter.java?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/PropertiesPatternConverter.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/PropertiesPatternConverter.java Sun Mar 28 04:40:14 2010
@@ -19,11 +19,6 @@ package org.apache.log4j.pattern;
import org.apache.log4j.spi.LoggingEvent;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.*;
import java.util.Iterator;
import java.util.Set;
import org.apache.log4j.helpers.*;
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/ThrowableInformationPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/ThrowableInformationPatternConverter.java?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/ThrowableInformationPatternConverter.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/ThrowableInformationPatternConverter.java Sun Mar 28 04:40:14 2010
@@ -22,18 +22,23 @@ import org.apache.log4j.spi.ThrowableInf
/**
- * Outputs the ThrowableInformation portion of the LoggingiEvent as a full stacktrace
- * unless this converter's option is 'short', where it just outputs the first line of the trace.
+ * Outputs the ThrowableInformation portion of the LoggingEvent.
+ * By default, outputs the full stack trace. %throwable{none}
+ * or %throwable{0} suppresses the stack trace. %throwable{short}
+ * or %throwable{1} outputs just the first line. %throwable{n}
+ * will output n lines for a positive integer or drop the last
+ * -n lines for a negative integer.
*
* @author Paul Smith
*
*/
public class ThrowableInformationPatternConverter
extends LoggingEventPatternConverter {
+
/**
- * If "short", only first line of throwable report will be formatted.
+ * Maximum lines of stack trace to output.
*/
- private final String option;
+ private int maxLines = Integer.MAX_VALUE;
/**
* Private constructor.
@@ -44,9 +49,16 @@ public class ThrowableInformationPattern
super("Throwable", "throwable");
if ((options != null) && (options.length > 0)) {
- option = options[0];
- } else {
- option = null;
+ if("none".equals(options[0])) {
+ maxLines = 0;
+ } else if("short".equals(options[0])) {
+ maxLines = 1;
+ } else {
+ try {
+ maxLines = Integer.parseInt(options[0]);
+ } catch(NumberFormatException ex) {
+ }
+ }
}
}
@@ -65,15 +77,17 @@ public class ThrowableInformationPattern
* {@inheritDoc}
*/
public void format(final LoggingEvent event, final StringBuffer toAppendTo) {
- if (!"none".equals(option)) {
+ if (maxLines != 0) {
ThrowableInformation information = event.getThrowableInformation();
if (information != null) {
String[] stringRep = information.getThrowableStrRep();
int length = stringRep.length;
- if ("short".equals(option)) {
- length = 1;
+ if (maxLines < 0) {
+ length += maxLines;
+ } else if (length > maxLines) {
+ length = maxLines;
}
for (int i = 0; i < length; i++) {
Modified: logging/log4j/trunk/tests/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/build.xml?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/build.xml (original)
+++ logging/log4j/trunk/tests/build.xml Sun Mar 28 04:40:14 2010
@@ -166,7 +166,7 @@
<!-- created witness file. -->
<!-- ================================================================= -->
<target name="regression" depends="Core, Minimum, Logger, DOM, CustomLevel,
- CustomLogger,
+ CustomLogger,PatternLayout,
HierarchyThreshold, DefaultInit, SocketServer,
XMLLayout, AsyncAppender,
OptionConverter, BoundedFIFO,
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout.mdc.1.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout.mdc.1.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout.mdc.1.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout.mdc.1.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%-5p - %m %X%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout1.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout1.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout1.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout1.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootLogger=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.file=temp
+log4j.appender.testAppender.file=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%-5p - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout10.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout10.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout10.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout10.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File= temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append= false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=[%t] %-5p %l: %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout11.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout11.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout11.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout11.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%-5p [%t] %c{2}: %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout12.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout12.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout12.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout12.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=[%t] %-5p %C.%M(%F:%L): %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout13.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout13.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout13.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout13.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File= temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=[%t] %-5p %C{3}.%M(%F:%L): %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout14.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout14.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout14.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout14.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%-5p [%t] %c{1.}: %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout15.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout15.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout15.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout15.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=TRACE, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File= temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedMyPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%5p %-4# - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout16.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout16.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout16.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout16.properties Sun Mar 28 04:40:14 2010
@@ -15,7 +15,7 @@
#
log4j.rootCategory=TRACE, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=patternLayout16.log
+log4j.appender.testAppender.File=output/patternLayout16.log
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}{GMT}Z %d{yyyy-MM-dd HH:mm:ss}{GMT-6}-0600 - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout2.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout2.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout2.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout2.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append= false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %.16c - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout3.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout3.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout3.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout3.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %.16c - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout4.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout4.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout4.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout4.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%d{DATE} [%t] %-5p %.16c - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout5.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout5.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout5.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout5.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %.16c - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout6.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout6.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout6.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout6.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%d{ABSOLUTE} [%t] %-5p %.16c - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout7.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout7.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout7.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout7.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %.16c - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout8.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout8.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout8.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout8.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%r [%t] %-5p %.16c - %m%n
Modified: logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout9.properties
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout9.properties?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout9.properties (original)
+++ logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout9.properties Sun Mar 28 04:40:14 2010
@@ -14,7 +14,7 @@
# limitations under the License.
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
-log4j.appender.testAppender.File=temp
+log4j.appender.testAppender.File=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=[%t] %-5p %.16c : %m%n
Modified: logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java (original)
+++ logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java Sun Mar 28 04:40:14 2010
@@ -40,8 +40,8 @@ import java.io.*;
public class EnhancedPatternLayoutTestCase extends TestCase {
- static String TEMP = "temp";
- static String FILTERED = "filtered";
+ static String TEMP = "output/temp";
+ static String FILTERED = "output/filtered";
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*\\)";
static String EXCEPTION3 = "\\s*at .*\\((Native Method|Unknown Source)\\)";
@@ -110,7 +110,6 @@ public class EnhancedPatternLayoutTestCa
return Compare.compare(actual, expected);
}
-
public void test1() throws Exception {
configure("input/pattern/enhancedPatternLayout1.properties");
common();
@@ -389,7 +388,7 @@ public class EnhancedPatternLayoutTestCa
configure("input/pattern/enhancedPatternLayout16.properties");
common();
final long end = new Date().getTime();
- FileReader reader = new FileReader("patternLayout16.log");
+ FileReader reader = new FileReader("output/patternLayout16.log");
char chars[] = new char[50];
reader.read(chars, 0, chars.length);
reader.close();
@@ -435,7 +434,7 @@ public class EnhancedPatternLayoutTestCa
/**
Test case for MDC conversion pattern. */
public void testMDC2() throws Exception {
- String OUTPUT_FILE = "patternLayout.mdc.2";
+ String OUTPUT_FILE = "output/patternLayout.mdc.2";
String WITNESS_FILE = "witness/pattern/enhancedPatternLayout.mdc.2";
String mdcMsgPattern1 = "%m : %X%n";
@@ -520,7 +519,7 @@ public class EnhancedPatternLayoutTestCa
/**
Test case for throwable conversion pattern. */
public void testThrowable() throws Exception {
- String OUTPUT_FILE = "patternLayout.throwable";
+ String OUTPUT_FILE = "output/patternLayout.throwable";
String WITNESS_FILE = "witness/pattern/enhancedPatternLayout.throwable";
Modified: logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java?rev=928338&r1=928337&r2=928338&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java (original)
+++ logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java Sun Mar 28 04:40:14 2010
@@ -17,10 +17,11 @@
package org.apache.log4j.util;
-import java.util.regex.Pattern;
+import org.apache.oro.text.perl.Perl5Util;
public class EnhancedJunitTestRunnerFilter implements Filter {
+ private Perl5Util util = new Perl5Util();
private static final String[] PATTERNS = {
"at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner",
@@ -33,14 +34,8 @@ public class EnhancedJunitTestRunnerFilt
"at org.junit.internal.runners.",
"at junit.framework.JUnit4TestAdapter"
};
- private final Pattern[] patterns;
public EnhancedJunitTestRunnerFilter() {
- patterns = new Pattern[PATTERNS.length];
- for (int i = 0; i < PATTERNS.length; i++) {
- patterns[i] = Pattern.compile(PATTERNS[i]);
- }
-
}
/**
@@ -58,11 +53,14 @@ public class EnhancedJunitTestRunnerFilt
return "\tat java.lang.reflect.Method.invoke(X)\n" + in;
}
- for (int i = 0; i < patterns.length; i++) {
- if(patterns[i].matcher(in).find()) {
+ for (int i = 0; i < PATTERNS.length; i++) {
+ if(in.indexOf(PATTERNS[i]) != -1) {
return null;
}
}
+ if (util.match("/\\sat /", in)) {
+ return "\t" + in.trim();
+ }
return in;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org