July 2008 - logback-dev - mailman3.qos.ch

svn commit: r1727 - logback/trunk/logback-examples/src/main/java/chapter8
by noreply.ceki＠qos.ch 29 Jul '08

29 Jul '08

Author: ceki Date: Tue Jul 29 13:32:23 2008 New Revision: 1727 Removed: logback/trunk/logback-examples/src/main/java/chapter8/ Log: - profiler code moved to slf4j

1 0

svn commit: r1726 - in logback/trunk: . logback-core/src/test/java/ch/qos/logback/core/rolling logback-core/src/test/java/ch/qos/logback/core/rolling/helper logback-core/src/test/java/ch/qos/logback/core/util logback-examples logback-site/src/site/pages
by noreply.ceki＠qos.ch 28 Jul '08

28 Jul '08

Author: ceki Date: Mon Jul 28 23:42:22 2008 New Revision: 1726 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java logback/trunk/logback-examples/pom.xml logback/trunk/logback-site/src/site/pages/news.html logback/trunk/pom.xml Log: - test from the c.q.l.core.rolling package send their output to files under the target directory. See also http://www.qos.ch/pipermail/logback-dev/2008-July/002610.html - logback now depends on slf4j version 5.1.3-snapshot - lb-examples depends on slf4j-ext Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java Mon Jul 28 23:42:22 2008 @@ -43,7 +43,7 @@ super.setUp(); layout = new EchoLayout<Object>(); - File target = new File(Constants.TEST_DIR_PREFIX + "output/test.log"); + File target = new File(Constants.OUTPUT_DIR_PREFIX + "test.log"); target.mkdirs(); target.delete(); } @@ -57,7 +57,7 @@ RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); rfa.setLayout(layout); rfa.setContext(context); - rfa.setFile(Constants.TEST_DIR_PREFIX + "output/test.log"); + rfa.setFile(Constants.OUTPUT_DIR_PREFIX + "test.log"); // rollover by the second String datePattern = "yyyy-MM-dd_HH_mm_ss"; @@ -65,7 +65,7 @@ String[] filenames = new String[2]; TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); - tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test-%d{" + datePattern + "}"); + tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test-%d{" + datePattern + "}"); //tbrp.setActiveFileName("src/test/output/test.log"); tbrp.setContext(context); tbrp.setParent(rfa); @@ -81,8 +81,8 @@ DelayerUtil.delayUntilNextSecond(50); rfa.doAppend("Hello 1"); - filenames[0] = Constants.TEST_DIR_PREFIX + "output/test-" + sdf.format(cal.getTime()); - filenames[1] = Constants.TEST_DIR_PREFIX + "output/test.log"; + filenames[0] = Constants.OUTPUT_DIR_PREFIX + "test-" + sdf.format(cal.getTime()); + filenames[1] = Constants.OUTPUT_DIR_PREFIX + "test.log"; for (int i = 0; i < filenames.length; i++) { //System.out.println("before i=" + i); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Mon Jul 28 23:42:22 2008 @@ -44,13 +44,13 @@ public void setUp() { { - File target = new File(Constants.TEST_DIR_PREFIX - + "output/sizeBased-test2.log"); + File target = new File(Constants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.log"); target.mkdirs(); target.delete(); } { - File target = new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); + File target = new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.log"); target.mkdirs(); target.delete(); } @@ -80,8 +80,8 @@ sbtp.setMaxFileSize("100"); sbtp.start(); - fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX - + "output/sizeBased-test1.%i"); + fwrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + + "sizeBased-test1.%i"); try { fwrp.start(); fail("The absence of activeFileName option should have caused an exception."); @@ -103,8 +103,8 @@ rfa.setName("ROLLING"); rfa.setLayout(layout); rfa.setContext(context); - rfa.setFile(Constants.TEST_DIR_PREFIX - + "output/sizeBased-test2.log"); + rfa.setFile(Constants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.log"); FixedWindowRollingPolicy swrp = new FixedWindowRollingPolicy(); swrp.setContext(context); @@ -116,8 +116,8 @@ // swrp.setActiveFileName(Constants.TEST_DIR_PREFIX // + "output/sizeBased-test2.log"); - swrp.setFileNamePattern(Constants.TEST_DIR_PREFIX - + "output/sizeBased-test2.%i"); + swrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.%i"); swrp.setParent(rfa); swrp.start(); @@ -142,25 +142,25 @@ rfa.doAppend("hello"); } - assertTrue(new File(Constants.TEST_DIR_PREFIX - + "output/sizeBased-test2.log").exists()); - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.0") + assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.log").exists()); + assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sizeBased-test2.0") .exists()); - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sizeBased-test2.1") + assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sizeBased-test2.1") .exists()); // The File.length() method is not accurate under Windows if (!isWindows()) { - assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX - + "output/sizeBased-test2.log", Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.log", Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.l")); - assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX - + "output/sizeBased-test2.0", Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.0", Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.0")); - assertTrue(Compare.compare(Constants.TEST_DIR_PREFIX - + "output/sizeBased-test2.1", Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.1", Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.1")); } @@ -176,7 +176,7 @@ RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); rfa.setLayout(layout); rfa.setContext(context); - rfa.setFile(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); + rfa.setFile(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.log"); FixedWindowRollingPolicy fwrp = new FixedWindowRollingPolicy(); fwrp.setContext(context); @@ -186,8 +186,8 @@ sbtp.setMaxFileSize("100"); fwrp.setMinIndex(0); //fwrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); - fwrp.setFileNamePattern(Constants.TEST_DIR_PREFIX - + "output/sbr-test3.%i.gz"); + fwrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + + "sbr-test3.%i.gz"); fwrp.setParent(rfa); fwrp.start(); rfa.setRollingPolicy(fwrp); @@ -211,11 +211,11 @@ rfa.doAppend("hello"); } - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log") + assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.log") .exists()); - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.0.gz") + assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.0.gz") .exists()); - assertTrue(new File(Constants.TEST_DIR_PREFIX + "output/sbr-test3.1.gz") + assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.1.gz") .exists()); if (!isWindows()) { Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Mon Jul 28 23:42:22 2008 @@ -60,17 +60,17 @@ context.setName("test"); // Delete .log files { - File target = new File(Constants.TEST_DIR_PREFIX + "output/test4.log"); + File target = new File(Constants.OUTPUT_DIR_PREFIX + "test4.log"); target.mkdirs(); target.delete(); } { - File target = new File(Constants.TEST_DIR_PREFIX + "output/test5.log"); + File target = new File(Constants.OUTPUT_DIR_PREFIX + "test5.log"); target.mkdirs(); target.delete(); } { - File target = new File(Constants.TEST_DIR_PREFIX + "output/test6.log"); + File target = new File(Constants.OUTPUT_DIR_PREFIX + "test6.log"); target.mkdirs(); target.delete(); } @@ -93,7 +93,7 @@ TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); tbrp.setContext(context); - tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test1-%d{" + tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test1-%d{" + DATE_PATTERN + "}"); tbrp.setParent(rfa); tbrp.setCurrentTime(currentTime); @@ -105,7 +105,7 @@ String[] filenames = new String[3]; for (int i = 0; i < 3; i++) { - filenames[i] = Constants.TEST_DIR_PREFIX + "output/test1-" + filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test1-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } @@ -143,7 +143,7 @@ rfa1.setLayout(layout); TimeBasedRollingPolicy tbrp1 = new TimeBasedRollingPolicy(); - tbrp1.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test2-%d{" + tbrp1.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test2-%d{" + DATE_PATTERN + "}"); tbrp1.setContext(context); tbrp1.setParent(rfa1); @@ -156,7 +156,7 @@ String[] filenames = new String[3]; for (int i = 0; i < 3; i++) { - filenames[i] = Constants.TEST_DIR_PREFIX + "output/test2-" + filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test2-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } @@ -179,7 +179,7 @@ TimeBasedRollingPolicy tbrp2 = new TimeBasedRollingPolicy(); tbrp2.setContext(context); - tbrp2.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test2-%d{" + tbrp2.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test2-%d{" + DATE_PATTERN + "}"); tbrp2.setParent(rfa2); tbrp2.setCurrentTime(tbrp1.getCurrentTime()); @@ -213,7 +213,7 @@ TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); tbrp.setContext(context); - tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test3-%d{" + tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test3-%d{" + DATE_PATTERN + "}.gz"); tbrp.setParent(rfa); tbrp.setCurrentTime(currentTime); @@ -225,12 +225,12 @@ String[] filenames = new String[4]; for (int i = 0; i < 2; i++) { - filenames[i] = Constants.TEST_DIR_PREFIX + "output/test3-" + filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test3-" + sdf.format(cal.getTime()) + ".gz"; cal.add(Calendar.SECOND, 1); } - filenames[3] = Constants.TEST_DIR_PREFIX + "output/test3-" + filenames[3] = Constants.OUTPUT_DIR_PREFIX + "test3-" + sdf.format(cal.getTime()); // System.out.println("Waiting until next second and 100 millis."); @@ -264,12 +264,12 @@ RollingFileAppender<Object> rfa1 = new RollingFileAppender<Object>(); rfa1.setContext(context); rfa1.setLayout(layout); - rfa1.setFile(Constants.TEST_DIR_PREFIX + "output/test4.log"); + rfa1.setFile(Constants.OUTPUT_DIR_PREFIX + "test4.log"); TimeBasedRollingPolicy tbrp1 = new TimeBasedRollingPolicy(); tbrp1.setContext(context); // tbrp1.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test4.log"); - tbrp1.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test4-%d{" + tbrp1.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test4-%d{" + DATE_PATTERN + "}"); tbrp1.setParent(rfa1); tbrp1.setCurrentTime(currentTime); @@ -281,11 +281,11 @@ String[] filenames = new String[3]; for (int i = 0; i < 2; i++) { - filenames[i] = Constants.TEST_DIR_PREFIX + "output/test4-" + filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test4-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } - filenames[2] = Constants.TEST_DIR_PREFIX + "output/test4.log"; + filenames[2] = Constants.OUTPUT_DIR_PREFIX + "test4.log"; // System.out.println("Waiting until next second and 100 millis."); tbrp1.setCurrentTime(addTime(currentTime, 1100)); @@ -301,11 +301,11 @@ RollingFileAppender<Object> rfa2 = new RollingFileAppender<Object>(); rfa2.setContext(context); rfa2.setLayout(layout); - rfa2.setFile(Constants.TEST_DIR_PREFIX + "output/test4.log"); + rfa2.setFile(Constants.OUTPUT_DIR_PREFIX + "test4.log"); TimeBasedRollingPolicy tbrp2 = new TimeBasedRollingPolicy(); tbrp2.setContext(context); - tbrp2.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test4-%d{" + tbrp2.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test4-%d{" + DATE_PATTERN + "}"); // tbrp2.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test4.log"); tbrp2.setParent(rfa2); @@ -336,11 +336,11 @@ RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); rfa.setContext(context); rfa.setLayout(layout); - rfa.setFile(Constants.TEST_DIR_PREFIX + "output/test5.log"); + rfa.setFile(Constants.OUTPUT_DIR_PREFIX + "test5.log"); TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); tbrp.setContext(context); - tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test5-%d{" + tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test5-%d{" + DATE_PATTERN + "}"); // tbrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test5.log"); tbrp.setParent(rfa); @@ -353,12 +353,12 @@ String[] filenames = new String[4]; for (int i = 0; i < 2; i++) { - filenames[i] = Constants.TEST_DIR_PREFIX + "output/test5-" + filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test5-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } - filenames[2] = Constants.TEST_DIR_PREFIX + "output/test5.log"; + filenames[2] = Constants.OUTPUT_DIR_PREFIX + "test5.log"; // System.out.println("Waiting until next second and 100 millis."); tbrp.setCurrentTime(addTime(currentTime, 1100)); @@ -386,11 +386,11 @@ RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); rfa.setContext(context); rfa.setLayout(layout); - rfa.setFile(Constants.TEST_DIR_PREFIX + "output/test6.log"); + rfa.setFile(Constants.OUTPUT_DIR_PREFIX+ "test6.log"); TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); tbrp.setContext(context); - tbrp.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test6-%d{" + tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test6-%d{" + DATE_PATTERN + "}.gz"); // tbrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test6.log"); tbrp.setParent(rfa); @@ -403,12 +403,12 @@ String[] filenames = new String[4]; for (int i = 0; i < 2; i++) { - filenames[i] = Constants.TEST_DIR_PREFIX + "output/test6-" + filenames[i] = Constants.OUTPUT_DIR_PREFIX + "test6-" + sdf.format(cal.getTime()) + ".gz"; cal.add(Calendar.SECOND, 1); } - filenames[2] = Constants.TEST_DIR_PREFIX + "output/test6.log"; + filenames[2] = Constants.OUTPUT_DIR_PREFIX + "test6.log"; // System.out.println("Waiting until next second and 100 millis."); tbrp.setCurrentTime(addTime(currentTime, 1100)); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java Mon Jul 28 23:42:22 2008 @@ -38,8 +38,8 @@ File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress1.txt"); copy(source, dest); - File target = new File(Constants.TEST_DIR_PREFIX - + "output/compress1.txt.gz"); + File target = new File(Constants.OUTPUT_DIR_PREFIX + + "compress1.txt.gz"); target.mkdirs(); target.delete(); } @@ -47,8 +47,8 @@ File source = new File(Constants.TEST_DIR_PREFIX + "input/compress2.copy"); File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress2.txt"); copy(source, dest); - File target = new File(Constants.TEST_DIR_PREFIX - + "output/compress2.txt.gz"); + File target = new File(Constants.OUTPUT_DIR_PREFIX + + "compress2.txt.gz"); target.mkdirs(); target.delete(); } @@ -56,8 +56,8 @@ File source = new File(Constants.TEST_DIR_PREFIX + "input/compress3.copy"); File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress3.txt"); copy(source, dest); - File target = new File(Constants.TEST_DIR_PREFIX - + "output/compress3.txt.zip"); + File target = new File(Constants.OUTPUT_DIR_PREFIX + + "compress3.txt.zip"); target.mkdirs(); target.delete(); } @@ -69,35 +69,35 @@ public void test1() throws Exception { Compressor compressor = new Compressor(CompressionMode.GZ, Constants.TEST_DIR_PREFIX + "input/compress1.txt", - Constants.TEST_DIR_PREFIX + "output/compress1.txt.gz"); + Constants.OUTPUT_DIR_PREFIX + "compress1.txt.gz"); compressor.setContext(context); compressor.compress(); StatusPrinter.print(context.getStatusManager()); assertEquals(0, context.getStatusManager().getCount()); - assertTrue(Compare.gzCompare(Constants.TEST_DIR_PREFIX - + "output/compress1.txt.gz", Constants.TEST_DIR_PREFIX + assertTrue(Compare.gzCompare(Constants.OUTPUT_DIR_PREFIX + + "compress1.txt.gz", Constants.TEST_DIR_PREFIX + "witness/compress1.txt.gz")); } public void test2() throws Exception { Compressor compressor = new Compressor(CompressionMode.GZ, Constants.TEST_DIR_PREFIX + "input/compress2.txt", - Constants.TEST_DIR_PREFIX + "output/compress2.txt"); + Constants.OUTPUT_DIR_PREFIX + "compress2.txt"); compressor.setContext(context); compressor.compress(); StatusPrinter.print(context.getStatusManager()); assertEquals(0, context.getStatusManager().getCount()); - assertTrue(Compare.gzCompare(Constants.TEST_DIR_PREFIX - + "output/compress2.txt.gz", Constants.TEST_DIR_PREFIX + assertTrue(Compare.gzCompare(Constants.OUTPUT_DIR_PREFIX + + "compress2.txt.gz", Constants.TEST_DIR_PREFIX + "witness/compress2.txt.gz")); } public void test3() throws Exception { Compressor compressor = new Compressor(CompressionMode.ZIP, Constants.TEST_DIR_PREFIX + "input/compress3.txt", - Constants.TEST_DIR_PREFIX + "output/compress3.txt"); + Constants.OUTPUT_DIR_PREFIX + "compress3.txt"); compressor.setContext(context); compressor.compress(); StatusPrinter.print(context.getStatusManager()); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java Mon Jul 28 23:42:22 2008 @@ -3,16 +3,7 @@ public class Constants { -// static { -// File f = new File(""); -// String path = ""; -// String absolute = f.getAbsolutePath(); -// if (!absolute.endsWith("logback-core")) { -// path = "logback-core/"; -// } -// TEST_DIR_PREFIX = path + "src/test/"; -// } - public static final String TEST_DIR_PREFIX = "src/test/"; - + public static final String OUTPUT_DIR_PREFIX = "target/test-output/"; + } Modified: logback/trunk/logback-examples/pom.xml ============================================================================== --- logback/trunk/logback-examples/pom.xml (original) +++ logback/trunk/logback-examples/pom.xml Mon Jul 28 23:42:22 2008 @@ -48,6 +48,11 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-ext</artifactId> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>compile</scope> Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Mon Jul 28 23:42:22 2008 @@ -55,6 +55,14 @@ developpers list. + <a href="http://jira.qos.ch/browse/LBCORE-32">LBCORE-32</a> + + + + <a href="http://jira.qos.ch/browse/LBCLASSIC-53">LBCLASSIC-53</a> + + + <hr width="80%" align="center" /> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Mon Jul 28 23:42:22 2008 @@ -36,7 +36,7 @@ <properties>  - <slf4j.version>1.5.2</slf4j.version> + <slf4j.version>1.5.3-SNAPSHOT</slf4j.version> <consolePlugin.version>1.1.0</consolePlugin.version> <retrotranslator.verify>false</retrotranslator.verify> </properties> @@ -78,7 +78,12 @@ <artifactId>log4j-over-slf4j</artifactId> <version>${slf4j.version}</version> </dependency> - + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-ext</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> <groupId>janino</groupId> <artifactId>janino</artifactId>

