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/6e858b02 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6e858b02 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6e858b02 Branch: refs/heads/LOG4J-1181 Commit: 6e858b02f9f5513987788ab1120ca64c555cc989 Parents: e28d50b 0ae9948 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Tue Jan 12 17:47:51 2016 +0100 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Tue Jan 12 17:47:51 2016 +0100 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 90 ++++--- log4j-1.2-api/pom.xml | 2 +- .../java/org/apache/log4j/LogWithMDCTest.java | 19 +- .../java/org/apache/log4j/LogWithRouteTest.java | 19 +- log4j-api/pom.xml | 2 +- .../java/org/apache/logging/log4j/Level.java | 18 +- .../log4j/message/BasicThreadInformation.java | 2 +- .../message/ExtendedThreadInformation.java | 3 +- .../log4j/message/ThreadDumpMessage.java | 2 +- .../apache/logging/log4j/spi/LoggerContext.java | 2 + .../org/apache/logging/log4j/spi/Provider.java | 2 +- .../logging/log4j/status/StatusLogger.java | 2 +- .../apache/logging/log4j/util/LoaderUtil.java | 2 +- .../logging/log4j/util/PropertiesUtil.java | 83 ++++-- log4j-bom/pom.xml | 2 +- log4j-core/pom.xml | 2 +- .../logging/log4j/core/LoggerContext.java | 51 ++-- .../appender/AbstractOutputStreamAppender.java | 27 +- .../log4j/core/appender/AsyncAppender.java | 123 ++++++--- .../log4j/core/appender/ConsoleAppender.java | 63 ++++- .../log4j/core/appender/FileManager.java | 6 +- .../core/appender/MemoryMappedFileManager.java | 4 +- .../core/appender/OutputStreamManager.java | 32 ++- .../core/appender/RandomAccessFileManager.java | 6 +- .../core/appender/RollingFileAppender.java | 1 - .../log4j/core/appender/SmtpAppender.java | 7 +- .../log4j/core/appender/SocketAppender.java | 144 +++++++--- .../appender/rolling/CronTriggeringPolicy.java | 16 +- .../core/appender/rolling/PatternProcessor.java | 6 + .../appender/rolling/RollingFileManager.java | 47 +++- .../rolling/RollingRandomAccessFileManager.java | 6 +- .../appender/rolling/action/DeleteAction.java | 78 +++++- .../rolling/action/DeletingVisitor.java | 2 +- .../rolling/action/ScriptCondition.java | 118 +++++++++ .../core/appender/routing/IdlePurgePolicy.java | 19 +- .../core/appender/routing/PurgePolicy.java | 16 ++ .../log4j/core/async/AsyncEventRouter.java | 39 +++ .../core/async/AsyncEventRouterFactory.java | 117 ++++++++ .../logging/log4j/core/async/AsyncLogger.java | 45 ++-- .../log4j/core/async/AsyncLoggerConfig.java | 19 +- .../core/async/AsyncLoggerConfigDelegate.java | 29 +- .../core/async/AsyncLoggerConfigDisruptor.java | 82 +++--- .../log4j/core/async/AsyncLoggerDisruptor.java | 62 +++-- .../core/async/DefaultAsyncEventRouter.java | 38 +++ .../core/async/DiscardingAsyncEventRouter.java | 93 +++++++ .../logging/log4j/core/async/EventRoute.java | 99 +++++++ .../core/config/AbstractConfiguration.java | 57 ++-- .../log4j/core/config/AppendersPlugin.java | 5 +- .../log4j/core/config/Configuration.java | 28 +- .../core/config/ConfigurationScheduler.java | 1 + .../builder/impl/DefaultComponentBuilder.java | 1 + .../impl/DefaultConfigurationBuilder.java | 1 + .../plugins/processor/PluginProcessor.java | 7 +- .../core/config/plugins/util/ResolverUtil.java | 4 +- .../logging/log4j/core/impl/Log4jLogEvent.java | 18 +- .../log4j/core/layout/AbstractCsvLayout.java | 9 +- .../core/layout/AbstractJacksonLayout.java | 26 +- .../log4j/core/layout/AbstractLayout.java | 48 +++- .../log4j/core/layout/AbstractStringLayout.java | 160 ++++++++--- .../log4j/core/layout/CsvLogEventLayout.java | 15 +- .../log4j/core/layout/CsvParameterLayout.java | 15 +- .../logging/log4j/core/layout/HtmlLayout.java | 2 +- .../logging/log4j/core/layout/JsonLayout.java | 92 +++++-- .../log4j/core/layout/PatternLayout.java | 182 +++++++------ .../log4j/core/layout/SerializedLayout.java | 2 +- .../logging/log4j/core/layout/XmlLayout.java | 2 +- .../apache/logging/log4j/core/net/Protocol.java | 4 +- .../logging/log4j/core/net/SmtpManager.java | 49 ++-- .../log4j/core/net/TcpSocketManager.java | 12 +- .../net/ssl/AbstractKeyStoreConfiguration.java | 8 +- .../log4j/core/net/ssl/SslConfiguration.java | 16 +- .../log4j/core/pattern/PatternParser.java | 15 +- .../log4j/core/script/ScriptManager.java | 78 +++--- .../logging/log4j/core/script/ScriptRef.java | 1 - .../log4j/core/util/NanoClockFactory.java | 84 ------ .../log4j/core/util/StringBuilderWriter.java | 26 +- log4j-core/src/main/resources/Log4j-config.xsd | 7 +- .../logging/log4j/core/PatternSelectorTest.java | 6 +- .../core/appender/ConsoleAppenderTest.java | 14 +- .../log4j/core/appender/HangingAppender.java | 29 +- .../appender/RandomAccessFileManagerTest.java | 2 +- .../log4j/core/appender/SmtpAppenderTest.java | 17 +- .../log4j/core/appender/SocketAppenderTest.java | 36 ++- .../appender/rolling/PatternProcessorTest.java | 226 ++++++++++------ .../RollingAppenderDeleteScriptFri13thTest.java | 88 ++++++ .../RollingAppenderDeleteScriptTest.java | 85 ++++++ .../rolling/RollingAppenderSizeTest.java | 8 +- .../RollingRandomAccessFileManagerTest.java | 9 +- .../rolling/action/DeleteActionTest.java | 6 +- .../rolling/action/ScriptConditionTest.java | 130 +++++++++ .../routing/RoutingAppenderWithPurgingTest.java | 13 +- .../core/async/AsyncEventRouterFactoryTest.java | 153 +++++++++++ .../core/async/AsyncLoggerTestNanoTime.java | 15 +- .../core/async/DefaultAsyncEventRouterTest.java | 67 +++++ .../async/DiscardingAsyncEventRouterTest.java | 146 ++++++++++ .../core/layout/CsvLogEventLayoutTest.java | 44 ++- .../core/layout/CsvParameterLayoutTest.java | 4 +- .../log4j/core/layout/JsonLayoutTest.java | 17 +- .../layout/PatternLayoutMainMapLookupTest.java | 5 +- .../log4j/core/layout/PatternLayoutTest.java | 4 +- .../net/server/AbstractSocketServerTest.java | 15 +- .../core/net/server/SslXmlSocketServerTest.java | 7 +- .../net/server/TcpJsonSocketServerTest.java | 3 +- .../server/TcpSerializedSocketServerTest.java | 3 +- .../core/net/server/TcpXmlSocketServerTest.java | 3 +- .../net/server/UdpJsonSocketServerTest.java | 3 +- .../server/UdpSerializedSocketServerTest.java | 3 +- .../core/net/server/UdpXmlSocketServerTest.java | 3 +- .../log4j/core/pattern/PatternParserTest.java | 53 ++-- .../log4j/core/util/NanoClockFactoryTest.java | 65 ----- .../apache/logging/log4j/junit/CleanFiles.java | 2 +- .../src/test/resources/JeroMqAppenderTest.xml | 2 +- .../test/resources/LOG4J2-1100/log4j2-good.yaml | 2 +- log4j-core/src/test/resources/LOG4J2-739.xml | 2 +- log4j-core/src/test/resources/LOG4J2-807.xml | 2 +- .../src/test/resources/log4j-customLevels.xml | 2 +- .../resources/log4j-customLevelsOverride.xml | 2 +- .../resources/log4j-customLevelsWithFilters.xml | 2 +- .../src/test/resources/log4j-filetest.xml | 2 +- .../src/test/resources/log4j-marker-lookup.yaml | 2 +- ...-rolling-with-custom-delete-accum-count1.xml | 2 +- ...-rolling-with-custom-delete-accum-count2.xml | 2 +- ...4j-rolling-with-custom-delete-accum-size.xml | 2 +- ...og4j-rolling-with-custom-delete-maxdepth.xml | 2 +- .../log4j-rolling-with-custom-delete-nested.xml | 2 +- ...olling-with-custom-delete-script-fri13th.xml | 76 ++++++ .../log4j-rolling-with-custom-delete-script.xml | 76 ++++++ ...olling-with-custom-delete-unconditional1.xml | 2 +- ...olling-with-custom-delete-unconditional2.xml | 2 +- ...olling-with-custom-delete-unconditional3.xml | 2 +- .../log4j-rolling-with-custom-delete.xml | 2 +- .../src/test/resources/log4j-routing-purge.xml | 10 + log4j-core/src/test/resources/log4j2-962.xml | 2 +- .../src/test/resources/perf9MMapNoLoc.xml | 2 +- log4j-core/src/test/resources/rollover-test.xml | 2 +- log4j-distribution/.gitignore | 2 + log4j-distribution/pom.xml | 2 +- log4j-flume-ng/pom.xml | 2 +- .../log4j/flume/appender/FlumeAvroManager.java | 3 +- .../src/test/resources/default_embedded.xml | 4 +- log4j-flume-ng/src/test/resources/embedded.xml | 4 +- log4j-iostreams/pom.xml | 2 +- .../org/apache/logging/log4j/io/IoBuilder.java | 12 +- log4j-jcl/pom.xml | 2 +- log4j-jmx-gui/pom.xml | 2 +- log4j-jul/pom.xml | 2 +- log4j-liquibase/pom.xml | 2 +- log4j-nosql/pom.xml | 2 +- log4j-perf/pom.xml | 2 +- log4j-samples/configuration/pom.xml | 2 +- log4j-samples/flume-common/pom.xml | 2 +- log4j-samples/flume-embedded/pom.xml | 4 +- log4j-samples/flume-remote/pom.xml | 6 +- log4j-samples/loggerProperties/pom.xml | 2 +- log4j-samples/pom.xml | 2 +- log4j-slf4j-impl/pom.xml | 2 +- log4j-taglib/pom.xml | 2 +- log4j-to-slf4j/pom.xml | 2 +- .../slf4j/SLF4JLoggerContextFactory.java | 124 ++++----- log4j-web/pom.xml | 2 +- pom.xml | 28 +- src/changes/announcement.vm | 14 +- src/changes/changes.xml | 56 +++- src/site/xdoc/faq.xml | 265 ++++++++++++------- src/site/xdoc/manual/appenders.xml | 233 +++++++++++++--- src/site/xdoc/manual/async.xml | 128 +++++---- src/site/xdoc/manual/configuration.xml.vm | 41 ++- src/site/xdoc/manual/filters.xml | 10 +- 168 files changed, 3676 insertions(+), 1402 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6e858b02/pom.xml ----------------------------------------------------------------------
