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

svn commit: r725 - logback/trunk/logback-skin/src/main/resources/css
by noreply.seb＠qos.ch 20 Oct '06

20 Oct '06

Author: seb Date: Fri Oct 20 15:46:00 2006 New Revision: 725 Modified: logback/trunk/logback-skin/src/main/resources/css/print.css Log: The end of css war (hopefully): this should be the killer way of displaying code correctly in all browsers and their print-preview Modified: logback/trunk/logback-skin/src/main/resources/css/print.css ============================================================================== --- logback/trunk/logback-skin/src/main/resources/css/print.css (original) +++ logback/trunk/logback-skin/src/main/resources/css/print.css Fri Oct 20 15:46:00 2006 @@ -20,6 +20,14 @@ margin-left: 0px; /*was: 197*/ } +pre { + white-space: pre-wrap; /* css-3 */ + white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + word-wrap: break-word; /* Internet Explorer 5.5+ */ +} + table.bodyTable td { vertical-align: text-top; }

1 0

svn commit: r724 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/pattern logback-classic/src/main/java/ch/qos/logback/classic/pattern logback-core/src/main/java/ch/qos/logback/core
by noreply.seb＠qos.ch 20 Oct '06

20 Oct '06

Author: seb Date: Fri Oct 20 14:55:02 2006 New Revision: 724 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java Log: Added support for DATE, ABSOLUTE and ISO8601 patterns in DateConverter. Updated classic and access module' implementations of DateConverter.java 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 14:55:02 2006 @@ -32,6 +32,13 @@ datePattern = CoreGlobal.CLF_DATE_PATTERN; } + if (datePattern.equals(CoreGlobal.ISO8601_FORMAT)) { + 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); 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 14:55:02 2006 @@ -19,7 +19,7 @@ public class DateConverter extends ClassicConverter { - + long lastTimestamp = -1; String timesmapStr = null; SimpleDateFormat simpleFormat = null; @@ -31,6 +31,13 @@ datePattern = CoreGlobal.ISO8601_PATTERN; } + if (datePattern.equals(CoreGlobal.ISO8601_FORMAT)) { + 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); 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 14:55:02 2006 @@ -15,7 +15,15 @@ * {@link Context} object store. */ public static final String PATTERN_RULE_REGISTRY = "PATTERN_RULE_REGISTRY"; - public static final String ISO8601_PATTERN = "yyyy-MM-dd HH:mm:ss,SSS"; + + 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_FORMAT = "ISO8601"; + public static final String ISO8601_PATTERN = "yyyy-MM-dd HH:mm:ss,SSS"; /** * Time format used in Common Log Format

1 0

