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/03/09 18:50:31 UTC
[1/2] logging-log4j2 git commit: [LOG4J2-63] Support configuration
from version 1.x log4j.properties. Complete TTCC layout.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3d4fb6305 -> 1ecc28bba
[LOG4J2-63] Support configuration from version 1.x log4j.properties.
Complete TTCC layout.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3245c20c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3245c20c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3245c20c
Branch: refs/heads/master
Commit: 3245c20c822da109c51ab58f2f1ace90e150287f
Parents: 0d2cfbe
Author: ggregory <gg...@apache.org>
Authored: Wed Mar 9 09:50:00 2016 -0800
Committer: ggregory <gg...@apache.org>
Committed: Wed Mar 9 09:50:00 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/log4j/config/Log4j1ConfigurationFactory.java | 2 +-
.../org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3245c20c/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 fc07c1c..578b2ab 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
@@ -122,7 +122,7 @@ public class Log4j1ConfigurationFactory extends ConfigurationFactory {
}
case "org.apache.log4j.TTCCLayout": {
// TODO We do not have a %d for the time since the start of the app?
- appenderBuilder.add(newPatternLayout(builder, "%d{UNIX_MILLIS} [%threadName] %level %logger - %m%n"));
+ appenderBuilder.add(newPatternLayout(builder, "%relative [%threadName] %level %logger - %m%n"));
break;
}
case "org.apache.log4j.HTMLLayout": {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3245c20c/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
index 3212db0..4d637b2 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
@@ -77,7 +77,7 @@ public class Log4j1ConfigurationFactoryTest {
@Test
public void testConsoleTtccLayout() throws Exception {
final PatternLayout layout = (PatternLayout) testConsole("config-1.2/log4j-console-TTCCLayout.properties");
- Assert.assertEquals("%d{UNIX_MILLIS} [%threadName] %level %logger - %m%n", layout.getConversionPattern());
+ Assert.assertEquals("%relative [%threadName] %level %logger - %m%n", layout.getConversionPattern());
}
@Test
[2/2] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by gg...@apache.org.
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/1ecc28bb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1ecc28bb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1ecc28bb
Branch: refs/heads/master
Commit: 1ecc28bba0b980a771c863de4028175cd34398fd
Parents: 3245c20 3d4fb63
Author: ggregory <gg...@apache.org>
Authored: Wed Mar 9 09:50:18 2016 -0800
Committer: ggregory <gg...@apache.org>
Committed: Wed Mar 9 09:50:18 2016 -0800
----------------------------------------------------------------------
.../apache/logging/log4j/core/util/Compare.java | 134 -------------------
.../log4j/web/appender/ServletAppender.java | 4 +-
2 files changed, 1 insertion(+), 137 deletions(-)
----------------------------------------------------------------------