You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/08/14 20:17:02 UTC
[04/11] logging-log4j2 git commit: Fix Layouts
Fix Layouts
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/526946eb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/526946eb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/526946eb
Branch: refs/heads/LOG4J2-1512
Commit: 526946eb56e2658228190f8b5862bd131d09e627
Parents: b06d5de
Author: Mikael St�ldal <mi...@staldal.nu>
Authored: Sat Aug 13 19:23:18 2016 +0200
Committer: Mikael St�ldal <mi...@staldal.nu>
Committed: Sat Aug 13 19:24:05 2016 +0200
----------------------------------------------------------------------
.../org/apache/log4j/config/Log4j1ConfigurationFactory.java | 7 ++++---
.../resources/config-1.2/log4j-console-XmlLayout.properties | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/526946eb/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
index fd509e0..fc49c2b 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
@@ -53,10 +53,11 @@ import org.apache.logging.log4j.status.StatusLogger;
* <li>Follow</li>
* <li>Target</li>
* <li>layout = org.apache.log4j.PatternLayout</li>
+ * <li>layout = org.apache.log4j.EnhancedPatternLayout (partial?)</li>
* <li>layout = org.apache.log4j.SimpleLayout</li>
* <li>layout = org.apache.log4j.TTCCLayout (partial)</li>
- * <li>layout = org.apache.log4j.HtmlLayout (partial)</li>
- * <li>layout = org.apache.log4j.XmlLayout (partial)</li>
+ * <li>layout = org.apache.log4j.HTMLLayout (partial)</li>
+ * <li>layout = org.apache.log4j.xml.XMLLayout (partial)</li>
* <li>layout.ConversionPattern</li>
* </ul>
* </ul>
@@ -133,7 +134,7 @@ public class Log4j1ConfigurationFactory extends ConfigurationFactory {
appenderBuilder.add(builder.newLayout("HtmlLayout"));
break;
}
- case "org.apache.log4j.XMLLayout": {
+ case "org.apache.log4j.xml.XMLLayout": {
appenderBuilder.add(builder.newLayout("XmlLayout"));
break;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/526946eb/log4j-1.2-api/src/test/resources/config-1.2/log4j-console-XmlLayout.properties
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/resources/config-1.2/log4j-console-XmlLayout.properties b/log4j-1.2-api/src/test/resources/config-1.2/log4j-console-XmlLayout.properties
index 155b1ff..ab1c53b 100644
--- a/log4j-1.2-api/src/test/resources/config-1.2/log4j-console-XmlLayout.properties
+++ b/log4j-1.2-api/src/test/resources/config-1.2/log4j-console-XmlLayout.properties
@@ -13,6 +13,6 @@ log4j.rootLogger=TRACE, Console
log4j.appender.Console=org.apache.log4j.ConsoleAppender
log4j.appender.Console.ImmediateFlush=false
log4j.appender.Console.Target=System.err
-log4j.appender.Console.layout=org.apache.log4j.XMLLayout
+log4j.appender.Console.layout=org.apache.log4j.xml.XMLLayout
log4j.logger.com.example.foo = DEBUG