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 2015/09/29 01:05:28 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1135 source code format
Repository: logging-log4j2
Updated Branches:
refs/heads/master b17d7c066 -> dd75cd758
LOG4J2-1135 source code format
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f49ed948
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f49ed948
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f49ed948
Branch: refs/heads/master
Commit: f49ed9488f7dadb24913cc5f7e98a28ac55fcce8
Parents: a5447ae
Author: rpopma <rp...@apache.org>
Authored: Tue Sep 29 01:04:48 2015 +0200
Committer: rpopma <rp...@apache.org>
Committed: Tue Sep 29 01:04:48 2015 +0200
----------------------------------------------------------------------
.../appender/rolling/RollingAppenderSizeTest.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f49ed948/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
index d8db5bc..ce39d6d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
@@ -56,10 +56,16 @@ public class RollingAppenderSizeTest {
@Parameterized.Parameters(name = "{0} \u2192 {1}")
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { {"log4j-rolling-gz.xml", ".gz"}, {"log4j-rolling-zip.xml", ".zip"},
+ return Arrays.asList(new Object[][] { //
+ // @formatter:off
+ {"log4j-rolling-gz.xml", ".gz"}, //
+ {"log4j-rolling-zip.xml", ".zip"}, //
// Apache Commons Compress
- {"log4j-rolling-bzip2.xml", ".bz2"}, {"log4j-rolling-deflate.xml", ".deflate"},
- {"log4j-rolling-pack200.xml", ".pack200"}, {"log4j-rolling-xy.xml", ".xy"},});
+ {"log4j-rolling-bzip2.xml", ".bz2"}, //
+ {"log4j-rolling-deflate.xml", ".deflate"}, //
+ {"log4j-rolling-pack200.xml", ".pack200"}, //
+ {"log4j-rolling-xy.xml", ".xy"},});
+ // @formatter:on
}
@Rule
@@ -107,7 +113,8 @@ public class RollingAppenderSizeTest {
String text = new String(baos.toByteArray(), Charset.defaultCharset());
String[] lines = text.split("[\\r\\n]+");
for (String line : lines) {
- assertTrue(line.contains("DEBUG o.a.l.l.c.a.r.RollingAppenderSizeTest [main] This is test message number"));
+ assertTrue(line
+ .contains("DEBUG o.a.l.l.c.a.r.RollingAppenderSizeTest [main] This is test message number"));
}
} finally {
Closer.close(in);
[2/2] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by rp...@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/dd75cd75
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dd75cd75
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dd75cd75
Branch: refs/heads/master
Commit: dd75cd758f325b056f7b51948dd8e96b27ccc6c1
Parents: f49ed94 b17d7c0
Author: rpopma <rp...@apache.org>
Authored: Tue Sep 29 01:05:15 2015 +0200
Committer: rpopma <rp...@apache.org>
Committed: Tue Sep 29 01:05:15 2015 +0200
----------------------------------------------------------------------
.../core/config/AbstractConfiguration.java | 42 ++++++++++----------
1 file changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------