October 2006 - logback-dev - mailman3.qos.ch

svn commit: r735 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/pattern test/java/ch/qos/logback/core/pattern/parser
by noreply.ceki＠qos.ch 21 Oct '06

21 Oct '06

Author: ceki Date: Sat Oct 21 18:42:37 2006 New Revision: 735 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/FormatInfoTest.java Log: Licensing fix Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java Sat Oct 21 18:42:37 2006 @@ -1,5 +1,5 @@ /** - * LOGBack: the reliable, fast and flexible logging library for Java. + * Logback: the generic, reliable, fast and flexible logging framework. * * Copyright (C) 1999-2006, QOS.ch * Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/FormatInfoTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/FormatInfoTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/FormatInfoTest.java Sat Oct 21 18:42:37 2006 @@ -1,3 +1,13 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + package ch.qos.logback.core.pattern.parser; import ch.qos.logback.core.pattern.FormatInfo; @@ -6,97 +16,95 @@ public class FormatInfoTest extends TestCase { - public void testEndingInDot() { - try { - FormatInfo.valueOf("45."); - fail("45. is not a valid format info string"); - } catch (IllegalArgumentException iae) { - // OK - } - } - - public void testBasic() { - { - FormatInfo fi = FormatInfo.valueOf("45"); - FormatInfo witness = new FormatInfo(); - witness.setMin(45); - assertEquals(witness, fi); - } - - { - FormatInfo fi = FormatInfo.valueOf("4.5"); - FormatInfo witness = new FormatInfo(); - witness.setMin(4); - witness.setMax(5); - assertEquals(witness, fi); - } - } - - - - public void testRightPad() { - { - FormatInfo fi = FormatInfo.valueOf("-40"); - FormatInfo witness = new FormatInfo(); - witness.setMin(40); - witness.setLeftPad(false); - assertEquals(witness, fi); - } - - { - FormatInfo fi = FormatInfo.valueOf("-12.5"); - FormatInfo witness = new FormatInfo(); - witness.setMin(12); - witness.setMax(5); - witness.setLeftPad(false); - assertEquals(witness, fi); - } - - { - FormatInfo fi = FormatInfo.valueOf("-14.-5"); - FormatInfo witness = new FormatInfo(); - witness.setMin(14); - witness.setMax(5); - witness.setLeftPad(false); - witness.setLeftTruncate(false); - assertEquals(witness, fi); - } - } - - public void testMinOnly() { - { - FormatInfo fi = FormatInfo.valueOf("49"); - FormatInfo witness = new FormatInfo(); - witness.setMin(49); - assertEquals(witness, fi); - } - - { - FormatInfo fi = FormatInfo.valueOf("-587"); - FormatInfo witness = new FormatInfo(); - witness.setMin(587); - witness.setLeftPad(false); - assertEquals(witness, fi); - } - - } - - public void testMaxOnly() { - { - FormatInfo fi = FormatInfo.valueOf(".49"); - FormatInfo witness = new FormatInfo(); - witness.setMax(49); - assertEquals(witness, fi); - } - - { - FormatInfo fi = FormatInfo.valueOf(".-5"); - FormatInfo witness = new FormatInfo(); - witness.setMax(5); - witness.setLeftTruncate(false); - assertEquals(witness, fi); - } - - } + public void testEndingInDot() { + try { + FormatInfo.valueOf("45."); + fail("45. is not a valid format info string"); + } catch (IllegalArgumentException iae) { + // OK + } + } + + public void testBasic() { + { + FormatInfo fi = FormatInfo.valueOf("45"); + FormatInfo witness = new FormatInfo(); + witness.setMin(45); + assertEquals(witness, fi); + } + + { + FormatInfo fi = FormatInfo.valueOf("4.5"); + FormatInfo witness = new FormatInfo(); + witness.setMin(4); + witness.setMax(5); + assertEquals(witness, fi); + } + } + + public void testRightPad() { + { + FormatInfo fi = FormatInfo.valueOf("-40"); + FormatInfo witness = new FormatInfo(); + witness.setMin(40); + witness.setLeftPad(false); + assertEquals(witness, fi); + } + + { + FormatInfo fi = FormatInfo.valueOf("-12.5"); + FormatInfo witness = new FormatInfo(); + witness.setMin(12); + witness.setMax(5); + witness.setLeftPad(false); + assertEquals(witness, fi); + } + + { + FormatInfo fi = FormatInfo.valueOf("-14.-5"); + FormatInfo witness = new FormatInfo(); + witness.setMin(14); + witness.setMax(5); + witness.setLeftPad(false); + witness.setLeftTruncate(false); + assertEquals(witness, fi); + } + } + + public void testMinOnly() { + { + FormatInfo fi = FormatInfo.valueOf("49"); + FormatInfo witness = new FormatInfo(); + witness.setMin(49); + assertEquals(witness, fi); + } + + { + FormatInfo fi = FormatInfo.valueOf("-587"); + FormatInfo witness = new FormatInfo(); + witness.setMin(587); + witness.setLeftPad(false); + assertEquals(witness, fi); + } + + } + + public void testMaxOnly() { + { + FormatInfo fi = FormatInfo.valueOf(".49"); + FormatInfo witness = new FormatInfo(); + witness.setMax(49); + assertEquals(witness, fi); + } + + { + FormatInfo fi = FormatInfo.valueOf(".-5"); + FormatInfo witness = new FormatInfo(); + witness.setMax(5); + witness.setLeftTruncate(false); + assertEquals(witness, fi); + } + + } } \ No newline at end of file

1 0

svn commit: r734 - in logback/trunk: logback-classic/examples/src/chapter5 logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 20 Oct '06

20 Oct '06

Author: seb Date: Fri Oct 20 18:42:32 2006 New Revision: 734 Modified: logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: Work in progress - Removed mentions of DATE and ABSOLUTE keywords - Added truncation examples - Added %ex examples - other fixes... Modified: logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml ============================================================================== --- logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml (original) +++ logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml Fri Oct 20 18:42:32 2006 @@ -8,7 +8,7 @@ class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> <param name="Pattern" - value="%-4relative [%thread] %-5level - %msg %caller{2, DISPLAY_CALLER_EVAL}%n" /> + value="%-4relative [%thread] %-5level - %msg%n %caller{2, DISPLAY_CALLER_EVAL}" /> </layout> </appender> Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Fri Oct 20 18:42:32 2006 @@ -274,25 +274,40 @@ date{pattern} </td> <td> - - Used to output the date of the logging event. - The date conversion word may be followed by - a set of braces containing a date and time - pattern strings used by - <code>java.text.SimpleDateFormat</code>, - ABSOLUTE, DATE or - ISO8601 can also be used. - - Tableau 2 colonnes, pattern -> result, date fixée. - - For example, - %d{HH:mm:ss,SSS}, - - %d{dd MMM yyyy ;HH:mm:ss,SSS} - - or %d{DATE}. If no date format specifier is given then - ISO8601 format is assumed. Reprendre du texte du livre. - + Used to output the date of the logging event. + The date conversion word may be followed by an option + enclosed between braces. + The option admits the same syntax as the time pattern + string of the <code>java.text.SimpleDateFormat</code>. + A shortcut to the ISO8601 format is available by + specifying ISO8601 in the braces. If no option is set, + the converter uses ISO8601 as a default value. + Here are some sample option values. They assume + that the actual date is Friday 20th of October, 2006 and that + the reader finished her meal a short while ago. + + <table BORDER="1" CELLPADDING="8"> + <tr> + <th>Conversion Pattern</th> + <th>Result</th> + </tr> + <tr> + <td>%date</td> + <td>2006-10-20 14:46:49,812</td> + </tr> + <tr> + <td>%date{ISO8601}</td> + <td>2006-10-20 14:46:49,812</td> + </tr> + <tr> + <td>%date{HH:mm:ss.SSS}</td> + <td>14:46:49.812</td> + </tr> + <tr> + <td>%date{dd MMM yyyy ;HH:mm:ss.SSS}</td> + <td>20 oct. 2006;14:46:49.812 </td> + </tr> + </table> </td> </tr> @@ -307,10 +322,9 @@ request was issued. - WARNING - Generating caller file information is extremely - slow. Its use should be avoided unless execution - speed is not an issue. + Generating the file information is not particularly fast. + Thus, it's use should be avoided unless + execution speed is not an issue. </td> </tr> @@ -375,10 +389,9 @@ logging request was issued. - WARNING - Generating caller location information is - extremely slow. It's use should be avoided - unless execution speed is not an issue. + Generating the line number information is not particularly fast. + Thus, it's use should be avoided unless + execution speed is not an issue. </td> </tr> @@ -405,10 +418,9 @@ request was issued. - WARNING - Generating caller location information is - extremely slow. It's use should be avoided - unless execution speed is not an issue. + Generating the method name is not particularly fast. + Thus, it's use should be avoided unless + execution speed is not an issue. </td> </tr> @@ -507,7 +519,8 @@ </tr> <tr> <td align="center"> - ex / throwable + ex{length} + throwable{length} </td> <td> @@ -516,20 +529,55 @@ with the logging event, if any. By default the full stack trace will be output. - If - throwable conversion word is followed by an - option in the form - %throwable{short} - which will only output the first line of the - ThrowableInformation. - + The throwable conversion word can followed by one of + the following options:$ + + <ul> + short: prints the first line of the stack trace + full: prints the full stack trace + Any integer: prints the given number of lines of the stack trace + </ul> + + Here are some examples: + + <table BORDER="1" CELLPADDING="8"> + <tr> + <th>Conversion Pattern</th> + <th>Result</th> + </tr> + <tr> + <td>%ex</td> + <td><pre>mainPackage.foo.bar.TestException: Houston we have a problem + at mainPackage.foo.bar.TestThrower.fire(TestThrower.java:22) + at mainPackage.foo.bar.TestThrower.readyToLaunch(TestThrower.java:17) + at mainPackage.ExceptionLauncher.main(ExceptionLauncher.java:38)</pre></td> + </tr> + <tr> + <td>%ex{short}</td> + <td><pre>mainPackage.foo.bar.TestException: Houston we have a problem + at mainPackage.foo.bar.TestThrower.fire(TestThrower.java:22)</pre></td> + </tr> + <tr> + <td>%ex{full}</td> + <td><pre>mainPackage.foo.bar.TestException: Houston we have a problem + at mainPackage.foo.bar.TestThrower.fire(TestThrower.java:22) + at mainPackage.foo.bar.TestThrower.readyToLaunch(TestThrower.java:17) + at mainPackage.ExceptionLauncher.main(ExceptionLauncher.java:38)</pre></td> + </tr> + <tr> + <td>%ex{2}</td> + <td><pre>mainPackage.foo.bar.TestException: Houston we have a problem + at mainPackage.foo.bar.TestThrower.fire(TestThrower.java:22) + at mainPackage.foo.bar.TestThrower.readyToLaunch(TestThrower.java:17)</pre></td> + </tr> + </table> This conversion word can also use evaluators to test logging events against a given criteria before creating the output. For example, using %ex{full, EX_DISPLAY_EVAL} will display the full stacktrace of the exception, only if the evaluator called EX_DISPLAY_EVAL - returns a negative answer. This behaviour comes from the fact that + returns a negative answer. This behaviour is justified by the fact that throwable data is generally displayed unless the evaluator would return a positive value. Evaluators are described further down this document. @@ -579,15 +627,21 @@ modifier which is designated by a period followed by a decimal constant. If the data item is longer than the maximum field, then the extra characters are removed from - the - beginning - of the data item and not from the end. For example, it the + the beginning + of the data item. For example, if the maximum field width is eight and the data item is ten characters long, then the first two characters of the data item are dropped. This behavior deviates from the printf function in C where truncation is done from the end. + Truncation from the end is possible by appending a minus + character right after the period. In that case, if the + maximum field width is eight and the data item is ten + characters long, then the last two characters of the data + item are dropped. + + Below are various format modifier examples for the logger conversion specifier. @@ -600,7 +654,7 @@ <th>Comment</th> <tr> - <td align="center">%20l</td> + <td align="center">%20logger</td> <td align="center">false</td> <td align="center">20</td> <td align="center">none</td> @@ -610,7 +664,7 @@ </td> </tr> <tr> - <td align="center">%-20l</td> + <td align="center">%-20logger</td> <td align="center">true</td> <td align="center">20</td> <td align="center">none</td> @@ -620,7 +674,7 @@ </td> </tr> <tr> - <td align="center">%.30l</td> + <td align="center">%.30logger</td> <td align="center">NA</td> <td align="center">none</td> <td align="center">30</td> @@ -630,7 +684,7 @@ </td> </tr> <tr> - <td align="center">%20.30l</td> + <td align="center">%20.30logger</td> <td align="center">false</td> <td align="center">20</td> <td align="center">30</td> @@ -642,7 +696,7 @@ </td> </tr> <tr> - <td align="center">%-20.30l</td> + <td align="center">%-20.30logger</td> <td align="center">true</td> <td align="center">20</td> <td align="center">30</td> @@ -653,8 +707,46 @@ beginning. </td> </tr> + <tr> + <td align="center">%.-30logger</td> + <td align="center">NA</td> + <td align="center">none</td> + <td align="center">30</td> + <td> + Truncate from the end if the logger name is + longer than 30 characters. + </td> + </tr> </table> + + Here are some examples of the format modifier truncation: + + <table BORDER="1" CELLPADDING="8"> + <th>Format modifier</th> + <th>Logger name</th> + <th>Result</th> + <tr> + <td align="center">[%-20.20logger]</td> + <td align="center">main.Name</td> + <td align="center"><pre>[main.Name ]</pre></td> + </tr> + <tr> + <td align="center">[%20.-20logger]</td> + <td align="center">main.Name</td> + <td align="center"><pre>[ main.Name]</pre></td> + </tr> + <tr> + <td align="center">[%-10.10logger]</td> + <td align="center">main.foo.foo.bar.Name</td> + <td align="center"><pre>[o.bar.Name]</pre></td> + </tr> + <tr> + <td align="center">[%10.-10logger]</td> + <td align="center">main.foo.foo.bar.Name</td> + <td align="center"><pre>[main.foo.f]</pre></td> + </tr> + </table> <h3>Option handling</h3> @@ -663,8 +755,7 @@ braces. We have already seen some of the possibilities offered by logback's option handling with, for example, the MDC conversion specifier: - %mdc{someKey} - . + %mdc{someKey}. However, there is more to it than that. @@ -692,7 +783,7 @@ message and caller data. - Since displaying the caller data of a logging event is very + Since displaying the caller data of a logging event is rather expensive, this information will be displayed only when the logging request comes from a specific logger, and whose message contains a certain string. By doing that, we make @@ -717,7 +808,7 @@ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> - <param name="Pattern" value="%-4relative [%thread] %-5level - %msg \ + <param name="Pattern" value="%-4relative [%thread] %-5level - %msg%n \ %caller{2, DISP_CALLER_EVAL}%n" /> </layout> </appender>

1 0

svn commit: r733 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core
by noreply.ceki＠qos.ch 20 Oct '06

20 Oct '06

Author: ceki Date: Fri Oct 20 17:29:29 2006 New Revision: 733 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java Log: We no longer need to mess with DATE, ABSOLUTE as SimpleDateFormat does a good job. Just remove these string constants from the docs (and not reintroduce them in the java code.) Sorry, this was my mistake. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java Fri Oct 20 17:29:29 2006 @@ -16,12 +16,6 @@ */ public static final String PATTERN_RULE_REGISTRY = "PATTERN_RULE_REGISTRY"; - public static final String ABSOLUTE_FORMAT = "ABSOLUTE"; - public static final String ABSOLUTE_PATTERN = "HH:mm:ss,SSS"; - - public static final String DATE_AND_TIME_FORMAT = "DATE"; - public static final String DATE_AND_TIME_PATTERN = "dd MMM yyyy HH:mm:ss,SSS"; - public static final String ISO8601_STR = "ISO8601"; public static final String ISO8601_PATTERN = "yyyy-MM-dd HH:mm:ss,SSS";

