Merge branch 'master' into LOG4J2-1161
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d3a06415 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d3a06415 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d3a06415 Branch: refs/heads/master Commit: d3a06415095ae3784c3f2034843bdfc874a790f1 Parents: 990a97c 9c3af71 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Fri Oct 23 14:57:19 2015 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Fri Oct 23 14:57:19 2015 +0200 ---------------------------------------------------------------------- .../log4j/message/LocalizedMessageFactory.java | 5 +- .../logging/log4j/util/StringBuilders.java | 2 +- .../org/apache/logging/log4j/core/Logger.java | 50 +++- .../logging/log4j/core/LoggerContext.java | 11 +- .../log4j/core/appender/AbstractManager.java | 21 ++ .../log4j/core/appender/FileManager.java | 2 +- .../core/appender/MemoryMappedFileManager.java | 16 +- .../core/appender/OutputStreamManager.java | 8 +- .../core/appender/RandomAccessFileManager.java | 5 +- .../RollingRandomAccessFileAppender.java | 2 +- .../appender/db/AbstractDatabaseManager.java | 6 +- .../appender/db/jdbc/JdbcDatabaseManager.java | 4 +- .../appender/db/jpa/JpaDatabaseManager.java | 2 +- .../appender/rolling/RollingFileManager.java | 12 +- .../rolling/RollingRandomAccessFileManager.java | 8 +- .../core/appender/routing/RoutingAppender.java | 2 +- .../logging/log4j/core/async/AsyncLogger.java | 231 +------------------ .../log4j/core/async/AsyncLoggerConfig.java | 25 +- .../core/async/AsyncLoggerConfigDelegate.java | 52 +++++ .../core/async/AsyncLoggerConfigHelper.java | 43 ++-- .../log4j/core/async/AsyncLoggerContext.java | 54 ++++- .../core/async/AsyncLoggerContextSelector.java | 48 ++-- .../log4j/core/async/AsyncLoggerHelper.java | 210 +++++++++++++++++ .../apache/logging/log4j/core/async/Info.java | 109 +++++++++ .../core/config/AbstractConfiguration.java | 20 +- .../log4j/core/config/ConfigurationFactory.java | 3 +- .../logging/log4j/core/config/LoggerConfig.java | 3 +- .../core/config/builder/api/package-info.java | 2 +- .../plugins/convert/TypeConverterRegistry.java | 2 +- .../core/config/plugins/util/PluginBuilder.java | 45 ++-- .../plugins/validation/ConstraintValidator.java | 5 +- .../validators/RequiredValidator.java | 18 +- .../plugins/visitors/PluginElementVisitor.java | 2 +- .../config/plugins/visitors/PluginVisitors.java | 1 - .../logging/log4j/core/impl/Log4jLogEvent.java | 2 + .../apache/logging/log4j/core/jmx/Server.java | 12 +- .../log4j/core/layout/PatternLayout.java | 2 +- .../log4j/core/layout/Rfc5424Layout.java | 2 +- .../logging/log4j/core/net/SmtpManager.java | 8 +- .../ExtendedThrowablePatternConverter.java | 2 +- .../pattern/RootThrowablePatternConverter.java | 2 +- .../selector/ClassLoaderContextSelector.java | 46 ++-- .../logging/log4j/core/util/ClockFactory.java | 10 +- .../logging/log4j/core/util/FileWatcher.java | 2 +- log4j-core/src/site/xdoc/index.xml | 2 +- .../apache/logging/log4j/core/HostNameTest.java | 2 +- .../apache/logging/log4j/core/LogEventTest.java | 3 + .../logging/log4j/core/LoggerDateTest.java | 2 +- .../log4j/core/LoggerSerializationTest.java | 2 - .../apache/logging/log4j/core/LookupTest.java | 2 +- .../log4j/core/appender/AsyncAppenderTest.java | 32 +-- .../appender/JsonCompleteFileAppenderTest.java | 5 +- .../MemoryMappedFileAppenderLocationTest.java | 9 +- .../MemoryMappedFileAppenderRemapTest.java | 9 +- .../MemoryMappedFileAppenderSimpleTest.java | 9 +- .../appender/RandomAccessFileAppenderTests.java | 5 +- .../appender/RandomAccessFileManagerTest.java | 20 +- .../appender/XmlCompactFileAppenderTest.java | 4 +- .../appender/XmlCompleteFileAppenderTest.java | 4 +- .../core/appender/XmlFileAppenderTest.java | 4 +- .../XmlRandomAccessFileAppenderTest.java | 4 +- .../db/jdbc/AbstractJdbcAppenderTest.java | 5 +- .../routing/JsonRoutingAppender2Test.java | 40 +--- .../routing/JsonRoutingAppenderTest.java | 40 +--- .../routing/RoutingAppenderWithJndiTest.java | 4 +- .../routing/RoutingDefaultAppenderTest.java | 2 +- ...ncLoggerContextSelectorInitialStateTest.java | 30 +++ .../async/AsyncLoggerContextSelectorTest.java | 14 +- .../AsyncLoggerThreadNameStrategyTest.java | 24 +- .../AsyncLoggersWithAsyncAppenderTest.java | 37 +-- .../AsyncLoggersWithAsyncLoggerConfigTest.java | 37 +-- .../core/async/perftest/IPerfTestRunner.java | 6 +- .../log4j/core/async/perftest/PerfTest.java | 5 +- .../log4j/core/config/ConfigurationTest.java | 5 +- .../config/ReconfigurationDeadlockTest.java | 2 +- .../logging/log4j/core/config/XIncludeTest.java | 5 +- .../plugins/util/PluginManagerPackagesTest.java | 2 +- ...opertiesConfigurationRootLoggerOnlyTest.java | 14 +- .../properties/PropertiesConfigurationTest.java | 14 +- .../properties/RollingFilePropertiesTest.java | 15 +- .../core/filter/AbstractScriptFilterTest.java | 6 +- .../log4j/core/filter/MapFilterTest.java | 23 +- .../core/filter/StructuredDataFilterTest.java | 15 +- .../core/net/ssl/SslConfigurationTest.java | 10 +- .../apache/logging/log4j/core/util/Compare.java | 9 +- .../log4j/core/util/WatchManagerTest.java | 8 +- .../core/util/datetime/FixedDateFormatTest.java | 13 +- .../logging/log4j/junit/LoggerContextRule.java | 40 +++- .../flume/appender/FlumePersistentManager.java | 10 +- .../perf/jmh/AsyncAppenderLogbackBenchmark.java | 2 +- .../log4j/perf/jmh/JdbcAppenderBenchmark.java | 5 +- ...ThreadLocalVsConcurrentHashMapBenchmark.java | 94 ++++++++ .../log4j/web/Log4jWebInitializerImpl.java | 6 +- pom.xml | 8 +- src/changes/changes.xml | 20 +- src/site/resources/images/whichjar-2.x.png | Bin 0 -> 68381 bytes .../resources/images/whichjar-slf4j-2.x.png | Bin 0 -> 26650 bytes src/site/resources/images/whichjar.xlsx | Bin 14687 -> 14681 bytes src/site/site.xml | 17 +- src/site/xdoc/faq.xml | 12 +- src/site/xdoc/manual/api.xml | 19 +- src/site/xdoc/manual/appenders.xml | 2 +- src/site/xdoc/manual/architecture.xml | 2 +- src/site/xdoc/manual/configuration.xml.vm | 33 ++- src/site/xdoc/manual/customconfig.xml | 3 +- src/site/xdoc/manual/extending.xml | 3 +- src/site/xdoc/manual/index.xml | 8 +- src/site/xdoc/manual/layouts.xml.vm | 2 +- src/site/xdoc/manual/plugins.xml | 4 +- src/site/xdoc/runtime-dependencies.xml | 2 +- 110 files changed, 1097 insertions(+), 815 deletions(-) ----------------------------------------------------------------------
