Merge remote-tracking branch 'remotes/origin/master' 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/138cb1ce Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/138cb1ce Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/138cb1ce Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 138cb1cecf44e1e812631643457e7e9c934aadf9 Parents: a994f15 e706a22 Author: rpopma <rpo...@apache.org> Authored: Mon Aug 22 07:32:21 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Mon Aug 22 07:32:21 2016 +0900 ---------------------------------------------------------------------- .../config/Log4j1ConfigurationFactory.java | 312 +------------------ .../log4j/config/Log4j1ConfigurationParser.java | 301 ++++++++++++++++++ ...g4j-console-EnhancedPatternLayout.properties | 2 +- .../java/org/apache/logging/log4j/Logger.java | 20 ++ .../logging/log4j/spi/ThreadContextStack.java | 1 + .../logging/log4j/core/LoggerContext.java | 1 + .../log4j/core/appender/AbstractManager.java | 2 + .../core/appender/mom/kafka/KafkaManager.java | 185 ++++++----- .../core/async/AsyncLoggerConfigDisruptor.java | 3 +- .../log4j/core/async/AsyncLoggerDisruptor.java | 3 +- .../log4j/core/async/DaemonThreadFactory.java | 51 --- .../core/config/ConfigurationScheduler.java | 15 +- .../impl/DefaultConfigurationBuilder.java | 16 +- .../DefaultCustomLevelComponentBuilder.java | 2 +- .../PropertiesConfigurationFactory.java | 3 +- .../apache/logging/log4j/core/jmx/Server.java | 7 +- .../log4j/core/layout/PatternLayout.java | 4 +- .../log4j/core/net/server/JmsServer.java | 5 +- .../logging/log4j/core/util/Log4jThread.java | 138 ++++---- .../log4j/core/util/Log4jThreadFactory.java | 88 ++++++ .../builder/ConfigurationAssemblerTest.java | 35 ++- .../builder/CustomConfigurationFactory.java | 7 +- .../logging/log4j/junit/LoggerContextRule.java | 2 - .../flume/appender/FlumePersistentManager.java | 30 +- src/site/xdoc/manual/appenders.xml | 18 +- 25 files changed, 668 insertions(+), 583 deletions(-) ----------------------------------------------------------------------
