You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/10/21 16:52:16 UTC
[5/5] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-323-493-1159-AsyncMemLeak
Merge remote-tracking branch 'origin/master' into LOG4J2-323-493-1159-AsyncMemLeak
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a0d9be5d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a0d9be5d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a0d9be5d
Branch: refs/heads/master
Commit: a0d9be5dc74a673dad9e6978a5ac48070454c4a4
Parents: c697938 4612109
Author: rpopma <rp...@apache.org>
Authored: Wed Oct 21 23:47:07 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Oct 21 23:47:07 2015 +0900
----------------------------------------------------------------------
.../log4j/message/LocalizedMessageFactory.java | 5 +-
.../org/apache/logging/log4j/core/Logger.java | 50 ++++++++++++++++++--
.../log4j/core/appender/AbstractManager.java | 21 ++++++++
.../core/appender/MemoryMappedFileManager.java | 7 ---
.../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 +-
.../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 +-
.../logging/log4j/core/util/FileWatcher.java | 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 +-
.../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 | 10 ++--
.../logging/log4j/junit/LoggerContextRule.java | 40 ++++++++++++++--
.../flume/appender/FlumePersistentManager.java | 10 ++--
.../perf/jmh/AsyncAppenderLogbackBenchmark.java | 2 +-
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 5 +-
pom.xml | 6 +--
src/changes/changes.xml | 3 ++
63 files changed, 290 insertions(+), 348 deletions(-)
----------------------------------------------------------------------