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

svn commit: r765 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers
by noreply.seb＠qos.ch 24 Oct '06

24 Oct '06

Author: seb Date: Tue Oct 24 20:29:54 2006 New Revision: 765 Removed: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/CssBuilder.java Log: removed impl to create an interface

1 0

svn commit: r764 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers
by noreply.seb＠qos.ch 24 Oct '06

24 Oct '06

Author: seb Date: Tue Oct 24 20:29:36 2006 New Revision: 764 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/DefaultCssBuilder.java - copied, changed from r760, /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/CssBuilder.java Log: initial commit Copied: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/DefaultCssBuilder.java (from r760, /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/CssBuilder.java) ============================================================================== --- /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/CssBuilder.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/DefaultCssBuilder.java Tue Oct 24 20:29:36 2006 @@ -18,11 +18,11 @@ * * @author Sébastien Pennec */ -public class CssBuilder { +public class DefaultCssBuilder { String url; - public CssBuilder() { + public DefaultCssBuilder() { } public String getUrl() {

1 0

svn commit: r763 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access logback-access/src/main/java/ch/qos/logback/access/html logback-classic/examples/src/chapter5 logback-classic/src/main/java/ch/qos/logback/classic logback-classic/src/main/java/ch/qos/logback/classic/html logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 24 Oct '06

24 Oct '06

Author: seb Date: Tue Oct 24 19:56:27 2006 New Revision: 763 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: - added links from javadoc to online layouts page - other fixes Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java Tue Oct 24 19:56:27 2006 @@ -45,175 +45,8 @@ * usual <code>PatternLayout</code>. * * - * For more information about the general use of a <code>PatternLayout</code>, - * please refer to logback classic's - * <code>ch.qos.logback.classic.PatternLayout</code>. - * - * - * Logback access' <code>PatternLayout</code> offers the following - * possibilities: - * - * <table border="1" CELLPADDING="8"> - * <th>Conversion Character or Word</th> - * <th>Effect</th> - * - * <tr> - * <td align="center">a / remoteIP</td> - * <td> - * - * Remote IP address. - * - * </td> - * </tr> - * <tr> - * <td align="center">A / localIP</td> - * <td> - * - * Local IP address. - * - * </td> - * </tr> - * <tr> - * <td align="center">b / B / byteSent</td> - * <td> - * - * Response's content length. - * - * </td> - * </tr> - * <tr> - * <td align="center">h / clientHost</td> - * <td> - * - * Remote host. - * - * </td> - * </tr> - * <tr> - * <td align="center">H / protocol</td> - * <td> - * - * Request protocol. - * - * </td> - * </tr> - * <tr> - * <td align="center">i / header</td> - * <td> - * - * Request header. This conversion word can be followed by a key whose - * corresponding data will be extracted from the header information. - * - * </td> - * </tr> - * <tr> - * <td align="center">l</td> - * <td> - * Remote user. In logback-access, this converter always returns - * the value "-". - * - * </td> - * </tr> - * <tr> - * <td align="center">m / requestMethod</td> - * <td> - * - * Request method. - * - * </td> - * </tr> - * <tr> - * <td align="center">r / requestURL</td> - * <td> - * - * URL requested. - * - * </td> - * </tr> - * <tr> - * <td align="center">s / statusCode</td> - * <td> - * - * Status code of the request. - * - * </td> - * </tr> - * <tr> - * <td align="center">t / date</td> - * <td> - * - * Date of the event. - * - * </td> - * </tr> - * <tr> - * <td align="center">u / user</td> - * <td> - * - * Remote user. - * - * </td> - * </tr> - * <tr> - * <td align="center">U / requestURI</td> - * <td> - * - * Requested URI. - * - * </td> - * </tr> - * <tr> - * <td align="center">v / server</td> - * <td> - * - * Server name. - * - * </td> - * </tr> - * <tr> - * <td align="center">localPort</td> - * <td> - * - * Local port. - * - * </td> - * </tr> - * <tr> - * <td align="center">reqAttribute</td> - * <td> - * - * Attribute of the request. Just like the request header conversion word, - * reqAttribute can be followed by a key. - * - * </td> - * </tr> - * <tr> - * <td align="center">reqCookie</td> - * <td> - * - * Request cookie. - * - * </td> - * </tr> - * <tr> - * <td align="center">responseHeader</td> - * <td> - * - * Header of the response. Just like the request header conversion word, - * responseHeader can be followed by a key. - * - * </td> - * </tr> - * <tr> - * <td align="center">reqParameter</td> - * <td> - * - * Parameter of the response. Just like the request header conversion word, - * reqParameter can be followed by a key. - * - * </td> - * </tr> - * </table> + * For more informations about this layout, please refer to the online manual at + * http://logback.qos.ch/manual/layouts.html#AccessPatternLayout * * @author Ceki Gülcü * @author Sébastien Pennec Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java Tue Oct 24 19:56:27 2006 @@ -27,33 +27,10 @@ * See {@link ch.qos.logback.access.PatternLayout} for documentation on the * available patterns. * - * A user-specified external CSS file can be linked to the html page. - * In case one does not want to customize the html output, an internal CSS style - * is used. + * For more informations about this layout, please refer to the online manual at + * http://logback.qos.ch/manual/layouts.html#AccessHTMLLayout * - * The HTMLLayout is often used in conjunction with SMTPAppender, to - * send a nicely formatted html email. Of course, it can be used with any - * other Appender. * - * In case on wants to use the HTMLLayout with a SMTPAppender, here is a sample - * configuration file that can be used. - * - * <pre> - * <configuration> - * <appender name="SMTP" class="ch.qos.logback.access.net.SMTPAppender"> - * <layout class="ch.qos.logback.access.html.HTMLLayout"> - * <param name="pattern" value="%remoteIP%date%requestURL%statusCode%bytesSent" /> - * </layout> - * <param name="From" value="sender.email(a)domain.net" /> - * <param name="SMTPHost" value="mail.domain.net" /> - * <param name="Subject" value="LastEvent: %statusCode %requestURL" /> - * <param name="To" value="destination.email(a)domain.net" /> - * </appender> - * - * <appender-ref ref="SMTP" /> - * </configuration> - *</pre> - * * @author Ceki Gülcü * @author Sébastien Pennec */ Modified: logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java ============================================================================== --- logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java (original) +++ logback/trunk/logback-classic/examples/src/chapter5/CallerEvaluatorExample.java Tue Oct 24 19:56:27 2006 @@ -25,9 +25,9 @@ for (int i = 0; i < 5; i++) { if (i == 3) { - logger.debug("stacktrace logging statement" + i); + logger.debug("who calls thee?"); } else { - logger.debug("logging statement" + i); + logger.debug("I know me " + i); } } } 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 Tue Oct 24 19:56:27 2006 @@ -1,7 +1,7 @@ <configuration> <evaluator name="DISPLAY_CALLER_EVAL"> - <Expression>logger.getName().contains("chapter5") && message.contains("stacktrace")</Expression> + <Expression>logger.getName().contains("chapter5") && message.contains("who calls thee")</Expression> </evaluator> <appender name="STDOUT" Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java Tue Oct 24 19:56:27 2006 @@ -40,402 +40,8 @@ * {#link String}. The format of the result depends on the * conversion pattern. * - * - * - * The conversion pattern is closely related to the conversion pattern of the - * printf function in C. A conversion pattern is composed of literal text and - * format control expressions called conversion specifiers. - * - * - * Note that 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 character or - * conversion word. The conversion character or word specifies the - * type of data, e.g. logger, level, date, thread name. The format modifiers - * control such things as field width, padding, left and right justification. - * The following is a simple example. - * - * - * Let the conversion pattern be "%-5level [%thread]: %message%n" and - * assume that the logback environment was set to use a PatternLayout. Then the - * statements - * - * <pre> - * Logger logger = LoggerFactory.getLogger("root"); - * root.debug("Message 1"); - * root.warn("Message 2"); - * </pre> - * - * would yield the output - * - * <pre> - * DEBUG [main]: Message 1 - * WARN [main]: Message 2 - * </pre> - * - * - * Note that there is no explicit separator between text and conversion - * specifiers. The pattern parser knows when it has reached the end of a - * conversion specifier when it reads a conversion character. In the example - * above the conversion specifier %-5level means the level of the - * logging event should be left justified to a width of five characters. - * - * The recognized conversion characters and words are - * - * - * <table border="1" CELLPADDING="8"> - * <th>Conversion Character or Word</th> - * <th>Effect</th> - * - * <tr> - * <td align=center>c / l / lo / logger</td> - * - * <td>Used to output the logger of the logging event. The logger conversion - * specifier can be optionally followed by precision specifier, that - * is a decimal constant in brackets. - * - * - * If a precision specifier is given, then only the corresponding number of - * right most components of the logger name will be printed. By default the - * logger name is printed in full. - * - * - * For example, for the logger name "a.b.c" the pattern %logger{2} - * will output "b.c". See more examples of name abbreviations further down this - * document. - * - * </td> - * </tr> - * - * <tr> - * <td align=center>C / class</td> - * - * <td>Used to output the fully qualified class name of the caller issuing the - * logging request. This conversion specifier can be optionally followed by - * precision specifier, that is a decimal constant in brackets. - * - * - * If a precision specifier is given, then only the corresponding number of - * right most components of the class name will be printed. By default the class - * name is output in fully qualified form. - * - * - * For example, for the class name "ch.logback.xyz.SomeClass", the pattern - * %class{1} will output "SomeClass". See more examples of name - * abbreviations further down this document. - * - * - * WARNING Generating the caller class information is slow. Thus, it's - * use should be avoided unless execution speed is not an issue. - * - * </td> - * </tr> - * - * <tr> - * <td align=center>d / date</td> - * <td>Used to output the date of the logging event. The date conversion - * specifier may be followed by a set of braces containing a date and time - * pattern strings {@link java.text.SimpleDateFormat}, ABSOLUTE, - * DATE or ISO8601. 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. </td> - * </tr> - * - * <tr> - * <td align=center>F / file</td> - * - * <td>Used to output the file name where the logging request was issued. - * - * - * WARNING Generating caller file information is extremely slow. Its use - * should be avoided unless execution speed is not an issue. - * </td> - * </tr> - * - * <tr> - * <td align=center>caller</td> - * - * <td>Used to output location information of the caller which generated the - * logging event. - * - * - * The location information depends on the JVM implementation but usually - * consists of the fully qualified name of the calling method followed by the - * callers source the file name and line number between parentheses. - * - * - * The location information can be very useful. However, it's generation is - * extremely slow. It's use should be avoided unless execution speed - * is not an issue. - * - * </td> - * </tr> - * - * <tr> - * <td align=center>L / line</td> - * - * <td>Used to output the line number from where the 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. - * </td> - * </tr> - * - * - * <tr> - * <td align=center>m / msg / message</td> - * <td>Used to output the application supplied message associated with the - * logging event.</td> - * </tr> - * - * <tr> - * <td align=center>M / method</td> - * - * <td>Used to output the method name where the 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. - * </td> - * </tr> - * - * <tr> - * <td align=center>n</td> - * - * <td>Outputs the platform dependent line separator character or characters. - * - * - * This conversion character offers practically the same performance as using - * non-portable line separator strings such as "\n", or "\r\n". Thus, it is the - * preferred way of specifying a line separator. - * - * </td> - * </tr> - * - * <tr> - * <td align=center>p / le / level</td> - * <td>Used to output the level of the logging event.</td> - * </tr> - * - * <tr> - * - * <td align=center>r / relative</td> - * - * <td>Used to output the number of milliseconds elapsed since the start of the - * application until the creation of the logging event.</td> - * </tr> - * - * - * <tr> - * <td align=center>t / thread</td> - * - * <td>Used to output the name of the thread that generated the logging event.</td> - * - * </tr> - * - * <tr> - * <td align=center>X / mdc</td> - * - * <td> - * - * - * Used to output the MDC (mapped diagnostic context) associated with the thread - * that generated the logging event. The X conversion character can be - * followed by the key for the map placed between braces, as in - * %X{clientNumber} where <code>clientNumber</code> is the key. The - * value in the MDC corresponding to the key will be output. 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 - * - * - * - * See {@link MDC} class for more details. - * - * - * </td> - * </tr> - * <tr> - * <td align=center>throwable</td> - * - * <td> - * - * 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(). The throwable conversion word can be - * followed by an option in the form %throwable{short} which will only - * output the first line of the ThrowableInformation. - * - * </td> - * </tr> - * - * <tr> - * - * <td align=center>%</td> - * - * <td>The sequence %% outputs a single percent sign. </td> - * </tr> - * - * </table> - * - * - * By default the relevant information is output as is. However, with the aid of - * format modifiers it is possible to change the minimum field width, the - * maximum field width and justification. - * - * - * The optional format modifier is placed between the percent sign and the - * conversion character or word. - * - * - * The first optional format modifier is the left justification flag - * which is just the minus (-) character. Then comes the optional - * minimum field width modifier. This is a decimal constant that - * represents the minimum number of characters to output. If the data item - * requires fewer characters, it is padded on either the left or the right until - * the minimum width is reached. The default is to pad on the left (right - * justify) but you can specify right padding with the left justification flag. - * The padding character is space. If the data item is larger than the minimum - * field width, the field is expanded to accommodate the data. The value is - * never truncated. - * - * - * This behavior can be changed using the maximum field width - * 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 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. - * - * - * Below are various format modifier examples for the logger conversion - * specifier. - * - * - * <TABLE BORDER=1 CELLPADDING=8> - * <th>Format modifier - * <th>Left justify - * <th>Minimum width - * <th>Maximum width - * <th>Comment - * - * <tr> - * <td align=center>%20c</td> - * <td align=center>false</td> - * <td align=center>20</td> - * <td align=center>none</td> - * - * <td>Left pad with spaces if the category name is less than 20 characters - * long. - * - * <tr> - * <td align=center>%-20c</td> - * <td align=center>true</td> - * <td align=center>20</td> - * <td align=center>none</td> - * <td>Right pad with spaces if the logger name is less than 20 characters - * long. - * - * <tr> - * <td align=center>%.30c</td> - * <td align=center>NA</td> - * <td align=center>none</td> - * <td align=center>30</td> - * - * <td>Truncate from the beginning if the logger name is longer than 30 - * characters. - * - * <tr> - * <td align=center>%20.30c</td> - * <td align=center>false</td> - * <td align=center>20</td> - * <td align=center>30</td> - * - * <td>Left pad with spaces if the logger name is shorter than 20 characters. - * However, if logger name is longer than 30 characters, then truncate from the - * beginning. - * - * <tr> - * <td align=center>%-20.30c</td> - * <td align=center>true</td> - * <td align=center>20</td> - * <td align=center>30</td> - * - * <td>Right pad with spaces if the logger name is shorter than 20 characters. - * However, if logger name is longer than 30 characters, then truncate from the - * beginning. - * - * </table> - * - * - * Below are some examples of conversion patterns. - * - * <dl> - * - * - * <dt>%relative [%thread] %-5level %logger %mdc - %message\n - * - * <dd>This is essentially the TTCC layout. - * - * - * <dt>%-6relative [%15.15thread] %-5level %30.30logger %mdc - %message\n - * - * - * <dd>Similar to the TTCC layout except that the relative time is right padded - * if less than 6 digits, thread name is right padded if less than 15 characters - * and truncated if longer and the logger name is left padded if shorter than 30 - * characters and truncated if longer. - * - * </dl> - * Here are a few more examples of the precision specifier behaviour, with emphasis on - * the way it affects class names. - * - * - * <table BORDER=1 CELLPADDING=8> - * - * <tr> - * <th>Conversion Pattern</th> - * <th>Logger name</th> - * <th>Result</th> - * </tr> - * - * <tr> - * <td>%logger{10}</td> - * <td>mainPackage.sub.sample.Bar</td> - * <td>m.s.s.Bar</td> - * </tr> - * - * <tr> - * <td>%logger{15}</td> - * <td>mainPackage.sub.sample.Bar</td> - * <td>m.s.sample.Bar</td> - * </tr> - * - * <tr> - * <td>%logger{16}</td> - * <td>mainPackage.sub.sample.Bar</td> - * <td>m.sub.sample.Bar</td> - * </tr> - * - * <tr> - * <td>%logger{26}</td> - * <td>mainPackage.sub.sample.Bar</td> - * <td>mainPackage.sub.sample.Bar</td> - * </tr> - * - * </table> - * - * - * The above text is largely inspired from Peter A. Darnell and Philip E. - * Margolis' highly recommended book "C -- a Software Engineering Approach", - * ISBN 0-387-97389-3. + * For more informations about this layout, please refer to the online manual at + * http://logback.qos.ch/manual/layouts.html#ClassicPatternLayout * * */ Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java Tue Oct 24 19:56:27 2006 @@ -26,57 +26,9 @@ * See {@link ch.qos.logback.classic.PatternLayout} for documentation on the * available patterns. * - * Note that the pattern %ex used to display an Exception is not the only way - * to display an Exception with this layout. If you use this pattern, a table column will - * be created to display the potential Exception's stacktrace. - * - * However, a better solution is available in the form of implementations of the - * {@link ch.qos.logback.classic.html.IThrowableRenderer} interface. - * These implementations can be called and assigned to HTMLLayout to manage the display - * of anything related to Exceptions. - * - * By default, a {@link ch.qos.logback.classic.html.DefaultThrowableRenderer} - * is assigned to the HTMLLayout. It writes the Exception on a new table row, along - * with its stacktrace, in a easily readable manner. - * - * If one wants to use the &ex pattern anyway, then a NOPThrowableRenderer - * can be specified in the configuration file. - * - * A user-specified external CSS file can be linked to the html page. - * In case one does not want to customize the html output, an internal CSS style - * is used. + * For more informations about this layout, please refer to the online manual at + * http://logback.qos.ch/manual/layouts.html#ClassicHTMLLayout * - * The HTMLLayout is often used in conjunction with SMTPAppender, to - * send a nicely formatted html email. Of course, it can be used with any - * other Appender. - * - * In case on wants to use the HTMLLayout with a SMTPAppender, here is a sample - * configuration file that can be used. - * - * <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" /> - * </layout> - * <throwableRenderer class="ch.qos.logback.classic.html.DefaultThrowableRenderer" /> - * <param name="From" value="sender.email(a)domain.net" /> - * <param name="SMTPHost" value="mail.domain.net" /> - * <param name="Subject" value="LastEvent: %class - %msg" /> - * <param name="To" value="destination.email(a)domain.net" /> - * </appender> - * - * <root> - * <level value="debug" /> - * <appender-ref ref="SMTP" /> - * </root> - * </configuration> - *</pre> - * - * In this configuration file, the throwableRenderer element specifies the default - * implementation of IThrowableRenderer. It could be omitted, but is showed for educationnal - * purposes. - * * @author Ceki Gülcü * @author Sébastien Pennec */ 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 Tue Oct 24 19:56:27 2006 @@ -43,20 +43,13 @@ </td> </tr> </table> + + Printing notice: if you want to print this document, you might want to + use Firefox, with Adapt to page size enabled, + or Opera for better rendering on paper. <h2>What is a layout</h2> -<div class="source">this -is - a test - without pres</div> - - -<div class="source"><pre>this -is - a test - with pres</pre></div> - While appenders are responsible for writing logging output to an appender dependent device, layouts are responsible for @@ -486,14 +479,14 @@ For example, %caller{2} would display the following excerpt: -<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)</pre></div> +<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)</pre></div> And %caller{3} would display this other excerpt: -<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)</pre></div> +<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)</pre></div> This conversion word can also use evaluators to test logging events

1 0

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

24 Oct '06

Author: ceki Date: Tue Oct 24 19:54:43 2006 New Revision: 762 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Log: missing copyright Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Tue Oct 24 19:54:43 2006 @@ -1,3 +1,12 @@ +/** + * 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.classic.pattern; import java.util.ArrayList;

1 0

svn commit: r761 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty
by noreply.seb＠qos.ch 24 Oct '06

24 Oct '06

Author: seb Date: Tue Oct 24 19:53:12 2006 New Revision: 761 Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java Log: minor fix Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java Tue Oct 24 19:53:12 2006 @@ -16,8 +16,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); - // FIXME Why doesn't JettyBasicTest.class pass? - //suite.addTestSuite(JettyBasicTest.class); + suite.addTest(JettyBasicTest.suite()); return suite; } } \ No newline at end of file

1 0

svn commit: r760 - in logback/trunk/logback-site/src/site: resources/manual/images/chapter5 xdocTemplates/manual
by noreply.seb＠qos.ch 24 Oct '06

24 Oct '06

Author: seb Date: Tue Oct 24 17:05:25 2006 New Revision: 760 Added: logback/trunk/logback-site/src/site/resources/manual/images/chapter5/htmlLayoutAccess.gif (contents, props changed) Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: added htmllayout illustration, still testing css styles Added: logback/trunk/logback-site/src/site/resources/manual/images/chapter5/htmlLayoutAccess.gif ============================================================================== Binary file. No diff available. 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 Tue Oct 24 17:05:25 2006 @@ -46,6 +46,17 @@ <h2>What is a layout</h2> +<div class="source">this +is + a test + without pres</div> + + +<div class="source"><pre>this +is + a test + with pres</pre></div> + While appenders are responsible for writing logging output to an appender dependent device, layouts are responsible for @@ -211,6 +222,7 @@ to a layout is as simple as declaring a setter method for the option. See also chapter5/sampleLayoutConfig2.xml for a configuration example. + <a name="AccessPatternLayout" /> <h3>PatternLayout</h3> @@ -877,9 +889,20 @@ example, the MDC conversion specifier: %mdc{someKey}. - However, there is more to it than that. + A conversion specifier might use more that one options. For example, + a conversion specifier that uses evaluators, which we will cover very soon, + simply adds the evaluator names to the options list, as shown above + + <div class="source"><pre> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <param name="Pattern" value="%-4relative [%thread] %-5level - %msg%n \ + %caller{2, DISP_CALLER_EVAL, OTHER_EVAL_NAME, THIRD_EVAL_NAME}" /> + </layout> + </appender></pre></div> + + - ADD OPTIONS EXAMPLES <h4>Evaluators</h4> @@ -923,13 +946,13 @@ <div class="source"><pre><configuration> <evaluator name="DISP_CALLER_EVAL"> <Expression>logger.getName().contains("chapter5") &amp;&amp; \ - message.contains("stacktrace")</Expression> + message.contains("who calls thee")</Expression> </evaluator> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> <param name="Pattern" value="%-4relative [%thread] %-5level - %msg%n \ - %caller{2, DISP_CALLER_EVAL}%n" /> + %caller{2, DISP_CALLER_EVAL}" /> </layout> </appender> @@ -962,9 +985,9 @@ for (int i = 0; i < 5; i++) { if (i == 3) { - logger.debug("stacktrace logging statement" + i); + logger.debug("who calls thee?"); } else { - logger.debug("logging statement" + i); + logger.debug("I know me " + i); } } } @@ -993,14 +1016,14 @@ 0 [main] DEBUG - logging statement4</pre></div> - Of course, one can change the expression to match one's - specific situation. An expression testing logger name and + Of course, one can change the expression to match a real + world situation. An expression testing logger name and request level could also be meaningful: all logging requests of level WARN and up, coming from a sensible part of an application like a financial transaction module, would have their caller data displayed. Important: With the caller conversion specifier, the data is - displayed when the expression passed to the evaluator is true. + displayed when the expression evaluates to true. Let's look at a different situation. When exceptions are added to a logging request, they are usually displayed. However, in some cases, @@ -1070,8 +1093,9 @@ exception. Important: With the ex conversion specifier, the data is - displayed when the expression passed to the evaluator is false. + displayed when the expression evaluates to false. + <a name="ClassicHTMLLayout"/> <h3>HTMLLayout</h3> HTMLLayout outputs events in an HTML table. Each row of the table corresponds to a logging event. @@ -1211,6 +1235,7 @@ The only exceptions comes from the fact that layouts in access module imlement the <code>AccessLayout</code> interface instead <code>ClassicLayout</code>. + <a name="AccessPatternLayout" /> <h3>PatternLayout</h3> Access' <code>PatternLayout</code> work the exact same way as it's classic counterpart. @@ -1437,10 +1462,24 @@ much like the common pattern but also displays two request headers, namely referer, and user-agent. + <a name="AccessHTMLLayout" /> <h3>HTMLLayout</h3> The access version of <code>HTMLLayout</code> works like logback classic's version. + + By default, it will create a table containing the following data: + + <ul> + Remote IP + Date + Request URL + Status code + Content Length + </ul> + + Here is what you can expect from a configured access <code>HTMLLayout</code>: + <img src="images/chapter5/htmlLayoutAccess.gif" alt="Access HTML Layout Sample Image"/> </body> </document>

1 0

svn commit: r759 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty
by noreply.ceki＠qos.ch 24 Oct '06

24 Oct '06

Author: ceki Date: Tue Oct 24 15:46:21 2006 New Revision: 759 Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java Log: momentary respite... Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java Tue Oct 24 15:46:21 2006 @@ -16,7 +16,8 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTestSuite(JettyBasicTest.class); + // FIXME Why doesn't JettyBasicTest.class pass? + //suite.addTestSuite(JettyBasicTest.class); return suite; } } \ No newline at end of file

1 0

svn commit: r758 - in logback/trunk/logback-access/src/test/java/ch/qos/logback/access: . jetty pattern
by noreply.ceki＠qos.ch 24 Oct '06

24 Oct '06

Author: ceki Date: Tue Oct 24 15:40:56 2006 New Revision: 758 Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/PackageTest.java Log: c.q.l.access.jetty.PackageTest ne passe pas. (A etudier ce soir) Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java Tue Oct 24 15:40:56 2006 @@ -0,0 +1,25 @@ +/** + * 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.access; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +public class AllTest extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(); + + suite.addTest(ch.qos.logback.access.pattern.PackageTest.suite()); + suite.addTest(ch.qos.logback.access.jetty.PackageTest.suite()); + return suite; + } +} Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java Tue Oct 24 15:40:56 2006 @@ -0,0 +1,22 @@ +/** + * 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.access.jetty; + +import junit.framework.*; + +public class PackageTest extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(JettyBasicTest.class); + return suite; + } +} \ No newline at end of file Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/PackageTest.java Tue Oct 24 15:40:56 2006 @@ -0,0 +1,21 @@ +/** + * 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.access.pattern; + +import junit.framework.*; + +public class PackageTest extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(ConverterTest.class); + return suite; + } +} \ No newline at end of file

1 0

svn commit: r757 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran
by noreply.ceki＠qos.ch 24 Oct '06

24 Oct '06

Author: ceki Date: Tue Oct 24 15:37:45 2006 New Revision: 757 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java Log: - let's not ignore the rules defined by JoranConfiguratorBase... Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java Tue Oct 24 15:37:45 2006 @@ -54,6 +54,7 @@ rs .addRule(new Pattern("configuration/appender/layout"), new LayoutAction()); + super.addInstanceRules(rs); } }

1 0

svn commit: r756 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/joran
by noreply.ceki＠qos.ch 24 Oct '06

24 Oct '06

Author: ceki Date: Tue Oct 24 15:34:11 2006 New Revision: 756 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java Log: - let's not ignore the rules defined by JoranConfiguratorBase... Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java Tue Oct 24 15:34:11 2006 @@ -25,12 +25,13 @@ */ public class JoranConfigurator extends JoranConfiguratorBase { - + @Override public void addInstanceRules(RuleStore rs) { rs.addRule(new Pattern("configuration"), new ConfigurationAction()); rs.addRule(new Pattern("configuration/appender-ref"), new AppenderRefAction()); + super.addInstanceRules(rs); }

1 0