You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2014/07/27 07:28:29 UTC
svn commit: r1613750 - in /logging/log4j/log4j2/trunk:
log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/
log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/
log4j-core/src/test/resources/ src/changes/ src/site/xdoc/manual/
Author: rpopma
Date: Sun Jul 27 05:28:28 2014
New Revision: 1613750
URL: http://svn.apache.org/r1613750
Log:
LOG4J2-749 Retain the default date pattern after fixing the ISO8601 pattern
Added:
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerTimestampMessageTest.xml (with props)
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf2.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-319.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-default.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-logback.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-ansi.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-name-ansi.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-no-ansi.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf-filter.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf2.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-flume.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf-filter.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf2.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-subst.xml
logging/log4j/log4j2/trunk/src/changes/changes.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml.vm
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java Sun Jul 27 05:28:28 2014
@@ -105,6 +105,17 @@ public final class DatePatternConverter
private static final String DATE_AND_TIME_PATTERN = "dd MMM yyyy HH:mm:ss,SSS";
/**
+ * DEFAULT string literal.
+ */
+ private static final String DEFAULT_FORMAT = "DEFAULT";
+
+ /**
+ * SimpleTimePattern for DEFAULT.
+ */
+ // package private for unit tests
+ static final String DEFAULT_PATTERN = "yyyy-MM-dd HH:mm:ss,SSS";
+
+ /**
* ISO8601_BASIC string literal.
*/
private static final String ISO8601_BASIC_FORMAT = "ISO8601_BASIC";
@@ -117,11 +128,13 @@ public final class DatePatternConverter
/**
* ISO8601 string literal.
*/
- private static final String ISO8601_FORMAT = "ISO8601";
+ // package private for unit tests
+ static final String ISO8601_FORMAT = "ISO8601";
/**
* SimpleTimePattern for ISO8601.
*/
+ // package private for unit tests
static final String ISO8601_PATTERN = "yyyy-MM-dd'T'HH:mm:ss,SSS";
/**
@@ -169,7 +182,9 @@ public final class DatePatternConverter
String pattern = null;
Formatter tempFormatter = null;
- if (patternOption == null || patternOption.equalsIgnoreCase(ISO8601_FORMAT)) {
+ if (patternOption == null || patternOption.equalsIgnoreCase(DEFAULT_FORMAT)) {
+ pattern = DEFAULT_PATTERN;
+ } else if (patternOption.equalsIgnoreCase(ISO8601_FORMAT)) {
pattern = ISO8601_PATTERN;
} else if (patternOption.equalsIgnoreCase(ISO8601_BASIC_FORMAT)) {
pattern = ISO8601_BASIC_PATTERN;
@@ -195,8 +210,8 @@ public final class DatePatternConverter
} catch (final IllegalArgumentException e) {
LOGGER.warn("Could not instantiate SimpleDateFormat with pattern " + patternOption, e);
- // default to the ISO8601 format
- tempFormat = new SimpleDateFormat(ISO8601_PATTERN);
+ // default to the DEFAULT format
+ tempFormat = new SimpleDateFormat(DEFAULT_PATTERN);
}
// if the option list contains a TZ option, then set it.
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java Sun Jul 27 05:28:28 2014
@@ -27,18 +27,31 @@ import static org.junit.Assert.*;
public class DatePatternConverterTest {
+ private static final String[] ISO8601_FORMAT = { DatePatternConverter.ISO8601_FORMAT };
+
@Test
public void testNewInstanceAllowsNullParameter() {
DatePatternConverter.newInstance(null); // no errors
}
@Test
- public void testFormatLogEventStringBuilder() {
+ public void testFormatLogEventStringBuilderDefaultPattern() {
LogEvent event = new MyLogEvent();
DatePatternConverter converter = DatePatternConverter.newInstance(null);
StringBuilder sb = new StringBuilder();
converter.format(event, sb);
+ String expected = "2011-12-30 10:56:35,987";
+ assertEquals(expected, sb.toString());
+ }
+
+ @Test
+ public void testFormatLogEventStringBuilderIso8601() {
+ LogEvent event = new MyLogEvent();
+ DatePatternConverter converter = DatePatternConverter.newInstance(ISO8601_FORMAT);
+ StringBuilder sb = new StringBuilder();
+ converter.format(event, sb);
+
String expected = "2011-12-30T10:56:35,987";
assertEquals(expected, sb.toString());
}
@@ -56,7 +69,7 @@ public class DatePatternConverterTest {
}
@Test
- public void testFormatObjectStringBuilder() {
+ public void testFormatObjectStringBuilderDefaultPattern() {
DatePatternConverter converter = DatePatternConverter.newInstance(null);
StringBuilder sb = new StringBuilder();
converter.format("nondate", sb);
@@ -66,21 +79,41 @@ public class DatePatternConverterTest {
}
@Test
- public void testFormatDateStringBuilder() {
+ public void testFormatDateStringBuilderDefaultPattern() {
DatePatternConverter converter = DatePatternConverter.newInstance(null);
StringBuilder sb = new StringBuilder();
converter.format(date(2001, 1, 1), sb);
+ String expected = "2001-02-01 14:15:16,123";
+ assertEquals(expected, sb.toString());
+ }
+
+ @Test
+ public void testFormatDateStringBuilderIso8601() {
+ DatePatternConverter converter = DatePatternConverter.newInstance(ISO8601_FORMAT);
+ StringBuilder sb = new StringBuilder();
+ converter.format(date(2001, 1, 1), sb);
+
String expected = "2001-02-01T14:15:16,123";
assertEquals(expected, sb.toString());
}
@Test
- public void testFormatStringBuilderObjectArray() {
+ public void testFormatStringBuilderObjectArrayDefaultPattern() {
DatePatternConverter converter = DatePatternConverter.newInstance(null);
StringBuilder sb = new StringBuilder();
converter.format(sb, date(2001, 1, 1), date(2002, 2, 2), date(2003, 3, 3));
+ String expected = "2001-02-01 14:15:16,123"; // only process first date
+ assertEquals(expected, sb.toString());
+ }
+
+ @Test
+ public void testFormatStringBuilderObjectArrayIso8601() {
+ DatePatternConverter converter = DatePatternConverter.newInstance(ISO8601_FORMAT);
+ StringBuilder sb = new StringBuilder();
+ converter.format(sb, date(2001, 1, 1), date(2002, 2, 2), date(2003, 3, 3));
+
String expected = "2001-02-01T14:15:16,123"; // only process first date
assertEquals(expected, sb.toString());
}
@@ -93,8 +126,8 @@ public class DatePatternConverterTest {
}
@Test
- public void testGetPatternReturnsISO8601ByDefault() {
- assertEquals(DatePatternConverter.ISO8601_PATTERN, DatePatternConverter.newInstance(null).getPattern());
+ public void testGetPatternReturnsCorrectDefault() {
+ assertEquals(DatePatternConverter.DEFAULT_PATTERN, DatePatternConverter.newInstance(null).getPattern());
}
}
Added: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerTimestampMessageTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerTimestampMessageTest.xml?rev=1613750&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerTimestampMessageTest.xml (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerTimestampMessageTest.xml Sun Jul 27 05:28:28 2014
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="ERROR">
+ <Appenders>
+ <RandomAccessFile name="RandomAccessFile" fileName="target/AsyncLoggerTimestampMessageTest.log"
+ immediateFlush="false" append="false">
+ <PatternLayout>
+ <Pattern>%d{UNIX_MILLIS} %m%n</Pattern>
+ </PatternLayout>
+ </RandomAccessFile>
+ </Appenders>
+
+ <Loggers>
+ <Root level="info" includeLocation="false">
+ <AppenderRef ref="RandomAccessFile"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Propchange: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerTimestampMessageTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf.xml Sun Jul 27 05:28:28 2014
@@ -21,11 +21,11 @@
<param name="File" value="target/testlog4j.log"/>
<param name="immediateFlush" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n"/>
+ <param name="ConversionPattern" value="%d %5p [%t] %c{1} %X{transactionId} - %m%n"/>
</layout>
</appender>
<root>
<level value="debug"/>
<appender-ref ref="TestLogfile"/>
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf2.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf2.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j12-perf2.xml Sun Jul 27 05:28:28 2014
@@ -21,11 +21,11 @@
<param name="File" value="target/testlog4j.log"/>
<param name="immediateFlush" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n"/>
+ <param name="ConversionPattern" value="%d %5p [%t] %c{1} %X{transactionId} - %m%n"/>
</layout>
</appender>
<root>
<level value="error"/>
<appender-ref ref="TestLogfile"/>
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-319.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-319.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-319.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-319.xml Sun Jul 27 05:28:28 2014
@@ -20,7 +20,7 @@
<Configuration status="OFF">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{ISO8601} %highlight{[%t] %-5level: %msg%n%throwable}" />
+ <PatternLayout pattern="%d %highlight{[%t] %-5level: %msg%n%throwable}" />
</Console>
</Appenders>
<Loggers>
@@ -29,4 +29,4 @@
<AppenderRef ref="Console" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-default.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-default.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-default.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-default.xml Sun Jul 27 05:28:28 2014
@@ -19,7 +19,7 @@
<Configuration status="OFF">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%highlight{%d{ISO8601} [%t] %-5level: %msg%n%throwable}" />
+ <PatternLayout pattern="%highlight{%d [%t] %-5level: %msg%n%throwable}" />
</Console>
</Appenders>
<Loggers>
@@ -28,4 +28,4 @@
<AppenderRef ref="Console" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-logback.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-logback.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-logback.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight-logback.xml Sun Jul 27 05:28:28 2014
@@ -19,7 +19,7 @@
<Configuration status="OFF">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%highlight{%d{ISO8601} [%t] %-5level: %msg%n%throwable}{style=Logback}" />
+ <PatternLayout pattern="%highlight{%d [%t] %-5level: %msg%n%throwable}{style=Logback}" />
</Console>
</Appenders>
<Loggers>
@@ -28,4 +28,4 @@
<AppenderRef ref="Console" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-highlight.xml Sun Jul 27 05:28:28 2014
@@ -19,7 +19,7 @@
<Configuration status="OFF">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%highlight{%d{ISO8601} [%t] %-5level: %msg%n%throwable}{FATAL=white, ERROR=red, WARN=blue, INFO=black, DEBUG=green, TRACE=blue}" />
+ <PatternLayout pattern="%highlight{%d [%t] %-5level: %msg%n%throwable}{FATAL=white, ERROR=red, WARN=blue, INFO=black, DEBUG=green, TRACE=blue}" />
</Console>
</Appenders>
<Loggers>
@@ -28,4 +28,4 @@
<AppenderRef ref="Console" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-ansi.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-ansi.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-ansi.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-ansi.xml Sun Jul 27 05:28:28 2014
@@ -19,7 +19,7 @@
<Configuration status="OFF">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%style{%d{ISO8601}}{black} %style{[%t]}{blue} %style{%-5level:}{yellow} %style{%msg%n%throwable}{green}" />
+ <PatternLayout pattern="%style{%d}{black} %style{[%t]}{blue} %style{%-5level:}{yellow} %style{%msg%n%throwable}{green}" />
</Console>
</Appenders>
<Loggers>
@@ -28,4 +28,4 @@
<AppenderRef ref="Console" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-name-ansi.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-name-ansi.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-name-ansi.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-name-ansi.xml Sun Jul 27 05:28:28 2014
@@ -19,7 +19,7 @@
<Configuration status="OFF">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%red{%d{ISO8601}} %yellow{[%t]} %black{black} %blue{blue} %cyan{cyan} %magenta{magenta} %white{white} %green{%-5level:} %red{%msg%n%throwable}" />
+ <PatternLayout pattern="%red{%d} %yellow{[%t]} %black{black} %blue{blue} %cyan{cyan} %magenta{magenta} %white{white} %green{%-5level:} %red{%msg%n%throwable}" />
</Console>
</Appenders>
<Loggers>
@@ -28,4 +28,4 @@
<AppenderRef ref="Console" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-no-ansi.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-no-ansi.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-no-ansi.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console-style-no-ansi.xml Sun Jul 27 05:28:28 2014
@@ -20,7 +20,7 @@
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout noConsoleNoAnsi="true"
- pattern="%style{%d{ISO8601}}{black} %style{[%t]}{blue} %style{%-5level:}{yellow} %style{%msg%n%throwable}{green}" />
+ pattern="%style{%d}{black} %style{[%t]}{blue} %style{%-5level:}{yellow} %style{%msg%n%throwable}{green}" />
</Console>
</Appenders>
<Loggers>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-console.xml Sun Jul 27 05:28:28 2014
@@ -19,7 +19,7 @@
<Configuration status="OFF">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{ISO8601} [%t] %-5level: %msg%n%throwable" />
+ <PatternLayout pattern="%d [%t] %-5level: %msg%n%throwable" />
</Console>
</Appenders>
<Loggers>
@@ -28,4 +28,4 @@
<AppenderRef ref="Console" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf-filter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf-filter.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf-filter.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf-filter.xml Sun Jul 27 05:28:28 2014
@@ -24,7 +24,7 @@
<Appenders>
<File name="TestLogfile" fileName="target/testlog4j2.log" immediateFlush="false">
<PatternLayout>
- <Pattern>%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
+ <Pattern>%d %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
</PatternLayout>
</File>
</Appenders>
@@ -33,4 +33,4 @@
<AppenderRef ref="TestLogfile"/>
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf.xml Sun Jul 27 05:28:28 2014
@@ -20,7 +20,7 @@
<Appenders>
<File name="TestLogfile" fileName="target/testlog4j2.log" immediateFlush="false">
<PatternLayout>
- <Pattern>%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
+ <Pattern>%d %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
</PatternLayout>
</File>
</Appenders>
@@ -29,4 +29,4 @@
<AppenderRef ref="TestLogfile"/>
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf2.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf2.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j2-perf2.xml Sun Jul 27 05:28:28 2014
@@ -20,7 +20,7 @@
<Appenders>
<File name="TestLogfile" fileName="target/testlog4j2.log" immediateFlush="false">
<PatternLayout>
- <Pattern>%d{ISO8601} %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
+ <Pattern>%d %5p [%t] %c{1} %X{transactionId} - %m%n</Pattern>
</PatternLayout>
</File>
</Appenders>
@@ -29,4 +29,4 @@
<AppenderRef ref="TestLogfile"/>
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-flume.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-flume.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-flume.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-flume.xml Sun Jul 27 05:28:28 2014
@@ -18,11 +18,11 @@
<configuration>
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <Pattern>%d{ISO8601} %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
+ <Pattern>%d %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
</encoder>
</appender>
<root level="error">
<appender-ref ref="Console" />
</root>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf-filter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf-filter.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf-filter.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf-filter.xml Sun Jul 27 05:28:28 2014
@@ -26,11 +26,11 @@
<appender name="TestLogfile" class="ch.qos.logback.core.FileAppender">
<file>target/testlogback.log</file>
<encoder>
- <Pattern>%d{ISO8601} %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
+ <Pattern>%d %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
</encoder>
</appender>
<root level="error">
<appender-ref ref="TestLogfile" />
</root>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf.xml Sun Jul 27 05:28:28 2014
@@ -20,11 +20,11 @@
<file>target/testlogback.log</file>
<encoder>
<immediateFlush>false</immediateFlush>
- <Pattern>%d{ISO8601} %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
+ <Pattern>%d %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
</encoder>
</appender>
<root level="debug">
<appender-ref ref="TestLogfile" />
</root>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf2.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf2.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-perf2.xml Sun Jul 27 05:28:28 2014
@@ -19,11 +19,11 @@
<appender name="TestLogfile" class="ch.qos.logback.core.FileAppender">
<file>target/testlogback.log</file>
<encoder>
- <Pattern>%d{ISO8601} %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
+ <Pattern>%d %5p [%t] %c{0} %X{transactionId} - %m%n</Pattern>
</encoder>
</appender>
<root level="error">
<appender-ref ref="TestLogfile" />
</root>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-subst.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-subst.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-subst.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/logback-subst.xml Sun Jul 27 05:28:28 2014
@@ -18,11 +18,11 @@
<configuration>
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <Pattern>%d{ISO8601} %5p [%t] %c{0} - %m%n</Pattern>
+ <Pattern>%d %5p [%t] %c{0} - %m%n</Pattern>
</encoder>
</appender>
<root level="debug">
<appender-ref ref="stdout" />
</root>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Sun Jul 27 05:28:28 2014
@@ -22,6 +22,9 @@
</properties>
<body>
<release version="2.0.1" date="2014-mm-dd" description="?">
+ <action issue="LOG4J2-749" dev="rpopma" type="fix" due-to="Scott Harrington">
+ Retain the default date pattern after fixing the ISO8601 pattern.
+ </action>
<action issue="LOG4J2-670" dev="rpopma" type="fix">
DatePatternConverter ISO8601_PATTERN now conforms to ISO8601.
</action>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml.vm?rev=1613750&r1=1613749&r2=1613750&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml.vm Sun Jul 27 05:28:28 2014
@@ -329,6 +329,7 @@ WARN [main]: Message 2</pre>
SimpleDateFormat</a>.
</p>
<p>The predefined formats are
+ <code>DEFAULT</code>,
<code>ABSOLUTE</code>,
<code>COMPACT</code>,
<code>DATE</code>,
@@ -345,12 +346,16 @@ WARN [main]: Message 2</pre>
<th>Example</th>
</tr>
<tr>
- <td>%d{ISO8601}</td>
+ <td>%d{DEFAULT}</td>
<td>2012-11-02 14:34:02,781</td>
</tr>
<tr>
+ <td>%d{ISO8601}</td>
+ <td>2012-11-02T14:34:02,781</td>
+ </tr>
+ <tr>
<td>%d{ISO8601_BASIC}</td>
- <td>20121102 143402,781</td>
+ <td>20121102T143402,781</td>
</tr>
<tr>
<td>%d{ABSOLUTE}</td>