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/25 22:27:47 UTC
[14/18] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1db38fc4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1db38fc4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1db38fc4
Branch: refs/heads/LOG4J2-1539
Commit: 1db38fc42fac86f8da408e5450b0b3069ffe5caa
Parents: e15d0c7 cc0bf0b
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Aug 25 13:52:41 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Aug 25 13:52:41 2016 -0700
----------------------------------------------------------------------
.../log4j/config/Log4j1ConfigurationParser.java | 210 +++++++++++--------
.../config/Log4j1ConfigurationFactoryTest.java | 25 ++-
...g4j-console-EnhancedPatternLayout.properties | 1 -
.../log4j-console-HtmlLayout.properties | 1 -
.../log4j-console-PatternLayout.properties | 1 -
.../log4j-console-SimpleLayout.properties | 1 -
.../log4j-console-TTCCLayout.properties | 1 -
.../log4j-console-XmlLayout.properties | 1 -
.../log4j-file-SimpleLayout.properties | 17 ++
9 files changed, 158 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1db38fc4/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
----------------------------------------------------------------------