1 0

svn commit: r732 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern
by noreply.ceki＠qos.ch 20 Oct '06

20 Oct '06

Author: ceki Date: Fri Oct 20 17:29:14 2006 New Revision: 732 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java Log: We no longer need to mess with DATE, ABSOLUTE as SimpleDateFormat does a good job. Just remove these string constants from the docs (and not reintroduce them in the java code.) Sorry, this was my mistake. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java Fri Oct 20 17:29:14 2006 @@ -32,13 +32,9 @@ datePattern = CoreGlobal.CLF_DATE_PATTERN; } - if (datePattern.equals(CoreGlobal.ISO8601_FORMAT)) { + if (datePattern.equals(CoreGlobal.ISO8601_STR)) { datePattern = CoreGlobal.ISO8601_PATTERN; - } else if (datePattern.equals(CoreGlobal.DATE_AND_TIME_FORMAT)) { - datePattern = CoreGlobal.DATE_AND_TIME_PATTERN; - } else if (datePattern.equals(CoreGlobal.ABSOLUTE_FORMAT)) { - datePattern = CoreGlobal.ABSOLUTE_PATTERN; - } + } try { simpleFormat = new SimpleDateFormat(datePattern);

1 0

svn commit: r731 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay
by noreply.ceki＠qos.ch 20 Oct '06

20 Oct '06

Author: ceki Date: Fri Oct 20 17:27:35 2006 New Revision: 731 Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitAction.java Log: FruitAction is never used.

1 0

svn commit: r730 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender
by noreply.ceki＠qos.ch 20 Oct '06

20 Oct '06

Author: ceki Date: Fri Oct 20 17:26:56 2006 New Revision: 730 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/PackageTest.java Log: minor Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/PackageTest.java Fri Oct 20 17:26:56 2006 @@ -1,6 +1,14 @@ -package ch.qos.logback.core.appender; - +/** + * Logback: the generic, reliable, fast and flexible logging framework for Java. + * + * Copyright (C) 2000-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.core.appender; import junit.framework.Test; import junit.framework.TestCase; @@ -8,7 +16,7 @@ public class PackageTest extends TestCase { - public static Test suite() { + public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(DummyAppenderTest.class); suite.addTestSuite(ConsoleAppenderTest.class);

1 0

svn commit: r729 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran
by noreply.ceki＠qos.ch 20 Oct '06

20 Oct '06

Author: ceki Date: Fri Oct 20 17:26:31 2006 New Revision: 729 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Log: minor change Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Fri Oct 20 17:26:31 2006 @@ -1,3 +1,13 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework for Java. + * + * Copyright (C) 2000-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + package ch.qos.logback.core.joran; import java.util.HashMap;

1 0

svn commit: r728 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 20 Oct '06

20 Oct '06

Author: ceki Date: Fri Oct 20 17:26:05 2006 New Revision: 728 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java Log: slighltly better error reporting Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java Fri Oct 20 17:26:05 2006 @@ -107,9 +107,8 @@ ec.pushObject(actionData.nestedComponent); } catch (Exception oops) { actionData.inError = true; - - String msg = "Could not create component <" + localName + ">."; - addError(msg); + String msg = "Could not create component <" + localName + "> of type ["+className+"]"; + addError(msg, oops); } }

1 0

svn commit: r727 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core
by noreply.ceki＠qos.ch 20 Oct '06

20 Oct '06

Author: ceki Date: Fri Oct 20 17:25:25 2006 New Revision: 727 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java Log: change of name... Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java Fri Oct 20 17:25:25 2006 @@ -22,7 +22,7 @@ public static final String DATE_AND_TIME_FORMAT = "DATE"; public static final String DATE_AND_TIME_PATTERN = "dd MMM yyyy HH:mm:ss,SSS"; - public static final String ISO8601_FORMAT = "ISO8601"; + public static final String ISO8601_STR = "ISO8601"; public static final String ISO8601_PATTERN = "yyyy-MM-dd HH:mm:ss,SSS"; /**

1 0

svn commit: r726 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern
by noreply.ceki＠qos.ch 20 Oct '06

20 Oct '06

Author: ceki Date: Fri Oct 20 17:25:05 2006 New Revision: 726 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java Log: We no longer need to mess with DATE, ABSOLUTE as SimpleDateFormat does a good job. Just remove these string constants from the docs (and not reintroduce them in the java code.) Sorry, this was my mistake. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java Fri Oct 20 17:25:05 2006 @@ -31,13 +31,9 @@ datePattern = CoreGlobal.ISO8601_PATTERN; } - if (datePattern.equals(CoreGlobal.ISO8601_FORMAT)) { + if (datePattern.equals(CoreGlobal.ISO8601_STR)) { datePattern = CoreGlobal.ISO8601_PATTERN; - } else if (datePattern.equals(CoreGlobal.DATE_AND_TIME_FORMAT)) { - datePattern = CoreGlobal.DATE_AND_TIME_PATTERN; - } else if (datePattern.equals(CoreGlobal.ABSOLUTE_FORMAT)) { - datePattern = CoreGlobal.ABSOLUTE_PATTERN; - } + } try { simpleFormat = new SimpleDateFormat(datePattern);

1 0