Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d86ac2ac Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d86ac2ac Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d86ac2ac Branch: refs/heads/master Commit: d86ac2ac4e033b386d747d3f73e6240f5ef7197f Parents: 016008c 1ee6758 Author: Ralph Goers <rgo...@apache.org> Authored: Sun Nov 1 21:48:00 2015 -0700 Committer: Ralph Goers <rgo...@apache.org> Committed: Sun Nov 1 21:48:00 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/log4j/LogManager.java | 444 +++++++++---------- .../log4j/simple/SimpleLoggerContext.java | 31 +- .../apache/logging/log4j/spi/LoggerContext.java | 16 + .../logging/log4j/spi/LoggerContextKey.java | 40 ++ .../apache/logging/log4j/TestLoggerContext.java | 14 +- .../org/apache/logging/log4j/core/Logger.java | 8 +- .../logging/log4j/core/LoggerContext.java | 36 +- .../apache/logging/log4j/core/LoggerTest.java | 16 +- .../core/util/datetime/FixedDateFormatTest.java | 2 +- .../log4j/taglib/Log4jTaglibLoggerContext.java | 15 +- .../logging/slf4j/SLF4JLoggerContext.java | 15 +- .../log4j/web/Log4jWebInitializerImplTest.java | 74 ++-- .../resources/WEB-INF/classes/log4j-servlet.xml | 64 +-- src/changes/changes.xml | 3 + 14 files changed, 466 insertions(+), 312 deletions(-) ----------------------------------------------------------------------
