Merge branch 'LOG4J2-952'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ab4f5a54 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ab4f5a54 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ab4f5a54 Branch: refs/heads/master Commit: ab4f5a5484da9f54154d957b8e31d6ff98f3fd10 Parents: 5de8dac b288e2c Author: Ralph Goers <[email protected]> Authored: Mon Sep 7 17:31:57 2015 -0700 Committer: Ralph Goers <[email protected]> Committed: Mon Sep 7 17:31:57 2015 -0700 ---------------------------------------------------------------------- .../logging/log4j/util/PropertiesUtil.java | 33 ++ .../logging/log4j/core/AbstractLifeCycle.java | 5 + .../apache/logging/log4j/core/LifeCycle.java | 4 + .../core/config/AbstractConfiguration.java | 26 +- .../log4j/core/config/ConfigurationFactory.java | 3 +- .../logging/log4j/core/config/Configurator.java | 40 ++- .../builder/api/AppenderComponentBuilder.java | 45 +++ .../api/AppenderRefComponentBuilder.java | 31 ++ .../core/config/builder/api/Component.java | 81 +++++ .../config/builder/api/ComponentBuilder.java | 96 +++++ .../api/CompositeFilterComponentBuilder.java | 31 ++ .../builder/api/ConfigurationBuilder.java | 260 ++++++++++++++ .../api/ConfigurationBuilderFactory.java | 40 +++ .../api/CustomLevelComponentBuilder.java | 25 ++ .../builder/api/FilterComponentBuilder.java | 25 ++ .../builder/api/LayoutComponentBuilder.java | 25 ++ .../builder/api/LoggerComponentBuilder.java | 38 ++ .../builder/api/RootLoggerComponentBuilder.java | 38 ++ .../config/builder/impl/BuiltConfiguration.java | 167 +++++++++ .../impl/DefaultAppenderComponentBuilder.java | 44 +++ .../DefaultAppenderRefComponentBuilder.java | 40 +++ ...DefaultComponentAndConfigurationBuilder.java | 45 +++ .../builder/impl/DefaultComponentBuilder.java | 121 +++++++ .../DefaultCompositeFilterComponentBuilder.java | 42 +++ .../impl/DefaultConfigurationBuilder.java | 304 ++++++++++++++++ .../DefaultCustomLevelComponentBuilder.java | 33 ++ .../impl/DefaultFilterComponentBuilder.java | 34 ++ .../impl/DefaultLayoutComponentBuilder.java | 31 ++ .../impl/DefaultLoggerComponentBuilder.java | 64 ++++ .../impl/DefaultRootLoggerComponentBuilder.java | 63 ++++ .../visitors/PluginAttributeVisitor.java | 2 +- .../visitors/PluginBuilderAttributeVisitor.java | 2 +- .../properties/PropertiesConfiguration.java | 56 +++ .../PropertiesConfigurationFactory.java | 353 +++++++++++++++++++ .../log4j/core/impl/Log4jContextFactory.java | 27 ++ .../log4j/core/net/server/JmsServer.java | 4 + .../apache/logging/log4j/core/util/Builder.java | 14 +- .../util/DefaultShutdownCallbackRegistry.java | 4 + .../routing/PropertiesRoutingAppenderTest.java | 79 +++++ .../log4j/core/config/TestConfigurator.java | 30 ++ .../builder/ConfigurationAssemblerTest.java | 86 +++++ .../builder/CustomConfigurationFactory.java | 72 ++++ .../properties/PropertiesConfigurationTest.java | 60 ++++ .../properties/RollingFilePropertiesTest.java | 59 ++++ .../log4j/core/util/PropertiesUtilTest.java | 42 +++ .../src/test/resources/log4j-rolling.properties | 62 ++++ .../src/test/resources/log4j-routing.properties | 69 ++++ .../test/resources/log4j2-properties.properties | 46 +++ src/site/site.xml | 2 + src/site/xdoc/manual/configuration.xml.vm | 77 +++- src/site/xdoc/manual/customconfig.xml | 90 ++++- 51 files changed, 3050 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab4f5a54/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java ----------------------------------------------------------------------
