You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/08 06:14:20 UTC
[3/3] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8b99fab7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8b99fab7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8b99fab7
Branch: refs/heads/master
Commit: 8b99fab7def047ef59c19e09ee990690c3c13efa
Parents: 64f589a 2be4de9
Author: rpopma <rp...@apache.org>
Authored: Tue Mar 8 16:12:42 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Tue Mar 8 16:12:42 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/util/PropertiesUtil.java | 22 +
.../logging/log4j/util/PropertiesUtilTest.java | 65 +++
.../resources/PropertiesUtilTest.properties | 29 +
.../org/apache/logging/log4j/core/Appender.java | 8 +
.../org/apache/logging/log4j/core/Layout.java | 3 +-
.../log4j/core/appender/mom/JmsAppender.java | 10 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../appender/mom/jeromq/JeroMqAppender.java | 229 +-------
.../core/appender/mom/jeromq/JeroMqManager.java | 220 ++++++++
.../core/appender/mom/kafka/KafkaAppender.java | 12 +-
.../core/appender/mom/kafka/KafkaManager.java | 4 +
.../rolling/RollingRandomAccessFileManager.java | 2 +-
.../core/config/AbstractConfiguration.java | 1 +
.../log4j/core/config/ConfigurationAware.java | 33 ++
.../log4j/core/config/CronScheduledFuture.java | 12 +-
.../logging/log4j/core/config/LoggerConfig.java | 51 +-
.../builder/api/AppenderComponentBuilder.java | 9 +-
.../api/AppenderRefComponentBuilder.java | 9 +-
.../api/CompositeFilterComponentBuilder.java | 14 +-
.../builder/api/FilterableComponentBuilder.java | 34 ++
.../builder/api/LoggableComponentBuilder.java | 33 ++
.../builder/api/LoggerComponentBuilder.java | 16 +-
.../builder/api/RootLoggerComponentBuilder.java | 16 +-
.../core/config/builder/api/package-info.java | 2 +
.../config/builder/impl/BuiltConfiguration.java | 17 +-
.../impl/DefaultAppenderComponentBuilder.java | 2 +
.../DefaultAppenderRefComponentBuilder.java | 2 +
...DefaultComponentAndConfigurationBuilder.java | 2 +
.../builder/impl/DefaultComponentBuilder.java | 22 +-
.../DefaultCompositeFilterComponentBuilder.java | 2 +-
.../impl/DefaultConfigurationBuilder.java | 16 +-
.../DefaultCustomLevelComponentBuilder.java | 2 +-
.../impl/DefaultFilterComponentBuilder.java | 2 +-
.../impl/DefaultLayoutComponentBuilder.java | 2 +-
.../impl/DefaultLoggerComponentBuilder.java | 4 +-
.../impl/DefaultRootLoggerComponentBuilder.java | 4 +-
.../impl/DefaultScriptComponentBuilder.java | 2 +-
.../impl/DefaultScriptFileComponentBuilder.java | 2 +
.../core/config/builder/impl/package-info.java | 2 +
.../core/config/json/JsonConfiguration.java | 550 +++++++++----------
.../PropertiesConfigurationBuilder.java | 298 ++++++++++
.../PropertiesConfigurationFactory.java | 378 +------------
.../core/config/status/StatusConfiguration.java | 4 +-
.../log4j/core/config/xml/XmlConfiguration.java | 14 +-
.../AbstractConfigurationAwareLookup.java | 35 ++
.../logging/log4j/core/lookup/Interpolator.java | 6 +-
.../logging/log4j/core/lookup/Log4jLookup.java | 60 +-
.../log4j/core/lookup/StrSubstitutor.java | 19 +-
.../logging/log4j/core/net/SmtpManager.java | 8 +-
.../log4j/core/net/SslSocketManager.java | 2 +-
.../logging/log4j/core/util/KeyValuePair.java | 3 -
.../logging/log4j/core/util/StringEncoder.java | 2 +-
.../appender/mom/jeromq/JeroMqAppenderTest.java | 12 +-
.../log4j/core/config/ConfigurationTest.java | 3 +-
.../core/config/CustomConfigurationTest.java | 2 +-
.../log4j/core/lookup/Log4jLookupTest.java | 32 +-
.../core/lookup/Log4jLookupWithSpacesTest.java | 16 +-
.../log4j/core/util/PropertiesUtilTest.java | 42 --
.../src/test/resources/log4j-routing.properties | 9 -
.../log4j-scriptFile-filters.properties | 8 -
.../src/test/resources/log4j-test1.properties | 58 ++
.../log4j2-properties-root-only.properties | 6 -
.../test/resources/log4j2-properties.properties | 9 -
src/changes/changes.xml | 9 +
src/site/xdoc/manual/configuration.xml.vm | 20 +-
65 files changed, 1387 insertions(+), 1137 deletions(-)
----------------------------------------------------------------------