Merge remote-tracking branch 'origin/master' into LOG4J2-1539
Conflicts:
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/01f59e46
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/01f59e46
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/01f59e46
Branch:
refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 01f59e4640b78f251813d712cc011686907de557
Parents: a4ef9a1 2cfc94b
Author: Gary Gregory <ggreg...@apache.org>
Authored: Fri Aug 26 10:05:21 2016 -0700
Committer: Gary Gregory <ggreg...@apache.org>
Committed: Fri Aug 26 10:05:21 2016 -0700
----------------------------------------------------------------------
.../config/Log4j1ConfigurationFactory.java | 2 +-
.../apache/log4j/BasicConfigurationFactory.java | 4 +-
.../log4j/core/appender/AbstractManager.java | 15 ++++--
.../core/appender/ConfigurationFactoryData.java | 50 ++++++++++++++++++++
.../log4j/core/appender/ConsoleAppender.java | 4 --
.../log4j/core/appender/FileAppender.java | 12 ++---
.../log4j/core/appender/FileManager.java | 30 +++++++-----
.../core/appender/OutputStreamManager.java | 12 ++---
.../core/appender/RandomAccessFileAppender.java | 2 +-
.../core/appender/RandomAccessFileManager.java | 27 ++++++-----
.../core/appender/RollingFileAppender.java | 16 +++----
.../RollingRandomAccessFileAppender.java | 2 +-
.../log4j/core/appender/WriterManager.java | 2 +-
.../appender/db/AbstractDatabaseManager.java | 2 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../core/appender/mom/jeromq/JeroMqManager.java | 2 +-
.../core/appender/mom/kafka/KafkaManager.java | 2 +-
.../appender/rolling/RollingFileManager.java | 32 +++++++------
.../rolling/RollingRandomAccessFileManager.java | 32 ++++++++-----
.../log4j/core/config/ConfigurationFactory.java | 4 +-
.../composite/CompositeConfiguration.java | 2 +-
.../config/xml/XmlConfigurationFactory.java | 1 +
.../config/yaml/YamlConfigurationFactory.java | 2 +-
.../logging/log4j/core/net/JndiManager.java | 2 +-
.../logging/log4j/core/net/SmtpManager.java | 2 +-
.../log4j/core/BasicConfigurationFactory.java | 4 +-
.../appender/RandomAccessFileManagerTest.java | 18 +++----
.../rolling/OnStartupTriggeringPolicyTest.java | 2 +-
.../RollingRandomAccessFileManagerTest.java | 24 +++++-----
.../builder/CustomConfigurationFactory.java | 6 +--
.../flume/appender/AbstractFlumeManager.java | 2 +-
.../CustomConfigurationFactory.java | 4 +-
src/changes/changes.xml | 3 ++
src/site/xdoc/manual/customconfig.xml | 10 ++--
src/site/xdoc/manual/extending.xml | 8 ++--
35 files changed, 214 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/01f59e46/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/01f59e46/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
----------------------------------------------------------------------
diff --cc
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
index 3fcf864,b741b4e..3f8ba2a
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
@@@ -33,7 -33,9 +34,8 @@@ import org.apache.logging.log4j.core.ap
import org.apache.logging.log4j.core.appender.ManagerFactory;
import org.apache.logging.log4j.core.appender.rolling.action.AbstractAction;
import org.apache.logging.log4j.core.appender.rolling.action.Action;
+ import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.util.Constants;
-import org.apache.logging.log4j.core.util.Log4jThread;
/**
* The Rolling File Manager.
