Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bddee9d6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bddee9d6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bddee9d6 Branch: refs/heads/master Commit: bddee9d68ea2bb7f0fbc4e757018253856a4a5ef Parents: 8c39e7a 3a17440 Author: rpopma <[email protected]> Authored: Wed Apr 27 00:54:16 2016 +0900 Committer: rpopma <[email protected]> Committed: Wed Apr 27 00:54:16 2016 +0900 ---------------------------------------------------------------------- README.md | 20 ++ .../logging/log4j/CloseableThreadContext.java | 26 +- .../apache/logging/log4j/spi/Terminable.java | 16 +- .../logging/log4j/status/StatusLogger.java | 6 + .../apache/logging/log4j/util/LoaderUtil.java | 8 +- .../log4j/CloseableThreadContextTest.java | 18 +- .../core/config/AbstractConfiguration.java | 26 +- .../log4j/core/config/ConfigurationFactory.java | 66 +++-- .../log4j/core/config/ConfigurationSource.java | 51 +++- .../core/config/ConfiguratonFileWatcher.java | 4 + .../logging/log4j/core/config/Configurator.java | 46 +++- .../builder/api/ConfigurationBuilder.java | 17 ++ .../impl/DefaultConfigurationBuilder.java | 16 +- .../composite/CompositeConfiguration.java | 183 +++++++++++++ .../config/composite/DefaultMergeStrategy.java | 266 +++++++++++++++++++ .../core/config/composite/MergeStrategy.java | 41 +++ .../core/config/composite/package-info.java | 21 ++ .../properties/PropertiesConfiguration.java | 2 +- .../PropertiesConfigurationBuilder.java | 9 +- .../core/config/status/StatusConfiguration.java | 1 + .../log4j/core/impl/Log4jContextFactory.java | 43 ++- .../logging/log4j/core/layout/GelfLayout.java | 23 +- .../logging/log4j/core/util/WatchManager.java | 9 + .../core/config/CompositeConfigurationTest.java | 176 ++++++++++++ .../log4j/core/config/TestConfigurator.java | 11 +- .../log4j/core/layout/GelfLayoutTest.java | 17 +- .../src/test/resources/log4j-comp-appender.json | 34 +++ .../src/test/resources/log4j-comp-appender.xml | 39 +++ .../src/test/resources/log4j-comp-filter.json | 9 + .../src/test/resources/log4j-comp-filter.xml | 34 +++ .../src/test/resources/log4j-comp-logger.json | 36 +++ .../src/test/resources/log4j-comp-logger.xml | 41 +++ .../test/resources/log4j-comp-properties.json | 16 ++ .../test/resources/log4j-comp-properties.xml | 34 +++ .../resources/log4j-comp-reconfig.properties | 59 ++++ .../src/test/resources/log4j-comp-reconfig.xml | 39 +++ .../log4j/perf/jmh/GelfLayoutBenchmark.java | 3 +- pom.xml | 2 +- src/changes/changes.xml | 6 + src/site/site.xml | 1 + src/site/xdoc/manual/configuration.xml.vm | 48 +++- src/site/xdoc/manual/layouts.xml.vm | 33 ++- 42 files changed, 1470 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
