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/06/03 16:05:46 UTC
[2/2] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
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/e4856a93
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e4856a93
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e4856a93
Branch: refs/heads/master
Commit: e4856a93a8fbcbecece758651be36d7f468c31ff
Parents: 08bf212 9acd705
Author: rpopma <rp...@apache.org>
Authored: Sat Jun 4 01:06:30 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Jun 4 01:06:30 2016 +0900
----------------------------------------------------------------------
.../log4j/message/AbstractMessageFactory.java | 110 +++++-
.../log4j/message/FormattedMessageFactory.java | 97 +++++-
.../log4j/message/LocalizedMessageFactory.java | 10 +-
.../logging/log4j/message/MessageFactory2.java | 1 +
.../message/MessageFormatMessageFactory.java | 93 ++++-
.../message/ParameterizedMessageFactory.java | 105 +++++-
.../ParameterizedNoReferenceMessageFactory.java | 12 +-
.../log4j/message/SimpleMessageFactory.java | 102 +++++-
.../log4j/message/StringFormattedMessage.java | 6 +
.../message/StringFormatterMessageFactory.java | 94 ++++-
log4j-bom/pom.xml | 6 +
.../rolling/action/FileRenameAction.java | 52 +--
.../PropertiesConfigurationBuilder.java | 60 +++-
.../log4j/core/filter/AbstractFilterable.java | 14 +-
.../log4j/core/filter/CompositeFilter.java | 27 +-
.../core/filter/AbstractFilterableTest.java | 281 +++++++++++++++
.../core/layout/CsvLogEventLayoutTest.java | 340 +++++++++----------
.../core/layout/CsvParameterLayoutTest.java | 322 +++++++++---------
.../log4j/core/layout/GelfLayoutTest.java | 2 +-
.../log4j/core/layout/HtmlLayoutTest.java | 2 +-
.../log4j/core/layout/JsonLayoutTest.java | 2 +-
.../log4j/core/layout/PatternLayoutTest.java | 2 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 2 +-
.../log4j/core/layout/SerializedLayoutTest.java | 2 +-
.../log4j/core/layout/SyslogLayoutTest.java | 2 +-
.../log4j/core/layout/XmlLayoutTest.java | 2 +-
.../log4j/core/layout/YamlLayoutTest.java | 6 +-
.../log4j/core/pattern/PatternParserTest.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 88 ++---
.../src/test/resources/log4j-rolling.properties | 24 +-
src/changes/changes.xml | 18 +
src/site/xdoc/manual/configuration.xml.vm | 10 +-
32 files changed, 1406 insertions(+), 490 deletions(-)
----------------------------------------------------------------------