You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2016/04/26 07:48:48 UTC
[38/38] logging-log4j2 git commit: Merge branch 'LOG4j2-494'
Merge branch 'LOG4j2-494'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/988ed509
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/988ed509
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/988ed509
Branch: refs/heads/master
Commit: 988ed509361431028045bfeb269fa6408333d7d7
Parents: 2d16d34 bf3ef61
Author: Ralph Goers <rg...@nextiva.com>
Authored: Mon Apr 25 22:33:42 2016 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Mon Apr 25 22:33:42 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/status/StatusLogger.java | 6 +
.../apache/logging/log4j/util/LoaderUtil.java | 8 +-
log4j-core/${filename} | 0
.../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/util/WatchManager.java | 9 +
.../core/config/CompositeConfigurationTest.java | 176 ++++++++++++
.../log4j/core/config/TestConfigurator.java | 11 +-
.../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 +++
pom.xml | 2 +-
src/site/site.xml | 1 +
src/site/xdoc/manual/configuration.xml.vm | 46 +++-
34 files changed, 1332 insertions(+), 60 deletions(-)
----------------------------------------------------------------------