Merge branch 'master' into LOG4J2-1528
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7a1cd3a3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7a1cd3a3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7a1cd3a3 Branch: refs/heads/master Commit: 7a1cd3a3855562fcef9b144a4931541211f51fb6 Parents: 97f626f 60649ef Author: Mikael Ståldal <[email protected]> Authored: Fri Aug 19 22:27:51 2016 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Fri Aug 19 22:27:51 2016 +0200 ---------------------------------------------------------------------- .../config/Log4j1ConfigurationFactory.java | 28 ++- .../org/apache/log4j/layout/TTCCLayout.java | 131 ------------ .../config/Log4j1ConfigurationFactoryTest.java | 15 +- .../org/apache/log4j/layout/TTCCLayoutTest.java | 82 -------- .../core/pattern/MessagePatternConverter.java | 45 +++-- .../logging/log4j/core/util/ArrayUtils.java | 124 ++++++++++++ .../layout/PatternLayoutLookupDateTest.java | 28 +++ .../layout/PatternLayoutNoLookupDateTest.java | 26 +++ .../log4j/core/layout/PatternLayoutTest.java | 10 +- .../pattern/MessagePatternConverterTest.java | 197 ++++++++++--------- .../src/test/resources/log4j-list-nolookups.xml | 29 +++ pom.xml | 2 +- src/changes/changes.xml | 8 +- src/site/site.xml | 2 + src/site/xdoc/manual/appenders.xml | 6 + src/site/xdoc/manual/configuration.xml.vm | 3 +- src/site/xdoc/manual/extending.xml | 14 +- src/site/xdoc/manual/layouts.xml.vm | 12 +- 18 files changed, 415 insertions(+), 347 deletions(-) ----------------------------------------------------------------------