svn commit: r723 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/joran/action test/java/ch/qos/logback/core/joran 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 10:06:19 2006 New Revision: 723 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java - copied, changed from r722, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/NOPAction.java Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/NOPAction.java Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java Log: Moved NOPAction to main/ instead of test/ as it is comes handy in contexts other than tests. Copied: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java (from r722, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/NOPAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/NOPAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NOPAction.java Fri Oct 20 10:06:19 2006 @@ -1,14 +1,14 @@ /** - * LOGBack: the generic, reliable, fast and flexible logging framework. + * Logback: the generic, reliable, fast and flexible logging framework for Java. * - * Copyright (C) 1999-2006, QOS.ch + * 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; +package ch.qos.logback.core.joran.action; import org.xml.sax.Attributes; @@ -16,10 +16,10 @@ import ch.qos.logback.core.joran.spi.ExecutionContext; - - /** * No operation (NOP) action that does strictly nothing. + * Setting a rule to this pattern is sometimes useful in order + * to prevent implicit actions to kick in. * * @author Ceki Gülcü */ Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java Fri Oct 20 10:06:19 2006 @@ -23,6 +23,7 @@ import ch.qos.logback.core.joran.action.BadBeginAction; import ch.qos.logback.core.joran.action.BadEndAction; import ch.qos.logback.core.joran.action.HelloAction; +import ch.qos.logback.core.joran.action.NOPAction; import ch.qos.logback.core.joran.action.TouchAction; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.util.Constants; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java Fri Oct 20 10:06:19 2006 @@ -4,7 +4,7 @@ import java.util.List; import junit.framework.TestCase; -import ch.qos.logback.core.joran.NOPAction; +import ch.qos.logback.core.joran.action.NOPAction; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.util.Constants; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java Fri Oct 20 10:06:19 2006 @@ -12,7 +12,7 @@ import java.util.List; import ch.qos.logback.core.joran.GenericConfigurator; -import ch.qos.logback.core.joran.NOPAction; +import ch.qos.logback.core.joran.action.NOPAction; import ch.qos.logback.core.joran.action.NestedComponentIA; import ch.qos.logback.core.joran.action.NestedSimplePropertyIA; import ch.qos.logback.core.joran.event.SaxEvent;

1 0

svn commit: r722 - in logback/trunk/logback-site/src/site: resources xdocTemplates
by noreply.seb＠qos.ch 19 Oct '06

19 Oct '06

Author: seb Date: Thu Oct 19 20:55:01 2006 New Revision: 722 Added: logback/trunk/logback-site/src/site/resources/ logback/trunk/logback-site/src/site/resources/10reasons.ppt (contents, props changed) Removed: logback/trunk/logback-site/src/site/xdocTemplates/10reasons.ppt Log: moved 10reasons.ppt Added: logback/trunk/logback-site/src/site/resources/10reasons.ppt ============================================================================== Binary file. No diff available.

1 0

svn commit: r721 - logback/trunk/logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 19 Oct '06

19 Oct '06

Author: seb Date: Thu Oct 19 20:46:24 2006 New Revision: 721 Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: Some more modifications 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 Thu Oct 19 20:46:24 2006 @@ -53,21 +53,19 @@ layouts have nothing to do with large estates in Florida. The <code>format()</code> - method in the Layout class takes a object that represents - the logging event and returns a String. A synopsis of the + method in the Layout class takes an object that represents + an event (of any type) and returns a String. A synopsis of the Layout interface is shown below. </p> <div class="source"><pre>public interface Layout extends ContextAware, LifeCycle { - String doLayout(Object event); + String doLayout(Object event); String getHeader(); - String getFooter(); - String getContentType(); }</pre></div> <p> - This interface is really simple and yet is sufficent for + This interface is rather simple and yet is sufficent for many formatting needs. </p> @@ -76,26 +74,15 @@ <h2>Logback classic</h2> <p> - As we've seen, a Layout implementation takes as a parameter - an object that represents a logging event. The typing of the - parameter to - <code>Object</code> - is because logging events may have different ways of being - designed. In logback classic, a logging event is represented - by the - <code>ch.qos.logback.classic.LoggingEvent</code> - class. Therefore, all layouts in logback classic implement a - sub-interface of - <code>Layout</code> - named - <code>ClassicLayout</code> - . + Logback classic only processes events of type + <code>ch.qos.logback.classic.LoggingEvent</code>. + Therefore, classic extends <code>Layout</code> + to accept only <code>LoggingEvent</code> objects. </p> <p> - Here is what a - <code>ClassicLayout</code> - looks like: + The extending interface is called + <code>ClassicLayout</code>, as shown below. </p> <div class="source"><pre>public interface ClassicLayout extends Layout { @@ -107,14 +94,16 @@ <h3>PatternLayout</h3> <p> - Logback ships with a flexible layout called - <code>PatternLayout</code> - . As all classic layouts, + Logback classic ships with a flexible layout called + <code>PatternLayout</code>, which implements the + <code>ClassicLayout</code> interface. + As all classic layouts, <code>PatternLayout</code> + takes a logging event and returns a String. However, the returned String can be modified at will by tweaking its conversion pattern. - </p> + </p> <p> The conversion pattern of <code>PatternLayout</code> @@ -125,7 +114,8 @@ called conversion specifiers. You are free to insert any literal text within the conversion pattern. Each conversion specifier starts with a percent sign (%) and is followed by - optional format modifiers and a conversion word. The + optional format modifiers, a conversion word and optional + parameters between braces. The conversion word controls the type of data to use, e.g. logger name, level, date, thread name. The format modifiers control such things as field width, padding, and left or @@ -157,15 +147,15 @@ }</pre></div> <p> - The conversion pattern is set to be <em>%-5level [%thread]: - %message%n</em>. Running PatternSample will yield the following + The conversion pattern is set to be <b>"%-5level [%thread]: + %message%n"</b>. Running PatternSample will yield the following output on the console. </p> <div class="source"><pre>DEBUG [main]: Message 1 WARN [main]: Message 2</pre></div> <p> - Note that in the conversion pattern <em>%-5level [%thread]: - %message%n</em> there is no explicit separator between literal + Note that in the conversion pattern <b>"%-5level [%thread]: + %message%n"</b> there is no explicit separator between literal text and conversion specifiers. When parsing a conversion pattern, <code>PatternLayout</code> @@ -177,43 +167,53 @@ will be explained in a short moment. </p> <p> - Some conversion words can handle options. These are informations - added to the conversion word between braces. A sample conversion - word with options could be <em>%word{option}</em>. The options that - are specific to a conversion word will be explained shortly, along with - the conversion word's definition. + As mentionned previously, certain conversion specifiers can include + optional parameters which are declared + between braces following the conversion word. A sample conversion + specifier with options could be <em>%logger{10}</em>. + </p> + + <p>The recognized conversions words along with their options are + described below. When multiple conversion words are listed on the left + column, they should be considered as aliases. </p> + <table border="1" CELLPADDING="8"> <th>Conversion Word</th> <th>Effect</th> <tr> <td align="center"> - <b>c / l / lo / logger</b> + <b>c</b>{<em>length</em>} <br /> + <b>l</b>{<em>length</em>} <br /> + <b>lo</b>{<em>length</em>} <br /> + <b>logger</b>{<em>length</em>} <br /> </td> <td> <p> - Used to output the logger of the logging event. + Used to output the logger name of the logging event. </p> <p> The logger name conversion word can take an - integer as a first option. This will use - logback's abbreviation mechanism to display a - shorter logger name, without loosing it's - meaning. + integer as a first option. The + converter's abbreviation algorithm will shorten the logger name + without significant loss of meaning. </p> <p>The next table should clear things up.</p> <table BORDER="1" CELLPADDING="8"> - <tr> <th>Conversion Pattern</th> <th>Logger name</th> <th>Result</th> </tr> - + <tr> + <td>%logger</td> + <td>mainPackage.sub.sample.Bar</td> + <td>mainPackage.sub.sample.Bar</td> + </tr> <tr> <td>%logger{10}</td> <td>mainPackage.sub.sample.Bar</td> @@ -242,7 +242,8 @@ </tr> <tr> <td align="center"> - <b>C / class</b> + <b>C</b>{<em>length</em>} <br /> + <b>class</b>{<em>length</em>} <br /> </td> <td> @@ -251,18 +252,16 @@ the caller issuing the logging request. </p> <p> - Just like the previous conversion word, this + Just like the <em>logger</em> conversion word, this word can take an interger as it's first option - and use logback's abbreviation mechanisme to - shorten its output. + and use its abbreviation algorithm to + shorten the class name. </p> <p> - By default the class name is output in fully - qualified form. + By default the class name is output in full. </p> <p> - <b>WARNING</b> - Generating the caller class information is slow. + Generating the caller class information is not particularly fast. Thus, it's use should be avoided unless execution speed is not an issue. </p> @@ -271,34 +270,28 @@ <tr> <td align="center"> - <b>d / date</b> + <b>d</b>{<em>pattern</em>} <br /> + <b>date</b>{<em>pattern</em>} <br /> </td> <td> <p> Used to output the date of the logging event. - The date conversion specifier may be followed by + 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> - . - <em>ABSOLUTE</em> - , - <em>DATE</em> - or - <em>ISO8601</em> - can also be used. + <code>java.text.SimpleDateFormat</code>, + <em>ABSOLUTE</em>, <em>DATE</em> or + <em>ISO8601</em> can also be used. </p> + <b>Tableau 2 colonnes, pattern -> result, date fixée.</b> <p> - For example, - <b>%d{HH:mm:ss,SSS}</b> - , + For example, + <b>%d{HH:mm:ss,SSS}</b>, <b> %d{dd MMM yyyy ;HH:mm:ss,SSS} </b> - or - <b>%d{DATE}</b> - . If no date format specifier is given then - ISO8601 format is assumed. + or <b>%d{DATE}</b>. If no date format specifier is given then + ISO8601 format is assumed. <b>Reprendre du texte du livre.</b> </p> </td> </tr> @@ -362,20 +355,12 @@ using <b>%caller{3, CALLER_DISPLAY_EVAL}</b> will display three lines of stacktrace, only if the evaluator called <em>CALLER_DISPLAY_EVAL</em> returns a <b>positive</b> answer. - This behaviour comes from the fact that displaying - caller data is very expensive, and one should generally not display it - unless the evaluator would return a positive value. + This behaviour is justified by the fact that displaying + caller data is rather expensive, and one should generally not want to display it. </p> <p>Evaluators are described further down this document. </p> - <p> - The location information can be very useful. - However, it's generation is - <em>extremely</em> - slow. It's use should be avoided unless - execution speed is not an issue. - </p> </td> </tr> @@ -484,7 +469,8 @@ <tr> <td align="center"> - <b>X / mdc</b> + <b>X</b>{<em>key</em>} <br /> + <b>mdc</b>{<em>key</em>} <br /> </td> <td> @@ -495,21 +481,17 @@ generated the logging event. </p> <p> - The - <b>X</b> - conversion word can be followed by the key - for the map placed between braces, as in - <b>%X{clientNumber}</b> - where - <code>clientNumber</code> - is the key. The value in the MDC corresponding + If + <b>mdc</b> + conversion word is followed by a key + between braces, as in <b>%mdc{clientNumber}</b>, + then the value in the MDC corresponding to the key will be output. </p> <p> - If no additional sub-option is specified, then - the entire contents of the MDC key value pair - set is output using a format key1=val1, - key2=val2. + If no option is given, then + the entire content of the MDC will be output in the format + "key1=val1, key2=val2". </p> <p> @@ -530,13 +512,12 @@ <td> <p> - Used to output the Throwable trace that has been - bound to the LoggingEvent, by default this will - output the full trace as one would normally find - by a call to Throwable.printStackTrace(). + Used to output the stack trace of the exception associated + with the logging event, if any. By default the full stack trace + will be output. </p> - <p>The - throwable conversion word can be followed by an + <p>If + <em>throwable</em> conversion word is followed by an option in the form <b>%throwable{short}</b> which will only output the first line of the

1 0

svn commit: r720 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.ceki＠qos.ch 19 Oct '06

19 Oct '06

Author: ceki Date: Thu Oct 19 20:46:24 2006 New Revision: 720 Added: logback/trunk/logback-site/src/site/xdocTemplates/10reasons.ppt (contents, props changed) Log: ongoing work Added: logback/trunk/logback-site/src/site/xdocTemplates/10reasons.ppt ============================================================================== Binary file. No diff available.

1 0

svn commit: r719 - logback/trunk/logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 19 Oct '06

19 Oct '06

Author: seb Date: Thu Oct 19 17:57:36 2006 New Revision: 719 Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: work in progress... 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 Thu Oct 19 17:57:36 2006 @@ -57,8 +57,7 @@ the logging event and returns a String. A synopsis of the Layout interface is shown below. </p> - <div class="source">public interface Layout extends ContextAware, LifeCycle { - + <div class="source"><pre>public interface Layout extends ContextAware, LifeCycle { String doLayout(Object event); String getHeader(); @@ -66,7 +65,7 @@ String getFooter(); String getContentType(); -}</div> +}</pre></div> <p> This interface is really simple and yet is sufficent for many formatting needs. @@ -99,11 +98,11 @@ looks like: </p> - <div class="source">public interface ClassicLayout extends Layout { + <div class="source"><pre>public interface ClassicLayout extends Layout { String doLayout(LoggingEvent event); -}</div> +}</pre></div> <h3>PatternLayout</h3> @@ -136,7 +135,7 @@ Example 5.1: Sample usage of a PatternLayout (examples/chapter5/PatternSample.java) </em> - <div class="source">public class PatternSample { + <div class="source"><pre>public class PatternSample { static public void main(String[] args) throws Exception { Logger rootLogger = (Logger) @@ -155,15 +154,15 @@ rootLogger.debug("Message 1"); rootLogger.warn("Message 2"); } -}</div> +}</pre></div> <p> The conversion pattern is set to be <em>%-5level [%thread]: %message%n</em>. Running PatternSample will yield the following output on the console. </p> - <div class="source">DEBUG [main]: Message 1 -WARN [main]: Message 2</div> + <div class="source"><pre>DEBUG [main]: Message 1 +WARN [main]: Message 2</pre></div> <p> Note that in the conversion pattern <em>%-5level [%thread]: %message%n</em> there is no explicit separator between literal @@ -348,14 +347,14 @@ </p> <p>For example, <b>%caller{2}</b> would display the following excerpt:</p> -<div class="source">0 [main] DEBUG - logging statement Caller+0 \ +<div class="source"><pre>0 [main] DEBUG - logging statement Caller+0 \ at mainPackage.sub.sample.Bar.sampleMethodName(Bar.java:22) -Caller+1 at mainPackage.sub.sample.Bar.createLoggingRequest(Bar.java:17)</div> +Caller+1 at mainPackage.sub.sample.Bar.createLoggingRequest(Bar.java:17)</pre></div> <p>And <b>%caller{3}</b> would display this other excerpt:</p> -<div class="source">16 [main] DEBUG - logging statement Caller+0 \ +<div class="source"><pre>16 [main] DEBUG - logging statement Caller+0 \ at mainPackage.sub.sample.Bar.sampleMethodName(Bar.java:22) Caller+1 at mainPackage.sub.sample.Bar.createLoggingRequest(Bar.java:17) -Caller+2 at mainPackage.ConfigTester.main(ConfigTester.java:38)</div> +Caller+2 at mainPackage.ConfigTester.main(ConfigTester.java:38)</pre></div> <p> This conversion word can also use evaluators to test logging events @@ -729,7 +728,7 @@ Example 5.2: Sample usage of EventEvaluators (examples/chapter5/callerEvaluatorConfig.xml) </em> - <div class="source"><configuration> + <div class="source"><pre><configuration> <b><evaluator name="DISP_CALLER_EVAL"> <Expression>logger.getName().contains("chapter5") &amp;&amp; \ message.contains("stacktrace")</Expression> @@ -746,7 +745,7 @@ <level value="debug" /> <appender-ref ref="STDOUT" /> </root> -</configuration></div> +</configuration></pre></div> <p>Please note that the & value cannot be written like one would do in a java class, because of XML format encoding.</p> <p>Let's test this configuration with the following code.</p> @@ -754,7 +753,7 @@ Example 5.2: Sample usage of EventEvaluators (examples/chapter5/EventEvaluatorExample.java) </em> - <div class="source">public class CallerEvaluatorExample { + <div class="source"><pre>public class CallerEvaluatorExample { public static void main(String[] args) { Logger logger = (Logger) LoggerFactory @@ -777,7 +776,7 @@ } }</b> } -}</div> +}</pre></div> <p> This excerpt does nothing very fancy. Five logging requests are issued, the third one being different from the others. @@ -793,14 +792,13 @@ <code>EventEvaluatorExample</code> class. </p> - <div class="source">0 [main] DEBUG - logging statement0 + <div class="source"><pre>0 [main] DEBUG - logging statement0 0 [main] DEBUG - logging statement1 0 [main] DEBUG - logging statement2 0 [main] DEBUG - stacktrace logging statement3 Caller+0 \ at chapter5.CallerEvaluatorExample.main(CallerEvaluatorExample.java:28) -0 [main] DEBUG - logging statement4 -</div> +0 [main] DEBUG - logging statement4</pre></div> <p> Of course, one can change the expression to match one's @@ -820,7 +818,7 @@ with an exception. However, we do not want request number 3 to display its exception in the logging output.</p> -<div class="source">public class ExceptionEvaluatorExample { +<div class="source"><pre>public class ExceptionEvaluatorExample { public static void main(String[] args) { Logger logger = (Logger) LoggerFactory @@ -843,14 +841,14 @@ } }</b> } -}</div> +}</pre></div> <p>The following configuration will allow that.</p> <em> Example 5.3: Sample usage of EventEvaluators (examples/chapter5/exceptionEvaluatorConfig.xml) </em> - <div class="source"><configuration> + <div class="source"><pre><configuration> <b><evaluator name="DISPLAY_EX_EVAL"> <Expression>throwable != null && throwable instanceof \ @@ -870,7 +868,7 @@ <level value="debug" /> <appender-ref ref="STDOUT" /> </root> -</configuration></div> +</configuration></pre></div> <p> With this configuration, each time an instance of the @@ -924,13 +922,13 @@ output, an internal CSS style is used. In that case, the following xml element can be nested into the <code><layout></code> element. </p> -<div class="source"><layout> +<div class="source"><pre><layout> ... <cssBuilder class="ch.qos.logback.core.helpers.CssBuilder"> <param name="url" value="path_to_StyleFile.css" /> </cssBuilder> ... -</layout></div> +</layout></pre></div> <p> The HTMLLayout is often used in conjunction with @@ -941,7 +939,7 @@ When one wants to use the HTMLLayout with a SMTPAppender, the following configuration is typically used. </p> - <div class="source"><configuration> + <div class="source"><pre><configuration> <appender name="SMTP" class="ch.qos.logback.classic.net.SMTPAppender"> <layout class="ch.qos.logback.classic.html.HTMLLayout"> <param name="pattern" value="%relative%thread%mdc%level%class%msg" /> @@ -957,7 +955,7 @@ <level value="debug" /> <appender-ref ref="SMTP" /> </root> -</configuration></div> +</configuration></pre></div> <p> In this configuration file, the <em>throwableRenderer</em> @@ -971,11 +969,11 @@ for the classic module, the <code>AccessLayout</code> exists for the access module. It's implementation is very straight-forward.</p> - <div class="source">public interface AccessLayout extends Layout { + <div class="source"><pre>public interface AccessLayout extends Layout { String doLayout(AccessEvent event); -}</div> +}</pre></div> <p>Many access layouts are actually adaptations of classic layouts. Logback modules classic and access address pretty different needs, but offer the same power

