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 2016/08/07 13:19:14 UTC
[38/38] logging-log4j2 git commit: Merge branches
'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' and
'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 into
LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-data
Merge branches 'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' and 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/39501130
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/39501130
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/39501130
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 39501130fd1f7b588b262494b759e2a4a59a2a32
Parents: c846a75 3058278
Author: rpopma <rp...@apache.org>
Authored: Sun Aug 7 22:08:16 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Aug 7 22:08:16 2016 +0900
----------------------------------------------------------------------
.../apache/logging/log4j/util/Constants.java | 3 +-
.../apache/logging/log4j/util/LoaderUtil.java | 28 +-
.../org/apache/logging/log4j/util/Unbox.java | 1 +
log4j-core/pom.xml | 2 +-
.../log4j/core/appender/FileManager.java | 31 +-
.../core/appender/MemoryMappedFileAppender.java | 2 +-
.../core/appender/MemoryMappedFileManager.java | 6 +-
.../core/appender/RandomAccessFileAppender.java | 2 +-
.../core/appender/RandomAccessFileManager.java | 2 +-
.../RollingRandomAccessFileAppender.java | 2 +-
.../appender/db/AbstractDatabaseManager.java | 4 +-
.../appender/db/jdbc/JdbcDatabaseManager.java | 4 +-
.../appender/db/jpa/JpaDatabaseManager.java | 2 +-
.../appender/rolling/RollingFileManager.java | 4 +-
.../rolling/RollingRandomAccessFileManager.java | 4 +-
.../core/async/AsyncQueueFullPolicyFactory.java | 4 +-
.../log4j/core/async/RingBufferLogEvent.java | 2 +-
.../config/composite/DefaultMergeStrategy.java | 6 +-
.../log4j/core/impl/DefaultLogEventFactory.java | 7 +-
.../log4j/core/layout/AbstractStringLayout.java | 57 +-
.../logging/log4j/core/net/SmtpManager.java | 2 +-
.../core/selector/CoreContextSelectors.java | 25 +
.../logging/log4j/core/util/Constants.java | 4 +-
.../log4j/core/appender/FileAppenderTest.java | 4 +
.../appender/JsonCompleteFileAppenderTest.java | 37 +-
.../appender/XmlCompleteFileAppenderTest.java | 68 +-
.../appender/mom/jeromq/JeroMqAppenderTest.java | 10 +-
.../core/config/CompositeConfigurationTest.java | 19 +
.../log4j/core/layout/Log4j2_1482_CoreTest.java | 20 +
.../log4j/core/layout/Log4j2_1482_Test.java | 89 +
.../logging/log4j/junit/LoggerContextRule.java | 2 +
.../test/resources/log4j-comp-root-loggers.xml | 46 +
log4j-core/src/test/resources/log4j2-1482.xml | 27 +
.../flume/appender/FlumePersistentManager.java | 1756 +++++++++---------
log4j-slf4j-impl/pom.xml | 5 +
.../org/apache/logging/slf4j/Log4j1222Test.java | 1 -
.../logging/slf4j/Log4j2_1482_Slf4jTest.java | 41 +
.../src/test/resources/log4j2-1482.xml | 27 +
pom.xml | 10 +-
src/changes/changes.xml | 18 +
40 files changed, 1383 insertions(+), 1001 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/39501130/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
----------------------------------------------------------------------