1 0

svn commit: r1725 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 28 Jul '08

28 Jul '08

Author: ceki Date: Mon Jul 28 23:19:41 2008 New Revision: 1725 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java Log: - stopwatch code migrated to slf4j Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java Mon Jul 28 23:19:41 2008 @@ -31,7 +31,6 @@ suite.addTest(ch.qos.logback.classic.db.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.spi.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.turbo.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.stopwatch.PackageTest.suite()); return suite; }

1 0

svn commit: r1724 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/stopwatch test/java/ch/qos/logback/classic/stopwatch
by noreply.ceki＠qos.ch 28 Jul '08

28 Jul '08

Author: ceki Date: Mon Jul 28 20:51:34 2008 New Revision: 1724 Removed: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/ Log: profiler code moved to slf4j

1 0

[JIRA] Commented: (LBCORE-42) add option to FileAppender to auto-create parent directories
by Rob Ross (JIRA) 27 Jul '08

27 Jul '08

[ http://jira.qos.ch/browse/LBCORE-42?page=com.atlassian.jira.plugin.system.i… ] Rob Ross commented on LBCORE-42: -------------------------------- I agree with the above. I just started using logback as a replacement for log4j, and this is the first big difference in behavior that I have found. Please implement this functionality in logback. Thanks! > add option to FileAppender to auto-create parent directories > ------------------------------------------------------------ > > Key: LBCORE-42 > URL: http://jira.qos.ch/browse/LBCORE-42 > Project: logback-core > Issue Type: Bug > Components: Appender > Affects Versions: unspecified > Environment: Operating System: Linux > Platform: PC > Reporter: Bruno Navert > Assignee: Logback dev list > > FileAppender should be able to automatically create parent directories as needed when writing the log file. > For instance, if configured with <File>/var/tmp/project_name/some_file.log</File>, and the new option set to true (suggest <CreateParentDirectories>true</CreateParentDirectories> maybe), then in FileAppender.setFile(), it should do > new File( fileName ).getParentFile().mkdirs() > workaround is to create the directory before initializing logback. Possible but far less than ideal, and rather complicated too -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

Mkdirs in FileAppender
by Lilianne E. Blaze 22 Jul '08

22 Jul '08

Hello, Could you please please consider adding the ability to create missing parent directories in FileAppender in Logback Core? Suppose I have the following: (tomcat home)/logs/ And I'd like for my webapp to automatically create a subdirectory, so after I run it I have: (tomcat home)/logs/my-webapp/my-webapp.log Right now if I just configure Logback to use the above path, it obviously fails, I have to create /my-webapp/ manually. The code to do it (at least the most basic version is trivial, just modify public synchronized void setFile() throws IOException { so it contains: closeWriter(); // modified code starts here if( mkdirs ) { File f = new File(fileName); File fParent = f.getParentFile(); if( !fParent.exists() ) { fParent.mkdirs(); } } // modified code ends here this.writer = createWriter(new FileOutputStream(fileName, append)); And obviously add mkdirs property and import java.io.File. Greetings, Lilianne E. Blaze

1 0

[JIRA] Resolved: (LBCORE-32) Specificy the config file to use as a System property
by Ceki Gulcu (JIRA) 18 Jul '08

18 Jul '08

[ http://jira.qos.ch/browse/LBCORE-32?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu resolved LBCORE-32. ------------------------------ Fix Version/s: 0.9.10 Resolution: Fixed Fixed in revision revision=1723. > Specificy the config file to use as a System property > ----------------------------------------------------- > > Key: LBCORE-32 > URL: http://jira.qos.ch/browse/LBCORE-32 > Project: logback-core > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: All > Platform: PC > Reporter: Ted Graham > Assignee: Logback dev list > Fix For: 0.9.10 > > Attachments: log-property-config.patch, log-property-config.patch > > > I'd like to be able to specify the logger config file to use as a System property, something like: > java -Dlogback.configuration=customConfig.xml > This is a much cleaner way of controlling the config than by messing with the classpath. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

[JIRA] Updated: (LBCORE-32) Specificy the config file to use as a System property
by Ceki Gulcu (JIRA) 18 Jul '08

18 Jul '08

[ http://jira.qos.ch/browse/LBCORE-32?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu updated LBCORE-32: ----------------------------- Comment: was deleted > Specificy the config file to use as a System property > ----------------------------------------------------- > > Key: LBCORE-32 > URL: http://jira.qos.ch/browse/LBCORE-32 > Project: logback-core > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: All > Platform: PC > Reporter: Ted Graham > Assignee: Logback dev list > Attachments: log-property-config.patch, log-property-config.patch > > > I'd like to be able to specify the logger config file to use as a System property, something like: > java -Dlogback.configuration=customConfig.xml > This is a much cleaner way of controlling the config than by messing with the classpath. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

svn commit: r1723 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/util test/input test/java/ch/qos/logback/classic/util test/resources
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 23:44:49 2008 New Revision: 1723 Added: logback/trunk/logback-classic/src/test/input/autoConfig.xml logback/trunk/logback-classic/src/test/resources/autoConfigAsResource.xml Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java Log: - Related to LBCORE-32 added support for passing the configuration file as a system property. The system property name is "logback.configurationFile". Values can be of type URL, a file, or a resource name. I am guessing that this modification should satisfy the requirements for most users who voted on this issue. I am not too keen on adding other config directives as system properties as suggested by M. Fowles. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Fri Jul 18 23:44:49 2008 @@ -1,5 +1,7 @@ package ch.qos.logback.classic.util; +import java.io.File; +import java.net.MalformedURLException; import java.net.URL; import ch.qos.logback.classic.BasicConfigurator; @@ -8,10 +10,18 @@ import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.util.Loader; +// contributors +// Ted Graham, Matt Fowles, see also http://jira.qos.ch/browse/LBCORE-32 +/** + * This class contains logback's logic for automatic configuration + * + * @author Ceki Gulcu + */ public class ContextInitializer { final public static String AUTOCONFIG_FILE = "logback.xml"; final public static String TEST_AUTOCONFIG_FILE = "logback-test.xml"; + final public static String CONFIG_FILE_PROPERTY = "logback.configurationFile"; public static void configureByResource(LoggerContext loggerContext, URL url) throws JoranException { @@ -23,13 +33,39 @@ configurator.doConfigure(url); } + static URL findConfigFileURLFromSystemProperties(ClassLoader classLoader) { + String logbackConfigFile = System.getProperty(CONFIG_FILE_PROPERTY, null); + if (logbackConfigFile != null) { + try { + return new URL(logbackConfigFile); + } catch (MalformedURLException e) { + // so, resource is not a URL: + // attempt to get the resource from the class path + URL urlAsResource = Loader.getResource(logbackConfigFile, classLoader); + if (urlAsResource != null) { + return urlAsResource; + } + File f = new File(logbackConfigFile); + if (f.exists() && f.isFile()) { + try { + return f.toURL(); + } catch (MalformedURLException e1) { + } + } + } + } + return null; + } + public static void autoConfig(LoggerContext loggerContext, ClassLoader classLoader) throws JoranException { - URL url = Loader.getResource(TEST_AUTOCONFIG_FILE, classLoader); + URL url = findConfigFileURLFromSystemProperties(classLoader); + if (url == null) { + url = Loader.getResource(TEST_AUTOCONFIG_FILE, classLoader); + } if (url == null) { url = Loader.getResource(AUTOCONFIG_FILE, classLoader); } - if (url != null) { configureByResource(loggerContext, url); } else { Added: logback/trunk/logback-classic/src/test/input/autoConfig.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/autoConfig.xml Fri Jul 18 23:44:49 2008 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<configuration> + + <appender name="AUTO_BY_SYSTEM_PROPERTY" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <pattern>%msg%n"</pattern> + </layout> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="AUTO_BY_SYSTEM_PROPERTY" /> + </root> +</configuration> Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java Fri Jul 18 23:44:49 2008 @@ -8,6 +8,7 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.core.Appender; import ch.qos.logback.core.ConsoleAppender; +import ch.qos.logback.core.joran.spi.JoranException; public class InitializationTest extends TestCase { @@ -23,6 +24,7 @@ protected void tearDown() throws Exception { super.tearDown(); + System.clearProperty(ContextInitializer.CONFIG_FILE_PROPERTY); } public void testAutoconfig() { @@ -42,6 +44,19 @@ Appender appender = root.getAppender("STDOUT"); assertNull(appender); } + } + public void testAutoConfigFromSystemProperties() throws JoranException { + doAutoConfigFromSystemProperties(TeztConstants.TEST_DIR_PREFIX + "input/autoConfig.xml"); + doAutoConfigFromSystemProperties("autoConfigAsResource.xml"); + // test passing a URL. note the relative path syntax with file:src/test/... + doAutoConfigFromSystemProperties("file:"+TeztConstants.TEST_DIR_PREFIX + "input/autoConfig.xml"); + } + public void doAutoConfigFromSystemProperties(String val) throws JoranException { + lc.shutdownAndReset(); + System.setProperty(ContextInitializer.CONFIG_FILE_PROPERTY, val); + ContextInitializer.autoConfig(lc); + Appender appender = root.getAppender("AUTO_BY_SYSTEM_PROPERTY"); + assertNotNull(appender); } } Added: logback/trunk/logback-classic/src/test/resources/autoConfigAsResource.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/resources/autoConfigAsResource.xml Fri Jul 18 23:44:49 2008 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<configuration> + + <appender name="AUTO_BY_SYSTEM_PROPERTY" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <pattern>%msg%n"</pattern> + </layout> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="AUTO_BY_SYSTEM_PROPERTY" /> + + </root> +</configuration>

1 0

svn commit: r1722 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 22:40:38 2008 New Revision: 1722 Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/XConfiguratorTestX.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Log: make turboDymanicFilter test part of the regular build Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Fri Jul 18 22:40:38 2008 @@ -9,6 +9,8 @@ */ package ch.qos.logback.classic.joran; +import org.slf4j.MDC; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -170,6 +172,30 @@ assertEquals("hello", back.getMessage()); } + public void testTurboDynamicThreshold() throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + LoggerContext loggerContext = new LoggerContext(); + jc.setContext(loggerContext); + jc.doConfigure(TeztConstants.TEST_DIR_PREFIX + "input/joran/turboDynamicThreshold.xml"); + + StatusPrinter.print(loggerContext.getStatusManager()); + + Logger logger = loggerContext.getLogger(this.getClass().getName()); + Logger root = loggerContext.getLogger(LoggerContext.ROOT_NAME); + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); + assertEquals(0, listAppender.list.size()); + + // this one should be denied + MDC.put("userId", "user1"); + logger.debug("hello user1"); + // this one should log + MDC.put("userId", "user2"); + logger.debug("hello user2"); + + assertEquals(1, listAppender.list.size()); + LoggingEvent le = (LoggingEvent) listAppender.list.get(0); + assertEquals("hello user2", le.getMessage()); + } public static Test suite() { TestSuite suite = new TestSuite();

1 0