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/6b5a80ab Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6b5a80ab Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6b5a80ab Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 6b5a80ab8ca417c577075f0cdd8849f368d442e6 Parents: b3a4e9e 87026a9 Author: rpopma <rpo...@apache.org> Authored: Fri Aug 12 20:47:12 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Fri Aug 12 20:47:12 2016 +0900 ---------------------------------------------------------------------- .../apache/logging/log4j/util/Constants.java | 2 +- .../log4j/core/appender/AbstractAppender.java | 58 +++ .../appender/AbstractOutputStreamAppender.java | 21 + .../log4j/core/appender/ConsoleAppender.java | 82 +--- .../log4j/core/appender/FileAppender.java | 292 +++++++---- .../log4j/core/appender/FileManager.java | 90 +++- .../core/appender/MemoryMappedFileAppender.java | 2 +- .../core/appender/OutputStreamManager.java | 59 ++- .../core/appender/RandomAccessFileAppender.java | 2 +- .../core/appender/RollingFileAppender.java | 491 +++++++++++-------- .../RollingRandomAccessFileAppender.java | 2 +- .../rolling/DefaultRolloverStrategy.java | 10 +- .../log4j/core/appender/rolling/FileSize.java | 1 + .../core/async/AsyncQueueFullPolicyFactory.java | 4 +- .../log4j/core/config/AppendersPlugin.java | 4 +- .../core/config/plugins/util/PluginBuilder.java | 8 +- .../log4j/core/filter/AbstractFilterable.java | 27 + .../log4j/core/layout/AbstractStringLayout.java | 2 +- .../log4j/core/layout/PatternLayout.java | 12 +- .../logging/log4j/core/util/Constants.java | 4 +- .../logging/log4j/core/util/TypeUtil.java | 21 + .../core/appender/ConsoleAppenderTest.java | 8 +- .../log4j/core/appender/FileAppenderTest.java | 304 +++++++----- .../core/appender/OutputStreamAppenderTest.java | 214 ++++---- .../core/appender/rolling/FileSizeTest.java | 4 +- .../rolling/OnStartupTriggeringPolicyTest.java | 34 +- .../rolling/RollingAppenderCronTest.java | 3 +- .../rolling/RollingFileAppenderAccessTest.java | 23 +- .../core/config/CustomConfigurationTest.java | 13 +- .../plugins/util/PluginManagerPackagesTest.java | 10 +- .../AbstractPluginWithGenericBuilder.java | 59 +++ .../PluginWithGenericSubclassFoo1Builder.java | 55 +++ .../plugins/validation/ValidatingPlugin.java | 2 +- .../ValidatingPluginWithGenericBuilder.java | 75 +++ .../ValidatingPluginWithTypedBuilder.java | 70 +++ .../validators/RequiredValidatorTest.java | 1 + .../ValidatingPluginWithGenericBuilderTest.java | 66 +++ ...luginWithGenericSubclassFoo1BuilderTest.java | 68 +++ .../ValidatingPluginWithTypedBuilderTest.java | 71 +++ .../junit/AbstractExternalFileCleaner.java | 232 ++++++--- .../apache/logging/log4j/junit/CleanFiles.java | 38 +- .../logging/log4j/junit/CleanFolders.java | 59 +-- .../logging/log4j/junit/LoggerContextRule.java | 4 +- .../log4j/test/appender/InMemoryAppender.java | 7 +- .../log4j/flume/appender/FlumeAppender.java | 41 +- .../log4j/flume/appender/FlumeAppenderTest.java | 49 +- src/changes/changes.xml | 21 +- src/site/xdoc/manual/appenders.xml | 5 +- 48 files changed, 1903 insertions(+), 827 deletions(-) ----------------------------------------------------------------------