Merge branch 'master' into LOG4J-1181
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2618cee9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2618cee9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2618cee9 Branch: refs/heads/LOG4J-1181 Commit: 2618cee93d4d91c13d0d71785dfd47308b31770e Parents: 2d7ee39 87ce6e7 Author: Mikael Ståldal <[email protected]> Authored: Mon Nov 2 15:32:10 2015 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Mon Nov 2 15:32:10 2015 +0100 ---------------------------------------------------------------------- BUILDING.txt | 2 +- .../main/java/org/apache/log4j/LogManager.java | 444 +++++++++---------- .../java/org/apache/logging/log4j/Level.java | 5 +- .../org/apache/logging/log4j/LogManager.java | 5 +- .../ParameterizedNoReferenceMessageFactory.java | 61 +++ .../log4j/simple/SimpleLoggerContext.java | 31 +- .../apache/logging/log4j/spi/LoggerContext.java | 16 + .../logging/log4j/spi/LoggerContextKey.java | 40 ++ .../logging/log4j/status/StatusLogger.java | 13 +- .../apache/logging/log4j/util/LoaderUtil.java | 27 +- .../apache/logging/log4j/TestLoggerContext.java | 14 +- .../logging/log4j/util/LambdaUtilTest.java | 2 +- .../logging/log4j/core/LogEventListener.java | 3 + .../org/apache/logging/log4j/core/Logger.java | 8 +- .../logging/log4j/core/LoggerContext.java | 51 ++- .../apache/logging/log4j/core/StringLayout.java | 33 ++ .../core/appender/AbstractWriterAppender.java | 124 ++++++ .../log4j/core/appender/ConsoleAppender.java | 14 +- .../core/appender/OutputStreamAppender.java | 191 ++++++++ .../log4j/core/appender/WriterAppender.java | 183 ++++++++ .../log4j/core/appender/WriterManager.java | 149 +++++++ .../core/config/AbstractConfiguration.java | 25 +- .../log4j/core/config/AppenderControl.java | 6 + .../log4j/core/config/DefaultConfiguration.java | 26 +- .../log4j/core/filter/LevelRangeFilter.java | 4 +- .../log4j/core/impl/Log4jContextFactory.java | 33 +- .../log4j/core/layout/AbstractStringLayout.java | 6 +- .../log4j/core/layout/PatternLayout.java | 16 + .../log4j/core/net/server/JmsServer.java | 1 - .../log4j/core/net/server/TcpSocketServer.java | 26 +- .../log4j/core/util/CloseShieldWriter.java | 30 ++ .../apache/logging/log4j/core/LoggerTest.java | 30 +- .../core/appender/ConfigurationTestUtils.java | 37 ++ .../core/appender/OutputStreamAppenderTest.java | 103 +++++ .../log4j/core/appender/WriterAppenderTest.java | 104 +++++ .../core/config/MissingRootLoggerTest.java | 4 +- .../log4j/core/config/TestConfigurator.java | 3 +- .../net/server/AbstractSocketServerTest.java | 19 +- .../log4j/core/net/server/ThreadNameFilter.java | 36 ++ .../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 +-- pom.xml | 7 +- src/changes/changes.xml | 37 +- src/site/site.xml | 1 + src/site/xdoc/manual/customconfig.xml | 48 ++ 48 files changed, 1754 insertions(+), 434 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2618cee9/pom.xml ----------------------------------------------------------------------
