Merge branch 'master' into LOG4J2-1395
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/10f724f3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/10f724f3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/10f724f3 Branch: refs/heads/master Commit: 10f724f3043852ce7a70bbfa32fa460471a72f5d Parents: 0555978 b06f6ce Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Tue Jun 7 11:26:47 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Tue Jun 7 11:26:47 2016 +0200 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 160 +---- log4j-1.2-api/pom.xml | 2 +- .../java/org/apache/log4j/LogWithMDCTest.java | 6 +- .../java/org/apache/log4j/LogWithRouteTest.java | 6 +- log4j-api/pom.xml | 2 +- .../logging/log4j/CloseableThreadContext.java | 11 +- .../org/apache/logging/log4j/LogManager.java | 18 +- .../log4j/message/AbstractMessageFactory.java | 110 ++- .../log4j/message/FormattedMessageFactory.java | 97 ++- .../log4j/message/LocalizedMessageFactory.java | 10 +- .../logging/log4j/message/MessageFactory2.java | 2 + .../log4j/message/MessageFormatMessage.java | 2 +- .../message/MessageFormatMessageFactory.java | 93 ++- .../log4j/message/ParameterFormatter.java | 10 +- .../log4j/message/ParameterizedMessage.java | 6 +- .../message/ParameterizedMessageFactory.java | 105 ++- .../ParameterizedNoReferenceMessageFactory.java | 12 +- .../log4j/message/ReusableMessageFactory.java | 6 +- .../log4j/message/ReusableObjectMessage.java | 2 +- .../message/ReusableParameterizedMessage.java | 77 ++- .../log4j/message/ReusableSimpleMessage.java | 4 +- .../logging/log4j/message/SimpleMessage.java | 4 +- .../log4j/message/SimpleMessageFactory.java | 102 ++- .../log4j/message/StringFormattedMessage.java | 6 + .../message/StringFormatterMessageFactory.java | 94 ++- .../log4j/simple/SimpleLoggerContext.java | 4 +- .../logging/log4j/spi/LoggerRegistry.java | 2 +- .../org/apache/logging/log4j/spi/Provider.java | 4 +- .../apache/logging/log4j/status/StatusData.java | 2 +- .../logging/log4j/status/StatusLogger.java | 2 +- .../apache/logging/log4j/util/Activator.java | 1 + .../apache/logging/log4j/util/LambdaUtil.java | 2 +- .../org/apache/logging/log4j/util/Supplier.java | 1 + .../org/apache/logging/log4j/util/Unbox.java | 76 +- .../logging/log4j/AbstractLoggerTest.java | 4 +- .../apache/logging/log4j/LogManagerTest.java | 2 +- .../org/apache/logging/log4j/LoggerTest.java | 16 +- .../apache/logging/log4j/TestLoggerContext.java | 4 +- .../logging/log4j/message/JsonMessage.java | 2 +- .../log4j/message/ParameterFormatterTest.java | 12 +- .../message/ReusableObjectMessageTest.java | 18 +- .../ReusableParameterizedMessageTest.java | 15 +- .../message/ReusableSimpleMessageTest.java | 18 +- .../log4j/util/UnboxConfigurableTest.java | 67 ++ .../apache/logging/log4j/util/UnboxTest.java | 24 +- log4j-bom/pom.xml | 8 +- log4j-core/pom.xml | 6 +- .../org/apache/logging/log4j/core/Logger.java | 4 +- .../logging/log4j/core/LoggerContext.java | 4 +- .../log4j/core/appender/AbstractManager.java | 10 +- .../log4j/core/appender/AsyncAppender.java | 2 +- .../log4j/core/appender/ConsoleAppender.java | 2 +- .../core/appender/CountingNoOpAppender.java | 6 +- .../core/appender/OutputStreamManager.java | 15 +- .../log4j/core/appender/SocketAppender.java | 4 +- .../core/appender/mom/kafka/KafkaAppender.java | 226 +++--- .../appender/rolling/CronTriggeringPolicy.java | 10 +- .../rolling/DefaultRolloverStrategy.java | 12 +- .../log4j/core/appender/rolling/FileSize.java | 180 ++--- .../rolling/OnStartupTriggeringPolicy.java | 48 +- .../appender/rolling/RollingFileManager.java | 4 +- .../appender/rolling/action/DeleteAction.java | 2 +- .../core/appender/rolling/action/Duration.java | 514 +++++++------- .../rolling/action/FileRenameAction.java | 52 +- .../core/appender/rolling/action/IfAll.java | 232 +++---- .../core/appender/rolling/action/IfAny.java | 172 ++--- .../core/appender/routing/IdlePurgePolicy.java | 20 +- .../core/appender/routing/RoutingAppender.java | 6 +- .../logging/log4j/core/async/AsyncLogger.java | 4 +- ...syncLoggerConfigDefaultExceptionHandler.java | 4 +- .../core/async/AsyncLoggerConfigDisruptor.java | 2 +- .../log4j/core/async/AsyncLoggerContext.java | 4 +- .../AsyncLoggerDefaultExceptionHandler.java | 4 +- .../log4j/core/async/AsyncLoggerDisruptor.java | 472 ++++++------- .../logging/log4j/core/async/DisruptorUtil.java | 2 +- .../log4j/core/async/RingBufferLogEvent.java | 16 +- .../core/config/AbstractConfiguration.java | 16 +- .../log4j/core/config/AppenderControl.java | 2 +- .../AwaitCompletionReliabilityStrategy.java | 350 +++++----- ...AwaitUnconditionallyReliabilityStrategy.java | 246 +++---- .../log4j/core/config/ConfigurationFactory.java | 10 +- .../core/config/ConfigurationScheduler.java | 30 +- .../log4j/core/config/ConfigurationSource.java | 6 +- .../core/config/ConfiguratonFileWatcher.java | 4 +- .../logging/log4j/core/config/Configurator.java | 688 +++++++++---------- .../core/config/DefaultReliabilityStrategy.java | 214 +++--- .../core/config/LockingReliabilityStrategy.java | 270 ++++---- .../core/config/ReliabilityStrategyFactory.java | 140 ++-- .../config/builder/impl/BuiltConfiguration.java | 6 +- .../impl/DefaultConfigurationBuilder.java | 20 +- .../impl/DefaultLoggerComponentBuilder.java | 4 +- .../impl/DefaultScriptFileComponentBuilder.java | 8 +- .../composite/CompositeConfiguration.java | 52 +- .../config/composite/DefaultMergeStrategy.java | 76 +- .../core/config/json/JsonConfiguration.java | 2 +- .../properties/PropertiesConfiguration.java | 2 +- .../PropertiesConfigurationBuilder.java | 68 +- .../PropertiesConfigurationFactory.java | 2 +- .../log4j/core/config/xml/XmlConfiguration.java | 6 +- .../log4j/core/filter/AbstractFilterable.java | 14 +- .../logging/log4j/core/filter/BurstFilter.java | 2 +- .../log4j/core/filter/CompositeFilter.java | 27 +- .../core/filter/DynamicThresholdFilter.java | 2 +- .../logging/log4j/core/filter/ScriptFilter.java | 16 +- .../logging/log4j/core/filter/TimeFilter.java | 2 +- .../log4j/core/impl/Log4jContextFactory.java | 8 +- .../logging/log4j/core/impl/Log4jLogEvent.java | 34 +- .../log4j/core/impl/MutableLogEvent.java | 34 +- .../log4j/core/layout/AbstractStringLayout.java | 2 +- .../log4j/core/layout/CsvLogEventLayout.java | 3 - .../logging/log4j/core/layout/GelfLayout.java | 12 +- .../log4j/core/layout/JacksonFactory.java | 4 +- .../core/layout/MarkerPatternSelector.java | 20 +- .../log4j/core/layout/PatternLayout.java | 4 +- .../core/layout/ScriptPatternSelector.java | 24 +- .../log4j/core/layout/TextEncoderHelper.java | 4 +- .../logging/log4j/core/net/SmtpManager.java | 4 +- .../log4j/core/net/TcpSocketManager.java | 2 +- .../pattern/EqualsReplacementConverter.java | 2 +- .../ExtendedThrowablePatternConverter.java | 2 +- .../core/pattern/MessagePatternConverter.java | 2 +- .../log4j/core/pattern/NameAbbreviator.java | 4 +- .../pattern/RootThrowablePatternConverter.java | 2 +- .../VariablesNotEmptyReplacementConverter.java | 2 +- .../logging/log4j/core/script/Script.java | 2 +- .../logging/log4j/core/script/ScriptFile.java | 12 +- .../log4j/core/script/ScriptManager.java | 14 +- .../logging/log4j/core/script/ScriptRef.java | 8 +- .../logging/log4j/core/util/CronExpression.java | 180 ++--- .../logging/log4j/core/util/DummyNanoClock.java | 96 +-- .../core/util/ExtensionLanguageMapping.java | 6 +- .../logging/log4j/core/util/FileUtils.java | 4 +- .../logging/log4j/core/util/JsonUtils.java | 14 +- .../logging/log4j/core/util/StringEncoder.java | 14 +- .../logging/log4j/core/util/Throwables.java | 60 +- .../logging/log4j/core/util/WatchManager.java | 22 +- .../core/util/datetime/FixedDateFormat.java | 686 +++++++++--------- .../core/GcFreeAsynchronousLoggingTest.java | 2 +- .../log4j/core/GcFreeLoggingTestUtil.java | 6 +- .../core/GcFreeMixedSyncAyncLoggingTest.java | 2 +- .../core/GcFreeSynchronousLoggingTest.java | 2 +- .../logging/log4j/core/Log4j1222Test.java | 2 +- .../apache/logging/log4j/core/LogEventTest.java | 4 +- .../apache/logging/log4j/core/LoggerTest.java | 14 +- .../logging/log4j/core/PatternSelectorTest.java | 16 +- .../log4j/core/PropertiesFileConfigTest.java | 2 +- .../AsyncAppenderQueueFullPolicyTest.java | 6 +- .../log4j/core/appender/HangingAppender.java | 6 +- .../log4j/core/appender/SocketAppenderTest.java | 2 +- .../appender/XmlCompleteFileAppenderTest.java | 2 +- .../appender/mom/kafka/KafkaAppenderTest.java | 292 ++++---- .../rolling/OnStartupTriggeringPolicyTest.java | 69 +- .../rolling/RollingAppenderCronTest.java | 10 +- .../RollingAppenderCustomDeleteActionTest.java | 12 +- ...lingAppenderDeleteAccumulatedCount1Test.java | 24 +- ...lingAppenderDeleteAccumulatedCount2Test.java | 24 +- ...ollingAppenderDeleteAccumulatedSizeTest.java | 4 +- .../RollingAppenderDeleteMaxDepthTest.java | 24 +- .../RollingAppenderDeleteNestedTest.java | 24 +- .../RollingAppenderDeleteScriptFri13thTest.java | 8 +- .../RollingAppenderDeleteScriptTest.java | 8 +- ...ollingAppenderNoUnconditionalDeleteTest.java | 6 +- .../rolling/RollingAppenderOnStartupTest.java | 100 +++ .../rolling/RollingAppenderSizeTest.java | 14 +- .../rolling/action/CountingCondition.java | 124 ++-- .../rolling/action/DeleteActionTest.java | 238 +++---- .../rolling/action/DeletingVisitorTest.java | 270 ++++---- .../appender/rolling/action/DurationTest.java | 298 ++++---- .../appender/rolling/action/FixedCondition.java | 88 +-- .../action/IfAccumulatedFileCountTest.java | 150 ++-- .../action/IfAccumulatedFileSizeTest.java | 260 +++---- .../rolling/action/IfLastModifiedTest.java | 194 +++--- .../action/PathSortByModificationTimeTest.java | 186 ++--- .../rolling/action/ScriptConditionTest.java | 260 +++---- .../rolling/action/SortingVisitorTest.java | 188 ++--- .../routing/RoutingAppenderWithPurgingTest.java | 6 +- .../core/async/AsyncLoggerTestNanoTime.java | 2 +- .../async/AsyncQueueFullPolicyFactoryTest.java | 4 +- .../async/DefaultAsyncQueueFullPolicyTest.java | 4 +- .../DiscardingAsyncQueueFullPolicyTest.java | 22 +- .../core/async/perftest/PerfTestDriver.java | 4 +- .../core/async/perftest/ResponseTimeTest.java | 42 +- .../core/async/perftest/SimplePerfTest.java | 28 +- .../core/config/AbstractLog4j2_1100Test.java | 136 ++-- .../config/AppenderControlArraySetTest.java | 12 +- .../core/config/CompositeConfigurationTest.java | 8 +- .../log4j/core/config/ConfiguratorTest.java | 94 +-- .../log4j/core/config/TestConfigurator.java | 20 +- .../builder/ConfigurationAssemblerTest.java | 14 +- .../builder/CustomConfigurationFactory.java | 8 +- ...opertiesConfigurationRootLoggerOnlyTest.java | 10 +- .../properties/PropertiesConfigurationTest.java | 10 +- .../properties/RollingFilePropertiesTest.java | 10 +- .../core/filter/AbstractFilterableTest.java | 281 ++++++++ .../core/filter/AbstractScriptFilterTest.java | 8 +- .../core/impl/Log4jLogEventNanoTimeTest.java | 2 +- .../log4j/core/impl/Log4jLogEventTest.java | 18 +- .../log4j/core/impl/MutableLogEventTest.java | 12 +- .../core/impl/ReusableLogEventFactoryTest.java | 12 +- .../log4j/core/impl/ThrowableProxyTest.java | 2 +- .../core/layout/CsvLogEventLayoutTest.java | 340 ++++----- .../layout/CsvParameterLayoutAllAsyncTest.java | 6 +- .../core/layout/CsvParameterLayoutTest.java | 322 ++++----- .../log4j/core/layout/GelfLayoutTest.java | 6 +- .../log4j/core/layout/HtmlLayoutTest.java | 2 +- .../log4j/core/layout/JsonLayoutTest.java | 2 +- .../layout/PatternLayoutMainMapLookupTest.java | 128 ++-- .../log4j/core/layout/PatternLayoutTest.java | 12 +- .../log4j/core/layout/PatternSelectorTest.java | 130 ++-- .../log4j/core/layout/Rfc5424LayoutTest.java | 2 +- .../log4j/core/layout/SerializedLayoutTest.java | 2 +- .../core/layout/SpyByteBufferDestination.java | 2 +- .../core/layout/StringBuilderEncoderTest.java | 6 +- .../log4j/core/layout/SyslogLayoutTest.java | 2 +- .../log4j/core/layout/XmlLayoutTest.java | 2 +- .../log4j/core/layout/YamlLayoutTest.java | 6 +- .../server/UdpSerializedSocketServerTest.java | 2 + .../core/net/ssl/SslConfigurationTest.java | 4 +- .../core/pattern/DatePatternConverterTest.java | 2 +- ...qualsIgnoreCaseReplacementConverterTest.java | 2 +- .../pattern/EqualsReplacementConverterTest.java | 2 +- .../log4j/core/pattern/PatternParserTest.java | 12 +- ...riablesNotEmptyReplacementConverterTest.java | 2 +- .../log4j/core/util/CronExpressionTest.java | 32 +- .../logging/log4j/core/util/ThrowablesTest.java | 4 +- .../log4j/core/util/WatchManagerTest.java | 20 +- .../apache/logging/log4j/junit/CleanFiles.java | 6 +- .../logging/log4j/junit/LoggerContextRule.java | 92 +-- ...MutableLogEventWithReusableParamMsgTest.java | 53 ++ .../log4j/test/appender/BlockingAppender.java | 2 +- .../test/appender/EncodingListAppender.java | 12 +- .../log4j/test/appender/ListAppender.java | 68 +- .../src/test/resources/log4j-rolling.properties | 24 +- log4j-core/src/test/resources/log4j-test4.xml | 36 + log4j-distribution/pom.xml | 2 +- log4j-flume-ng/pom.xml | 2 +- .../log4j/flume/appender/FlumeAppenderTest.java | 2 +- log4j-iostreams/pom.xml | 2 +- log4j-jcl/pom.xml | 2 +- log4j-jmx-gui/pom.xml | 2 +- log4j-jul/pom.xml | 2 +- .../logging/log4j/jul/AbstractLoggerTest.java | 4 +- log4j-liquibase/pom.xml | 2 +- log4j-nosql/pom.xml | 2 +- .../nosql/appender/mongodb/MongoDbProvider.java | 4 +- log4j-perf/pom.xml | 2 +- .../message/ParameterFormatterBenchmark.java | 40 +- ...ractStringLayoutStringEncodingBenchmark.java | 32 +- .../log4j/perf/jmh/CollectionsBenchmark.java | 12 +- .../log4j/perf/jmh/FileAppenderBenchmark.java | 10 +- .../perf/jmh/FileAppenderParamsBenchmark.java | 10 +- .../jmh/Log4j2AppenderComparisonBenchmark.java | 6 +- .../log4j/perf/jmh/LoggerConfigBenchmark.java | 2 +- .../jmh/MemoryHandlerJULLocationBenchmark.java | 2 +- .../perf/jmh/ParameterizedMessageBenchmark.java | 2 +- .../ParameterizedMessageInliningBenchmark.java | 20 +- .../jmh/PatternLayoutComparisonBenchmark.java | 2 +- .../log4j/perf/jmh/StringEncodingBenchmark.java | 30 +- .../perf/jmh/TextEncoderHelperBenchmark.java | 12 +- ...ThreadLocalVsConcurrentHashMapBenchmark.java | 6 +- .../perf/jmh/ThreadLocalVsPoolBenchmark.java | 14 +- .../perf/jmh/ThreadsafeDateFormatBenchmark.java | 4 +- .../log4j/perf/jmh/VarargsBenchmark.java | 6 +- .../logging/log4j/perf/nogc/AbstractLogger.java | 6 +- .../logging/log4j/perf/nogc/ClassicLogger.java | 2 +- .../logging/log4j/perf/nogc/DemoAppender.java | 12 +- .../logging/log4j/perf/nogc/NoGcLayout.java | 16 +- .../logging/log4j/perf/nogc/NoGcLogger.java | 2 +- .../logging/log4j/perf/nogc/NoGcMessage.java | 10 +- .../log4j/perf/nogc/ParameterizedMessage.java | 6 +- .../apache/logging/log4j/perf/nogc/Test.java | 24 +- .../logging/log4j/perf/util/DemoAppender.java | 10 +- log4j-samples/configuration/pom.xml | 2 +- .../configuration/CustomConfiguration.java | 2 +- log4j-samples/flume-common/pom.xml | 2 +- log4j-samples/flume-embedded/pom.xml | 2 +- log4j-samples/flume-remote/pom.xml | 2 +- log4j-samples/loggerProperties/pom.xml | 2 +- .../logging/log4j/lookup/CustomLookup.java | 8 +- .../logging/log4j/lookup/CustomMapMessage.java | 2 +- .../logging/log4j/lookup/MapMessageLookup.java | 10 +- .../logging/log4j/CustomPropertiesTest.java | 8 +- log4j-samples/pom.xml | 2 +- log4j-slf4j-impl/pom.xml | 2 +- log4j-taglib/pom.xml | 2 +- .../log4j/taglib/Log4jTaglibLoggerContext.java | 4 +- log4j-to-slf4j/pom.xml | 2 +- .../logging/slf4j/SLF4JLoggerContext.java | 4 +- log4j-web/pom.xml | 2 +- .../log4j/web/ServletRequestThreadContext.java | 8 +- log4j-web/src/site/xdoc/index.xml | 16 - pom.xml | 6 +- src/changes/announcement.vm | 20 +- src/changes/changes.xml | 36 +- src/site/resources/images/logo.png | Bin 0 -> 41622 bytes .../resources/logo/logo-lightning-2.6.1.png | Bin 0 -> 41622 bytes .../resources/logo/logo-lightning-2.6.1.xcf | Bin 0 -> 65630 bytes src/site/resources/logo/logo.jpg | Bin 0 -> 14818 bytes src/site/site.vm | 8 +- src/site/site.xml | 7 +- src/site/xdoc/articles.xml | 8 + src/site/xdoc/faq.xml | 51 +- src/site/xdoc/index.xml | 142 ---- src/site/xdoc/index.xml.vm | 164 +++++ src/site/xdoc/manual/appenders.xml | 10 +- src/site/xdoc/manual/configuration.xml.vm | 24 +- src/site/xdoc/manual/extending.xml | 112 +++ src/site/xdoc/manual/garbagefree.xml | 15 +- src/site/xdoc/manual/layouts.xml.vm | 4 +- src/site/xdoc/manual/messages.xml | 14 +- 310 files changed, 7146 insertions(+), 5780 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/10f724f3/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/10f724f3/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/10f724f3/src/site/xdoc/manual/appenders.xml ----------------------------------------------------------------------
