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/04/21 07:26:24 UTC

[3/3] 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/8af151ff
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8af151ff
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8af151ff

Branch: refs/heads/master
Commit: 8af151ff62055cf737129a84b5c71da271fa277e
Parents: 4673aef 3095a9c
Author: rpopma <rp...@apache.org>
Authored: Thu Apr 21 14:26:32 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Apr 21 14:26:32 2016 +0900

----------------------------------------------------------------------
 .../builder/api/ConfigurationBuilder.java       | 72 +++++++++++++++++
 .../impl/DefaultConfigurationBuilder.java       | 54 +++++++++++--
 .../impl/DefaultLoggerComponentBuilder.java     | 29 +++++++
 .../impl/DefaultRootLoggerComponentBuilder.java | 27 +++++++
 .../PropertiesConfigurationBuilder.java         | 32 +++++++-
 .../log4j/core/layout/JacksonFactory.java       | 41 +++++++++-
 .../appender/RandomAccessFileAppenderTests.java | 15 ++--
 .../appender/XmlCompleteFileAppenderTest.java   | 82 ++++++++++++++++++++
 .../core/appender/XmlFileAppenderTest.java      |  1 +
 ...cessFileAppenderLocationPropsTest.properties | 35 +++++++++
 src/changes/changes.xml                         | 12 ++-
 11 files changed, 378 insertions(+), 22 deletions(-)
----------------------------------------------------------------------