1 0

svn commit: r718 - logback/trunk/src/site
by noreply.seb＠qos.ch 19 Oct '06

19 Oct '06

Author: seb Date: Thu Oct 19 17:54:01 2006 New Revision: 718 Modified: logback/trunk/src/site/site.xml Log: corrected skin version Modified: logback/trunk/src/site/site.xml ============================================================================== --- logback/trunk/src/site/site.xml (original) +++ logback/trunk/src/site/site.xml Thu Oct 19 17:54:01 2006 @@ -4,7 +4,7 @@ <skin> <groupId>ch.qos.logback</groupId> <artifactId>logback-skin</artifactId> - <version>0.3</version> + <version>0.5-SNAPSHOT</version> </skin> <!-- <publishDate position="navigation-bottom" format="dd-MM-yyyy"/>

1 0

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

19 Oct '06

Author: ceki Date: Thu Oct 19 17:12:03 2006 New Revision: 717 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitFactory.java Log: very minor changes Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java Thu Oct 19 17:12:03 2006 @@ -32,11 +32,11 @@ rulesMap.put(new Pattern("group/fruitShell"), new FruitShellAction()); rulesMap.put(new Pattern("group/fruitShell/fruit"), new FruitFactoryAction()); rulesMap.put(new Pattern("group/fruitShell/fruit/*"), new NOPAction()); - SimpleConfigurator gc = new SimpleConfigurator(rulesMap); + SimpleConfigurator simpleConfigurator = new SimpleConfigurator(rulesMap); - gc.setContext(fruitContext); + simpleConfigurator.setContext(fruitContext); - gc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/" + filename); + simpleConfigurator.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/" + filename); StatusPrinter.print(fruitContext); return fruitContext.getFruitShellList(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitFactory.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitFactory.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitFactory.java Thu Oct 19 17:12:03 2006 @@ -18,7 +18,7 @@ public Fruit buildFruit() { for (SaxEvent se : eventList) { - System.out.println(se); + System.out.println("Event to replay: "+se); } Context context = new ContextBase(); this.fruit = null;

1 0

svn commit: r716 - in logback/trunk/logback-skin/src/main/resources: META-INF/maven css
by noreply.seb＠qos.ch 19 Oct '06

19 Oct '06

Author: seb Date: Thu Oct 19 16:40:01 2006 New Revision: 716 Modified: logback/trunk/logback-skin/src/main/resources/META-INF/maven/site.vm logback/trunk/logback-skin/src/main/resources/css/print.css logback/trunk/logback-skin/src/main/resources/css/site.css Log: Corrected printing bug in IE (yes! :) Modified table styles to ease read when doc is printed Modified site.vm to create XHTML Strict pages and link css stylesheets correctly Modified: logback/trunk/logback-skin/src/main/resources/META-INF/maven/site.vm ============================================================================== --- logback/trunk/logback-skin/src/main/resources/META-INF/maven/site.vm (original) +++ logback/trunk/logback-skin/src/main/resources/META-INF/maven/site.vm Thu Oct 19 16:40:01 2006 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> #macro ( banner $banner $id ) #if ( $banner ) @@ -273,9 +273,8 @@ <html> <head> <title>$title</title> - <style type="text/css" media="all"> - @import url("$relativePath/css/site.css"); - </style> + + <link rel="stylesheet" href="$relativePath/css/site.css" type="text/css" media="all" /> <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" /> #foreach( $author in $authors ) <meta name="author" content="$author" /> Modified: logback/trunk/logback-skin/src/main/resources/css/print.css ============================================================================== --- logback/trunk/logback-skin/src/main/resources/css/print.css (original) +++ logback/trunk/logback-skin/src/main/resources/css/print.css Thu Oct 19 16:40:01 2006 @@ -1,12 +1,14 @@ /* - Print css. + * Print css. + * */ body { margin: 0px; padding: 0px 0px 2px 0px; + line-height: 1.3em; + font-size: 12px; } - #leftColumn { width: 0px; height: 0px; @@ -14,7 +16,15 @@ } #bodyColumn { - max-width: 100%; margin-right: 1.5em; margin-left: 0px; /*was: 197*/ +} + +table.bodyTable td { + vertical-align: text-top; +} + +table.bodyTable th { + vertical-align: text-top; + text-align:center; } \ No newline at end of file Modified: logback/trunk/logback-skin/src/main/resources/css/site.css ============================================================================== --- logback/trunk/logback-skin/src/main/resources/css/site.css (original) +++ logback/trunk/logback-skin/src/main/resources/css/site.css Thu Oct 19 16:40:01 2006 @@ -1,9 +1,12 @@ /* - Logback CSS Theme for Maven 2, from LB-Skin + * Logback CSS Theme for Maven 2, from LB-Skin + * */ body { margin: 0px; padding: 0px 0px 10px 0px; + line-height: 1.3em; + font-size: small; } img { @@ -111,10 +114,10 @@ font-size: normal; } -p { +/*p { line-height: 1.3em; font-size: small; -} +}*/ #bannerLeft,#bannerRight { font-size: xx-large; @@ -248,9 +251,7 @@ padding-bottom: 0.5ex; padding-top: 0.5ex; padding-left: 1ex; - white-space: pre; - width: 55em; - + /*white-space: pre;*/ } .source pre { @@ -358,5 +359,5 @@ } .greenBold { color: green; - font-weight: bold; + font-weight: bold; } \ No newline at end of file

1 0