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/09/11 06:28:19 UTC
[38/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1349-gcfree-threadcontext
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1349-gcfree-threadcontext
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6fb6b708
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6fb6b708
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6fb6b708
Branch: refs/heads/master
Commit: 6fb6b708ae895aad935b1690307b958c26111c3c
Parents: 189f87d dbbeb5c
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 4 16:21:10 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 4 16:21:10 2016 +0900
----------------------------------------------------------------------
.gitignore | 14 +-
README.md | 8 +
log4j-1.2-api/.gitignore | 5 -
.../config/Log4j1ConfigurationConverter.java | 41 +++
.../config/Log4j1ConfigurationFactory.java | 1 -
.../log4j/config/Log4j1ConfigurationParser.java | 20 +-
log4j-api-scala_2.10/.gitignore | 3 -
log4j-api-scala_2.10/pom.xml | 2 +-
log4j-api-scala_2.11/.gitignore | 3 -
log4j-api-scala_2.11/pom.xml | 2 +-
log4j-api/.gitignore | 5 -
log4j-bom/.gitignore | 3 -
log4j-core/.gitignore | 6 -
.../log4j/core/appender/AbstractManager.java | 41 ++-
.../appender/AbstractOutputStreamAppender.java | 29 +-
.../core/appender/AbstractWriterAppender.java | 2 +-
.../log4j/core/appender/AsyncAppender.java | 5 +-
.../log4j/core/appender/FileAppender.java | 30 +-
.../log4j/core/appender/FileManager.java | 27 +-
.../core/appender/MemoryMappedFileManager.java | 2 +-
.../core/appender/OutputStreamManager.java | 12 +-
.../core/appender/RandomAccessFileAppender.java | 14 +-
.../core/appender/RandomAccessFileManager.java | 2 +-
.../core/appender/RollingFileAppender.java | 33 +-
.../log4j/core/appender/SocketAppender.java | 254 ++++++++++---
.../log4j/core/appender/SyslogAppender.java | 7 +-
.../log4j/core/appender/WriterManager.java | 4 +-
.../appender/db/AbstractDatabaseAppender.java | 4 +-
.../appender/db/AbstractDatabaseManager.java | 2 +-
.../log4j/core/appender/mom/JmsAppender.java | 2 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../appender/mom/jeromq/JeroMqAppender.java | 362 +++++++++----------
.../core/appender/mom/kafka/KafkaAppender.java | 2 +-
.../appender/rolling/RollingFileManager.java | 2 +-
.../rolling/RollingRandomAccessFileManager.java | 2 +-
.../core/config/builder/api/Component.java | 4 +-
.../builder/impl/DefaultComponentBuilder.java | 4 +-
.../impl/DefaultConfigurationBuilder.java | 28 +-
.../log4j/core/filter/LevelRangeFilter.java | 2 +-
.../logging/log4j/core/lookup/JndiLookup.java | 2 +-
.../log4j/core/net/AbstractSocketManager.java | 6 +-
.../log4j/core/net/DatagramSocketManager.java | 21 +-
.../log4j/core/net/SslSocketManager.java | 31 +-
.../log4j/core/net/TcpSocketManager.java | 102 +++---
.../log4j/core/net/server/JmsServer.java | 2 +-
.../log4j/core/net/server/TcpSocketServer.java | 2 +-
.../core/selector/JndiContextSelector.java | 2 +-
.../logging/log4j/core/util/CachedClock.java | 2 +-
.../log4j/core/util/CoarseCachedClock.java | 2 +-
.../log4j/core/util/NullOutputStream.java | 4 +
.../log4j/core/appender/FileAppenderTest.java | 11 +-
.../appender/MemoryMappedFileManagerTest.java | 25 +-
.../appender/SocketAppenderBufferSizeTest.java | 77 ++++
.../log4j/core/appender/SocketAppenderTest.java | 252 +++++++++----
.../db/AbstractDatabaseAppenderTest.java | 10 +-
.../db/jdbc/AbstractJdbcAppenderTest.java | 2 +-
.../db/jpa/AbstractJpaAppenderTest.java | 2 +-
.../log4j/core/appender/mom/JmsAppenderIT.java | 2 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 7 +-
.../core/config/CompositeConfigurationTest.java | 5 +-
.../builder/ConfigurationBuilderTest.java | 63 ++--
.../log4j/core/filter/LevelRangeFilterTest.java | 9 +
.../core/net/mock/MockUdpSyslogServer.java | 6 +-
.../net/server/AbstractSocketServerTest.java | 16 +-
.../core/net/server/SslXmlSocketServerTest.java | 23 +-
.../logging/log4j/junit/LoggerContextRule.java | 7 +
.../src/test/resources/log4j-advertiser.xml | 4 +-
log4j-core/src/test/resources/log4j-empty.xml | 20 +
log4j-distribution/.gitignore | 2 -
log4j-flume-ng/.gitignore | 4 -
.../log4j/flume/appender/FlumeAppender.java | 2 +-
.../flume/appender/FlumePersistentManager.java | 3 +-
log4j-iostreams/.gitignore | Bin 69 -> 0 bytes
log4j-jcl/.gitignore | 4 -
log4j-jmx-gui/.gitignore | 4 -
log4j-jul/.gitignore | 3 -
log4j-liquibase/.gitignore | 3 -
log4j-nosql/.gitignore | 4 -
.../appender/NoSqlDatabaseManagerTest.java | 81 ++---
log4j-perf/.gitignore | 4 -
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 4 +-
.../log4j/perf/jmh/JpaAppenderBenchmark.java | 4 +-
log4j-samples/.gitignore | 5 -
log4j-slf4j-impl/.gitignore | 4 -
log4j-taglib/.gitignore | 4 -
log4j-to-slf4j/.gitignore | 4 -
log4j-web/.gitignore | 4 -
src/changes/changes.xml | 22 +-
src/site/xdoc/manual/appenders.xml | 11 +
89 files changed, 1157 insertions(+), 727 deletions(-)
----------------------------------------------------------------------