You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/08/31 17:41:35 UTC
[11/13] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-1553
Merge remote-tracking branch 'origin/master' into LOG4J2-1553
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8bc69221
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8bc69221
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8bc69221
Branch: refs/heads/master
Commit: 8bc692211e3ea19b7cbb4918a6620be2c2a589a4
Parents: a0d08f3 114e687
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 09:02:15 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 09:02:15 2016 -0700
----------------------------------------------------------------------
README.md | 8 ++
log4j-1.2-api/pom.xml | 4 -
.../config/Log4j1ConfigurationConverter.java | 41 ++++++
.../config/Log4j1ConfigurationFactory.java | 1 -
.../log4j/config/Log4j1ConfigurationParser.java | 20 +--
.../apache/log4j/layout/Log4j1XmlLayout.java | 4 +-
.../pattern/Log4j1NdcPatternConverter.java | 4 +-
.../org/apache/logging/log4j/util/Strings.java | 63 +++++++++
log4j-core/pom.xml | 10 ++
.../builder/api/ConfigurationBuilder.java | 16 +++
.../impl/DefaultConfigurationBuilder.java | 129 +++++++++++++++++++
.../RollingAppenderCronOnceADayTest.java | 2 +-
.../builder/ConfigurationBuilderTest.java | 91 +++++++++++++
pom.xml | 12 ++
src/changes/changes.xml | 3 +
15 files changed, 389 insertions(+), 19 deletions(-)
----------------------------------------------------------------------