Merge branch 'master' into gelf-layout-gc-free
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a5b00b33 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a5b00b33 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a5b00b33 Branch: refs/heads/gelf-layout-gc-free Commit: a5b00b331330cd8993e037d55a7c1a6001215d53 Parents: a2b5ed0 e2a8652 Author: Mikael Ståldal <[email protected]> Authored: Fri Mar 11 15:23:10 2016 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Fri Mar 11 15:23:10 2016 +0100 ---------------------------------------------------------------------- log4j-1.2-api/pom.xml | 5 + .../config/Log4j1ConfigurationFactory.java | 314 +++++++++++++++++++ .../config/Log4j1ConfigurationFactoryTest.java | 88 ++++++ ...g4j-console-EnhancedPatternLayout.properties | 19 ++ .../log4j-console-HtmlLayout.properties | 18 ++ .../log4j-console-PatternLayout.properties | 19 ++ .../log4j-console-SimpleLayout.properties | 18 ++ .../log4j-console-TTCCLayout.properties | 18 ++ .../log4j-console-XmlLayout.properties | 18 ++ .../logging/log4j/core/LoggerContext.java | 2 + .../core/async/AsyncLoggerConfigDisruptor.java | 4 +- .../log4j/core/async/AsyncLoggerDisruptor.java | 4 +- .../logging/log4j/core/lookup/JndiLookup.java | 2 +- .../pattern/EqualsReplacementConverter.java | 48 ++- .../logging/log4j/core/LoggerUpdateTest.java | 15 + .../rolling/RollingAppenderSizeTest.java | 15 +- .../log4j/core/layout/PatternLayoutTest.java | 22 ++ .../log4j/core/lookup/JndiLookupTest.java | 18 ++ .../pattern/EqualsReplacementConverterTest.java | 63 +++- .../apache/logging/log4j/core/util/Compare.java | 134 -------- .../log4j/web/Log4jWebInitializerImpl.java | 5 +- .../log4j/web/appender/ServletAppender.java | 4 +- src/changes/changes.xml | 17 +- src/site/xdoc/manual/configuration.xml.vm | 4 + 24 files changed, 696 insertions(+), 178 deletions(-) ----------------------------------------------------------------------
