December 2006 - logback-dev

svn commit: r1139 - logback/trunk
by noreply.ceki＠qos.ch 20 Dec '06

20 Dec '06

Author: ceki Date: Wed Dec 20 15:17:12 2006 New Revision: 1139 Modified: logback/trunk/pom.xml Log: added clover and cobertura plugin-ins Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Wed Dec 20 15:17:12 2006 @@ -166,6 +166,17 @@ <configuration> <downloadSources>true</downloadSources> </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> + <configuration> + <jdk>1.5</jdk> + <excludes> + <exclude>**/chapter*/</exclude> + </excludes> + </configuration> </plugin> </plugins> </build> @@ -185,19 +196,25 @@ <linkJavadoc>true</linkJavadoc> </configuration> </plugin> + + +  +  <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId> - maven-project-info-reports-plugin - </artifactId> - <reportSets> - <reportSet> - <reports> - </reports> - </reportSet> - </reportSets> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> </plugin> + +  +  +  +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId>

1 0

svn commit: r1138 - in logback/trunk: logback-examples/src/main/java/chapter5 logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 20 Dec '06

20 Dec '06

Author: seb Date: Wed Dec 20 15:12:47 2006 New Revision: 1138 Modified: logback/trunk/logback-examples/src/main/java/chapter5/SampleLogging.java logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: layout chapter fix temporary changes to SampleLogging.java Modified: logback/trunk/logback-examples/src/main/java/chapter5/SampleLogging.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter5/SampleLogging.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter5/SampleLogging.java Wed Dec 20 15:12:47 2006 @@ -17,6 +17,7 @@ try { JoranConfigurator configurator = new JoranConfigurator(); + lc.shutdownAndReset(); configurator.setContext(lc); configurator.doConfigure(args[0]); } catch (JoranException je) { @@ -24,8 +25,10 @@ } logger.debug("Everything's going well"); + logger.info("Everything's going well info"); + logger.warn("Everything's going well warn"); - logger.error("... not quite"); + logger.error("... not quite error"); } } 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 Wed Dec 20 15:12:47 2006 @@ -1244,7 +1244,7 @@ case Level.WARN_INT: return WARN_COLOR; default: - return null; + return ""; } } } @@ -1267,7 +1267,7 @@ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%-4relative [%thread] %%sample - %msg%n</Pattern> + <Pattern>%-4relative [%thread] %sample - %msg%n</Pattern> </layout> </appender>

1 0

svn commit: r1137 - in logback/trunk: logback-examples/src/main/java/chapter6 logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 20 Dec '06

20 Dec '06

Author: seb Date: Wed Dec 20 14:54:44 2006 New Revision: 1137 Modified: logback/trunk/logback-examples/src/main/java/chapter6/SampleTurboFilter.java logback/trunk/logback-site/src/site/xdocTemplates/manual/filters.xml logback/trunk/logback-site/src/site/xdocTemplates/manual/mdc.xml Log: corrections to the MDC and Filter chapters Modified: logback/trunk/logback-examples/src/main/java/chapter6/SampleTurboFilter.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter6/SampleTurboFilter.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter6/SampleTurboFilter.java Wed Dec 20 14:54:44 2006 @@ -11,13 +11,17 @@ public class SampleTurboFilter extends TurboFilter { String marker; - Marker acceptedMarker; + Marker markerToAccept; @Override public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { + + if (!isStarted()) { + return FilterReply.NEUTRAL; + } - if ((acceptedMarker.equals(marker))) { + if ((markerToAccept.equals(marker))) { return FilterReply.ACCEPT; } else { return FilterReply.NEUTRAL; @@ -35,7 +39,7 @@ @Override public void start() { if (marker != null && marker.trim().length() > 0) { - acceptedMarker = MarkerFactory.getMarker(marker); + markerToAccept = MarkerFactory.getMarker(marker); super.start(); } } Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/filters.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/filters.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/filters.xml Wed Dec 20 14:54:44 2006 @@ -89,22 +89,96 @@ - In logback, <code>Filter</code> objects can only be added to <code>Appender</code> + In logback-classic, <code>Filter</code> objects can only be added to <code>Appender</code> instances. By adding filters to an appender you can filter events by various criteria, such as the contents of the log message, the contents of the MDC, the time of day or any other part of the logging event. - - The criteria can be specified using an expression evaluator. The + <h3>Implementing your own Filter</h3> + + + Creating your own filter is not difficult. All you have to do is extend the <code>Filter</code> + abstract class. The only method that you will have to implement is the <code>decide()</code> + method, allowing you to contentrate only on the behaviour of your filter. + + + + The next class is all it takes to implement one's own filter. All it does is accept + logging events who's message contains the String sample. The filter will give a + neutral response to any logging event who's message does not contain this String. + + +Example 6.2: Basic custom filter (<a href="../xref/chapter6/SampleFilter.html">logback-examples/src/main/java/chapter6/SampleFilter.java</a>) +<div class="source"><pre>package chapter6; + +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.filter.Filter; +import ch.qos.logback.core.spi.FilterReply; + +public class SampleFilter extends Filter { + + @Override + public FilterReply decide(Object eventObject) { + LoggingEvent event = (LoggingEvent)eventObject; + + if (event.getMessage().contains("sample")) { + return FilterReply.ACCEPT; + } else { + return FilterReply.NEUTRAL; + } + } +}</pre></div> + + + What is shown above might be the simplest filter. Like any filter, it + can be attached to any appender using the <Filter> element, as + shown below: + + +Example 6.3: SampleFilter configuration (logback-examples/src/main/java/chapter6/SampleFilterConfig.xml) +<div class="source"><pre><configuration> + <appender name="STDOUT" + class="ch.qos.logback.core.ConsoleAppender"> + <Filter class="chapter6.SampleFilter" /> + + <layout class="ch.qos.logback.classic.PatternLayout"> + <pattern> + %-4relative [%thread] %-5level %logger - %msg%n + </pattern> + </layout> + </appender> + + <root> + <appender-ref ref="STDOUT" /> + </root> +</configuration></pre></div> + + + Thanks to Joran, logback's powerful configuration framework, adding + an option to such a filter is very easy. Just add the corresponding + getter and setter methods in the class, and you can specify the + option's value in an xml element, nested within the filter element. + + + <h3>Evaluator Filters</h3> + + + A special category of filters ships with logback. The <a href="../xref/ch/qos/logback/core/filter/EvaluatorFilter.html"> - <code>EvaluatorFilter</code></a> class uses an + <code>EvaluatorFilter</code></a> objects use an <a href="../xref/ch/qos/logback/core/boolex/EventEvaluator.html"> <code>EventEvaluator</code></a> to decide wether to accept or deny the request. This allows unprecedented flexibility in the way that you can affect the logging event's filtering. + + Creating a customized filter that makes use of <code>EventEvaluator</code> objects + works the same way as seen previously, except that one must extend the + <code>EvaluatorFilter</code> class, instead of the <code>Filter</code> class. + + <a name="EventEvaluator" /> <h3>Event Evaluators</h3> @@ -147,13 +221,13 @@ The bold part in the previous configuration adds an <code>EvaluatorFilter</code> to a <code>ConsoleAppender</code>. An <code>EventEvaluator</code> is then given to the filter. The expression element contains a recognizable java expression. - Notice that the message variable is not defined anywhere. Logback provides + Notice that the message variable is defined implicitly. Logback provides access to the internal components of a logging event and lets the user build her expression at will. - The variables available to the <code>EventEvaluator</code> are descripbed below: + The implicit variables available to the <code>EventEvaluator</code> are descripbed below: <table> @@ -166,7 +240,10 @@ <td>event </td> <td><code>LoggingEvent</code></td> - <td>The newly created logging event. + <td>The logging event associated with the logging request. + All of the following variables are also available from the event. For example, + <code>event.getMessage()</code> returns the same String value as the message + variable. </td> </tr> <tr> @@ -183,7 +260,7 @@ <td>This object can be treated like a usual logger. In case the logging event is serialized and sent to a remote machine, the usual logger object is dropped and replaced by a <code>LoggerRemoteView</code> object, which - performs much better over the wire. + performs much better when serialized. </td> </tr> <tr> @@ -233,84 +310,12 @@ The behaviour of the filter is also defined by its OnMatch and OnMismatch options. The configuration specifies thanks to these elements the replies that the <code>EvaluatorFilter</code> must give once its - expression has been evaluated. The example above returns a positive reply when the - message of the logging event contains the String important. If this String is - not found in the message, then the filter lets the next filter evaluate whether this - logging event should be accepted, or rejected. - - - <h3>Implementing your own Filter</h3> - - - Creating your own filter is not difficult. If your filter doesn't need any evaluation - functionnalities, then all you have to do is extend the <code>Filter</code> abstract class. - The only method that you will have to implement is the <code>decide()</code> method, allowing - you to contentrate only on the behaviour of your filter. - - - - The next class is all it takes to implement one's own filter. All it does is accept - logging events who's message contains the String sample. The filter will give a - neutral response to any logging event who's message does not contain this String. + expression has been evaluated. The example above returns the value <code>FilterReply.ACCEPT</code> + when the message of the logging event contains the String important. + If important is not contained in the message, then the filter lets the next filter + evaluate this logging event. -Example 6.2: Basic custom filter (<a href="../xref/chapter6/SampleFilter.html">logback-examples/src/main/java/chapter6/SampleFilter.java</a>) -<div class="source"><pre>package chapter6; - -import ch.qos.logback.classic.spi.LoggingEvent; -import ch.qos.logback.core.filter.Filter; -import ch.qos.logback.core.spi.FilterReply; - -public class SampleFilter extends Filter { - - @Override - public FilterReply decide(Object eventObject) { - LoggingEvent event = (LoggingEvent)eventObject; - - if (event.getMessage().contains("sample")) { - return FilterReply.ACCEPT; - } else { - return FilterReply.NEUTRAL; - } - } -}</pre></div> - - - What is shown above might be the simplest filter. Like any filter, it - can be attached to any appender using the <Filter> element, as - shown below: - - -Example 6.3: SampleFilter configuration (logback-examples/src/main/java/chapter6/SampleFilterConfig.xml) -<div class="source"><pre><configuration> - <appender name="STDOUT" - class="ch.qos.logback.core.ConsoleAppender"> - <Filter class="chapter6.SampleFilter" /> - - <layout class="ch.qos.logback.classic.PatternLayout"> - <pattern> - %-4relative [%thread] %-5level %logger - %msg%n - </pattern> - </layout> - </appender> - - <root> - <appender-ref ref="STDOUT" /> - </root> -</configuration></pre></div> - - - Thanks to Joran, logback's powerful configuration framework, adding - an option to such a filter is very easy. Just add the corresponding - getter and setter methods in the class, and you can specify the - option's value in a xml element, nested in the filter element. - - - - Creating a filter that makes use of <code>EventEvaluator</code> objects - works the same way, except that one must extend the <code>EvaluatorFilter</code> - class, instead of the <code>Filter</code> class. - <a name="TurboFilter" /> <h3>TurboFilters</h3> @@ -335,20 +340,116 @@ - They are called before the <code>LoggingEvent</code> object creation. Their - decision is made based on some of the logging event's components. They require + More importantly, they are called before the <code>LoggingEvent</code> object creation. + Their decision is made based on some of the logging event's components. They require no logging event instanciation, nor any other treatement to provide their filtering functionnalities. They are much more performant than the usual <code>Filter</code> objects. + <h3>Implementing your own TurboFilter</h3> + + + To create your own <code>TurboFilter</code> component, just extend the + <code>TurboFilter</code> abstract class. As previously, when implementing + a custumized filter object, developing a custom <code>TurboFilter</code> only + ask that one implement the <code>decide()</code> method. In the next example, we + create a slightly more complex filter: + + +Example 6.5: Basic custom <code>TurboFilter</code> (<a href="../xref/chapter6/SampleTurboFilter.html">logback-examples/src/main/java/chapter6/SampleTurboFilter.java</a>) +<div class="source"><pre>package chapter6; + +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.turbo.TurboFilter; +import ch.qos.logback.core.spi.FilterReply; + +public class SampleTurboFilter extends TurboFilter { + + String marker; + Marker markerToAccept; + + @Override + public FilterReply decide(Marker marker, Logger logger, Level level, + String format, Object[] params, Throwable t) { + + if (!isStarted()) { + return FilterReply.NEUTRAL; + } + + if ((markerToAccept.equals(marker))) { + return FilterReply.ACCEPT; + } else { + return FilterReply.NEUTRAL; + } + } + + public String getMarker() { + return marker; + } + + public void setMarker(String markerStr) { + this.marker = markerStr; + } + + @Override + public void start() { + if (marker != null && marker.trim().length() > 0) { + markerToAccept = MarkerFactory.getMarker(marker); + super.start(); + } + } +} +</pre></div> + + + The <code>TurboFilter</code> above accepts events that contain a specific marker. + If said marker is not found, then the filter passes the responsability to + the next filter in the chain. + + + + To allow more flexibility, the marker that will be tested can be specified + in the configuration file. Hence the getter and setter methods. We also implemented + the <code>start()</code> method, to check that the option has been specified during the + configuration process. + + + + Here is a sample configuration that makes use of the newly created <code>TurboFilter</code>. + + +Example 6.5: Basic custom <code>TurboFilter</code> configuration (logback-examples/src/main/java/chapter6/sampleTurboFilterConfig.xml) +<div class="source"><pre><configuration> + <turboFilter class="chapter6.SampleTurboFilter"> + <Marker>sample</Marker> + </turboFilter> + + <appender name="STDOUT" + class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <pattern> + %-4relative [%thread] %-5level %logger - %msg%n + </pattern> + </layout> + </appender> + + <root> + <appender-ref ref="STDOUT" /> + </root> +</configuration></pre></div> + Logback classic ships with several <code>TurboFilter</code> classes ready for use. The <a href="../xref/ch/qos/logback/classic/turbo/MDCFilter.html"><code>MDCFilter</code></a> check the presence of a given value in the MDC. On the other hand, <a href="../xref/ch/qos/logback/classic/turbo/MarkerFilter.html"><code>MarkerFilter</code></a> - checks for the presence of a specific marker attached to the logging request. + checks for the presence of a specific marker associated with the logging request. @@ -397,9 +498,9 @@ just like the configured overall level, except for two requests. The 3rd request, is a DEBUG level corresponding to the key username. This obviously satisfies the first <code>TurboFilter</code> declared in the previous - configuration file. The 6th request is a ERROR level request, - which is issued along with the billing marker, to match - the requests for the second declared <code>TurboFilter</code>. + configuration file. The 6th request, a ERROR level request, + which is issued along with the billing marker, matches + the second <code>TurboFilter</code>. @@ -432,100 +533,7 @@ Thus, the 6th request was not displayed. - - <h3>Implementing your own TurboFilter</h3> - - - To create your own <code>TurboFilter</code> component, just extend the - <code>TurboFilter</code> abstract class. Like previously, when implementing - a custumized filter object, developing a custom <code>TurboFilter</code> only - ask that one implement the <code>decide()</code> method. In the next example, we - create a slightly more complex filter: - - -Example 6.5: Basic custom <code>TurboFilter</code> (<a href="../xref/chapter6/SampleTurboFilter.html">logback-examples/src/main/java/chapter6/SampleTurboFilter.java</a>) -<div class="source"><pre>package chapter6; - -import org.slf4j.Marker; -import org.slf4j.MarkerFactory; - -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.turbo.TurboFilter; -import ch.qos.logback.core.spi.FilterReply; - -public class SampleTurboFilter extends TurboFilter { - - String marker; - Marker acceptedMarker; - - @Override - public FilterReply decide(Marker marker, Logger logger, Level level, - String format, Object[] params, Throwable t) { - - if ((acceptedMarker.equals(marker))) { - return FilterReply.ACCEPT; - } else { - return FilterReply.NEUTRAL; - } - } - - public String getMarker() { - return marker; - } - - public void setMarker(String markerStr) { - this.marker = markerStr; - } - - @Override - public void start() { - if (marker != null && marker.trim().length() > 0) { - acceptedMarker = MarkerFactory.getMarker(marker); - super.start(); - } - } -} -</pre></div> - - - The <code>TurboFilter</code> above accepts events that contain a specific marker. - If said marker is not found, then the filter passes the responsability to - the next filter in the chain. - - - - To allow more flexibility, the marker that will be tested can be specified - in the configuration file. Hence the getter and setter methods. We also implemented - the <code>start()</code> method, to check that the option has been specified during the - configuration process. - - - - Here is a sample configuration that makes use of the newly created <code>TurboFilter</code>. - - -Example 6.5: Basic custom <code>TurboFilter</code> configuration (logback-examples/src/main/java/chapter6/sampleTurboFilterConfig.xml) -<div class="source"><pre><configuration> - <turboFilter class="chapter6.SampleTurboFilter"> - <Marker>sample</Marker> - </turboFilter> - - <appender name="STDOUT" - class="ch.qos.logback.core.ConsoleAppender"> - <layout class="ch.qos.logback.classic.PatternLayout"> - <pattern> - %-4relative [%thread] %-5level %logger - %msg%n - </pattern> - </layout> - </appender> - - <root> - <appender-ref ref="STDOUT" /> - </root> -</configuration></pre></div> - - + <h2>Logback Access</h2> Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/mdc.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/mdc.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/mdc.xml Wed Dec 20 14:54:44 2006 @@ -90,7 +90,7 @@ The <code>MDC</code> class contains only static methods. It lets the developer place information in a diagnostic context that can be subsequently retrieved by certain logback components. The - <code>MDC</code> manages contextual information on a per thread basis. + <code>MDC</code> manages contextual information on a per thread basis. Typically, while starting to service a new client request, the developer will insert pertinent contextual information, such as the client id, client's IP address, request parameters etc. into the <code>MDC</code>. Logback components,

1 0

svn commit: r1136 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.seb＠qos.ch 20 Dec '06

20 Dec '06

Author: seb Date: Wed Dec 20 14:09:26 2006 New Revision: 1136 Modified: logback/trunk/logback-site/src/site/xdocTemplates/access.xml Log: removed duplicate information about PatternLayout Modified: logback/trunk/logback-site/src/site/xdocTemplates/access.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/access.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/access.xml Wed Dec 20 14:09:26 2006 @@ -280,176 +280,14 @@ flexible as the <code>PatternLayout</code> found in logback classic. - - - Logback access <code>PatternLayout</code> offers the following - possibilities: - - <table border="1" CELLPADDING="8"> - <th align="center">Conversion Character or Word</th> - <th align="center">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">l</td> - <td> - - Remote log name. In logback-access, this converter always - returns the value "-". - - </td> - </tr> - - <tr> - <td align="center">reqParameter{paramName}</td> - <td> - - Parameter of the response. 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">i{header} / header{header}</td> - <td> - - Request header. Just like the reqParameter - conversion word, reqParameter can be followed by a key. - - </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{attributeName}</td> - <td> - - Attribute of the request. Just like the reqParameter - conversion word, reqAttribute can be followed by a key. - - </td> - </tr> - <tr> - <td align="center">reqCookie{cookie}</td> - <td> - - Request cookie. Just like the reqParameter - conversion word, reqCookie can be followed by a key. - - </td> - </tr> - <tr> - <td align="center">responseHeader{header}</td> - <td> - - Header of the response. Just like the reqParameter - conversion word, responseHeader can be followed by a key. - - </td> - </tr> - </table> - + + + For detailled instructions on how to use the <code>PatternLayout</code> for + logback access, please refer to the + <a href="manual/layouts.html#AccessPatternLayout">corresponding chapter</a> + of the logback manual. + + <h2>JMX Components</h2> Logback access easily integrates with JMX servers to publish useful information

1 0

svn commit: r1135 - logback/trunk/log4j-bridge/src/main/java/org/apache/log4j
by noreply.seb＠qos.ch 20 Dec '06

20 Dec '06

Author: seb Date: Wed Dec 20 10:34:57 2006 New Revision: 1135 Modified: logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Log4jLoggerFactory.java Log: typed list Modified: logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Log4jLoggerFactory.java ============================================================================== --- logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Log4jLoggerFactory.java (original) +++ logback/trunk/log4j-bridge/src/main/java/org/apache/log4j/Log4jLoggerFactory.java Wed Dec 20 10:34:57 2006 @@ -29,7 +29,7 @@ */ class Log4jLoggerFactory { - private static Hashtable log4jLoggers = new Hashtable(); + private static Hashtable<String, Logger> log4jLoggers = new Hashtable<String, Logger>(); public static synchronized Logger getLogger(String name) { if (log4jLoggers.containsKey(name)) {

1 0

svn commit: r1134 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic logback-classic/src/main/java/ch/qos/logback/classic/jmx logback-classic/src/main/java/ch/qos/logback/classic/joran logback-classic/src/main/java/ch/qos/logback/classic/joran/action logback-classic/src/test/java/ch/qos/logback/classic logback-core/src/main/java/ch/qos/logback/core/boolex logback-core/src/main/java/ch/qos/logback/core/db logback-core/src/main/java/ch/qos/logback/core/html logback-core/src
by noreply.seb＠qos.ch 20 Dec '06

20 Dec '06

Author: seb Date: Wed Dec 20 10:34:41 2006 New Revision: 1134 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/ConfiguratorMBean.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/BasicConfigurator.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AbstractLayoutAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java 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/spi/SimpleRuleStore.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/AbstractPatternLayoutBaseTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java Log: Added a JMCConfigurator that allows reload and level setting (->Work in progress) Refactored the way that we load classes: we now use the context's classloader. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/BasicConfigurator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/BasicConfigurator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/BasicConfigurator.java Wed Dec 20 10:34:41 2006 @@ -13,10 +13,21 @@ import org.slf4j.LoggerFactory; import ch.qos.logback.core.ConsoleAppender; +import ch.qos.logback.core.status.InfoStatus; +import ch.qos.logback.core.status.StatusManager; public class BasicConfigurator { + final static BasicConfigurator hiddenSingleton = new BasicConfigurator(); + + private BasicConfigurator() { + } + public static void configure(LoggerContext lc) { + StatusManager sm = lc.getStatusManager(); + if(sm != null) { + sm.add(new InfoStatus("Setting up default configuration.", hiddenSingleton)); + } ConsoleAppender ca = new ConsoleAppender(); ca.setContext(lc); ca.setName("console"); Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java Wed Dec 20 10:34:41 2006 @@ -0,0 +1,56 @@ +package ch.qos.logback.classic.jmx; + +import java.net.URL; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.classic.util.ContextInitializer; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.spi.ContextAwareBase; + +public class Configurator extends ContextAwareBase implements + ConfiguratorMBean { + + public Configurator(LoggerContext loggerContext) { + this.context = loggerContext; + } + + public void reload() { + LoggerContext lc = (LoggerContext) context; + addInfo("Shutting down context: " + lc.getName()); + lc.shutdownAndReset(); + ContextInitializer.autoConfig(lc, lc.getClass().getClassLoader()); + addInfo("Context: " + lc.getName() + " reloaded."); + } + + public void reload(String fileName) throws JoranException { + LoggerContext lc = (LoggerContext) context; + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(lc); + configurator.doConfigure(fileName); + } + + public void reload(URL url) throws JoranException { + LoggerContext lc = (LoggerContext) context; + addInfo("Shutting down context: " + lc.getName()); + lc.shutdownAndReset(); + ContextInitializer.configureByResource(lc, url); + addInfo("Context: " + lc.getName() + " reloaded."); + } + + public void setLoggerLevel(String loggerName, String levelStr) { + LoggerContext lc = (LoggerContext) context; + Logger logger = lc.getLogger(loggerName); + if ("null".equalsIgnoreCase(levelStr)) { + logger.setLevel(null); + } else { + Level level = Level.toLevel(levelStr, null); + if (level != null) { + logger.setLevel(level); + } + } + } + +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/ConfiguratorMBean.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/ConfiguratorMBean.java Wed Dec 20 10:34:41 2006 @@ -0,0 +1,17 @@ +package ch.qos.logback.classic.jmx; + +import java.net.URL; + +import ch.qos.logback.core.joran.spi.JoranException; + +public interface ConfiguratorMBean { + + public void reload(); + + public void reload(String fileName) throws JoranException; + + public void reload(URL url) throws JoranException; + + public void setLoggerLevel(String loggerName, String levelStr); + +} 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 Wed Dec 20 10:34:41 2006 @@ -12,6 +12,7 @@ import ch.qos.logback.classic.joran.action.ConfigurationAction; import ch.qos.logback.classic.joran.action.EvaluatorAction; +import ch.qos.logback.classic.joran.action.JMXConfiguratorAction; import ch.qos.logback.classic.joran.action.LayoutAction; import ch.qos.logback.classic.joran.action.LevelAction; import ch.qos.logback.classic.joran.action.LoggerAction; @@ -55,6 +56,8 @@ rs .addRule(new Pattern("configuration/appender/layout"), new LayoutAction()); + + rs.addRule(new Pattern("configuration/jmxConfigurator"), new JMXConfiguratorAction()); } } Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java Wed Dec 20 10:34:41 2006 @@ -0,0 +1,51 @@ +package ch.qos.logback.classic.joran.action; + +import java.lang.management.ManagementFactory; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.xml.sax.Attributes; + +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.jmx.Configurator; +import ch.qos.logback.classic.jmx.ConfiguratorMBean; +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.spi.ActionException; +import ch.qos.logback.core.joran.spi.InterpretationContext; + +public class JMXConfiguratorAction extends Action { + + static final String DOMAIN = "ch.qos.logback.classic"; + + @Override + public void begin(InterpretationContext ec, String name, Attributes attributes) + throws ActionException { + register(); + } + + @Override + public void end(InterpretationContext ec, String name) throws ActionException { + + } + + public void register() { + ConfiguratorMBean configuratorMBean = new Configurator((LoggerContext) context); + + MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + try { + ObjectName on = new ObjectName(DOMAIN + ":Name=" + context.getName() + + ",Type=" + configuratorMBean.getClass().getName()); + + // StandardMBean mbean = new StandardMBean(configuratorMBean, + // ConfiguratorMBean.class); + if (mbs.isRegistered(on)) { + mbs.unregisterMBean(on); + } + mbs.registerMBean(configuratorMBean, on); + } catch (Exception e) { + addError("Failed to create mbean", e); + } + } + +} Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java Wed Dec 20 10:34:41 2006 @@ -28,7 +28,7 @@ public class PatternLayoutTest extends AbstractPatternLayoutBaseTest { - LoggerContext lc = new LoggerContext(); + LoggerContext lc = new LoggerContext(); Logger logger = lc.getLogger(ConverterTest.class); LoggingEvent le; List optionList = new ArrayList(); @@ -118,4 +118,9 @@ suite.addTestSuite(PatternLayoutTest.class); return suite; } + + @Override + public Context getContext() { + return lc; + } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java Wed Dec 20 10:34:41 2006 @@ -48,8 +48,10 @@ public void start() { try { + assert context != null; + ClassLoader cl = context.getClass().getClassLoader(); ee = new ExpressionEvaluator(getDecoratedExpression(), EXPRESSION_TYPE, - getParameterNames(), getParameterTypes(), THROWN_EXCEPTIONS, null); + getParameterNames(), getParameterTypes(), THROWN_EXCEPTIONS, cl); start = true; } catch (Exception e) { addError( Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java Wed Dec 20 10:34:41 2006 @@ -55,7 +55,7 @@ try { DataSource ds = - (DataSource) OptionHelper.instantiateByClassName(dsClassName, DataSource.class); + (DataSource) OptionHelper.instantiateByClassName(dsClassName, DataSource.class, context); PropertySetter setter = new PropertySetter(ds); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java Wed Dec 20 10:34:41 2006 @@ -71,9 +71,7 @@ try { Parser p = new Parser(pattern); - if (getContext() != null) { - p.setStatusManager(getContext().getStatusManager()); - } + p.setContext(getContext()); Node t = p.parse(); this.head = p.compile(t, getDefaultConverterMap()); DynamicConverter.startConverters(this.head); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java Wed Dec 20 10:34:41 2006 @@ -59,7 +59,7 @@ try { evaluator = (EventEvaluator) OptionHelper.instantiateByClassName( - className, ch.qos.logback.core.boolex.EventEvaluator.class); + className, ch.qos.logback.core.boolex.EventEvaluator.class, context); if(isOfCorrectType(evaluator)) { evaluator.setContext(this.context); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AbstractLayoutAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AbstractLayoutAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AbstractLayoutAction.java Wed Dec 20 10:34:41 2006 @@ -38,7 +38,7 @@ try { layout = (Layout) OptionHelper.instantiateByClassName( - className, ch.qos.logback.core.Layout.class); + className, ch.qos.logback.core.Layout.class, context); if(isOfCorrectType(layout)) { layout.setContext(this.context); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java Wed Dec 20 10:34:41 2006 @@ -43,7 +43,7 @@ addInfo("About to instantiate appender of type ["+className+"]"); appender = (Appender) OptionHelper.instantiateByClassName( - className, ch.qos.logback.core.Appender.class); + className, ch.qos.logback.core.Appender.class, context); appender.setContext(context); 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 Wed Dec 20 10:34:41 2006 @@ -103,7 +103,8 @@ // className); // FIXME: Loading classes should be governed by config file rules. - actionData.nestedComponent = Loader.loadClass(className).newInstance(); + + actionData.nestedComponent = Loader.loadClass(className, context).newInstance(); // pass along the repository if (actionData.nestedComponent instanceof ContextAware) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java Wed Dec 20 10:34:41 2006 @@ -57,7 +57,7 @@ try { action = (Action) OptionHelper.instantiateByClassName( - actionClassName, Action.class); + actionClassName, Action.class, context); } catch(Exception e) { addError("Could not instantiate class ["+actionClassName+"]", e); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java Wed Dec 20 10:34:41 2006 @@ -72,7 +72,7 @@ try { Parser p = new Parser(pattern); if (getContext() != null) { - p.setStatusManager(getContext().getStatusManager()); + p.setContext(getContext()); } Node t = p.parse(); this.head = p.compile(t, getEffectiveConverterMap()); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java Wed Dec 20 10:34:41 2006 @@ -15,19 +15,17 @@ import ch.qos.logback.core.pattern.Converter; import ch.qos.logback.core.pattern.DynamicConverter; import ch.qos.logback.core.pattern.LiteralConverter; +import ch.qos.logback.core.spi.ContextAwareBase; import ch.qos.logback.core.status.ErrorStatus; -import ch.qos.logback.core.status.Status; -import ch.qos.logback.core.status.StatusManager; import ch.qos.logback.core.util.OptionHelper; -class Compiler { +class Compiler extends ContextAwareBase { Converter head; Converter tail; final Node top; final Map converterMap; - StatusManager statusManager; Compiler(final Node top, final Map converterMap) { this.top = top; @@ -45,8 +43,9 @@ CompositeNode cn = (CompositeNode) n; CompositeConverter compositeConverter = new CompositeConverter(); compositeConverter.setFormattingInfo(cn.getFormatInfo()); - Converter childConverter = new Compiler(cn.getChildNode(), converterMap) - .compile(); + Compiler childCompiler = new Compiler(cn.getChildNode(), converterMap); + childCompiler.setContext(context); + Converter childConverter = childCompiler.compile(); compositeConverter.setChildConverter(childConverter); addToList(compositeConverter); break; @@ -94,7 +93,7 @@ if (converterClassStr != null) { try { return (DynamicConverter) OptionHelper.instantiateByClassName( - converterClassStr, DynamicConverter.class); + converterClassStr, DynamicConverter.class, context); } catch (Exception e) { return null; } @@ -103,13 +102,13 @@ } } - public void setStatusManager(StatusManager statusManager) { - this.statusManager = statusManager; - } - - void addStatus(Status status) { - if(statusManager != null) { - statusManager.add(status); - } - } +// public void setStatusManager(StatusManager statusManager) { +// this.statusManager = statusManager; +// } +// +// void addStatus(Status status) { +// if(statusManager != null) { +// statusManager.add(status); +// } +// } } \ No newline at end of file Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java Wed Dec 20 10:34:41 2006 @@ -5,12 +5,11 @@ import ch.qos.logback.core.pattern.Converter; import ch.qos.logback.core.pattern.FormatInfo; -import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.spi.ContextAwareBase; -public class Parser { +public class Parser extends ContextAwareBase { - StatusManager statusManager; final List tokenList; int pointer = 0; @@ -42,7 +41,8 @@ */ public Converter compile(final Node top, Map converterMap) { Compiler compiler = new Compiler(top, converterMap); - compiler.setStatusManager(statusManager); + compiler.setContext(context); + //compiler.setStatusManager(statusManager); return compiler.compile(); } @@ -185,7 +185,7 @@ } } - public void setStatusManager(StatusManager statusManager) { - this.statusManager = statusManager; - } +// public void setStatusManager(StatusManager statusManager) { +// this.statusManager = statusManager; +// } } \ No newline at end of file Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java Wed Dec 20 10:34:41 2006 @@ -53,7 +53,7 @@ void parse() { try { Parser p = new Parser(pattern); - p.setStatusManager(getStatusManager()); + p.setContext(context); Node t = p.parse(); this.headTokenConverter = p.compile(t, CONVERTER_MAP); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java Wed Dec 20 10:34:41 2006 @@ -11,6 +11,8 @@ import java.net.URL; +import ch.qos.logback.core.Context; + /** * Load resources (or images) from various sources. * @@ -31,6 +33,7 @@ } } + /** * This method will search for <code>resource</code> in different places. * The search order is as follows: @@ -74,6 +77,10 @@ return Thread.currentThread().getContextClassLoader(); } + public static Class loadClass(String clazz, Context context) throws ClassNotFoundException { + ClassLoader cl = context.getClass().getClassLoader(); + return cl.loadClass(clazz); + } /** * If running under JDK 1.2 load the specified class using the * <code>Thread</code> <code>contextClassLoader</code> if that fails try Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java Wed Dec 20 10:34:41 2006 @@ -11,6 +11,7 @@ import java.util.Map; +import ch.qos.logback.core.Context; import ch.qos.logback.core.CoreGlobal; /** @@ -18,8 +19,15 @@ */ public class OptionHelper { + public static Object instantiateByClassName(String className, + Class superClass, Context context) throws IncompatibleClassException, DynamicClassLoadingException { + ClassLoader classLoader = context.getClass().getClassLoader(); + return instantiateByClassName(className, superClass, classLoader); + } + @SuppressWarnings("unchecked") - public static Object instantiateByClassName(String className, Class superClass) + public static Object instantiateByClassName(String className, + Class superClass, ClassLoader classLoader) throws IncompatibleClassException, DynamicClassLoadingException { if (className == null) { @@ -27,15 +35,8 @@ } try { - // FIXME This is temporary (really!). Class classObj = null; - try { - classObj = Class.forName(className); - } catch (ClassNotFoundException e) { - ClassLoader cccl = Thread.currentThread().getContextClassLoader(); - classObj = cccl.loadClass(className); - } - + classObj = classLoader.loadClass(className); if (!superClass.isAssignableFrom(classObj)) { throw new IncompatibleClassException(superClass, classObj); } @@ -43,7 +44,8 @@ } catch (IncompatibleClassException ice) { throw ice; } catch (Throwable t) { - throw new DynamicClassLoadingException("Failed to instantiate type "+className, t); + throw new DynamicClassLoadingException("Failed to instantiate type " + + className, t); } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/AbstractPatternLayoutBaseTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/AbstractPatternLayoutBaseTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/AbstractPatternLayoutBaseTest.java Wed Dec 20 10:34:41 2006 @@ -28,6 +28,7 @@ abstract public PatternLayoutBase getPatternLayoutBase(); abstract public Object getEventObject(); + abstract public Context getContext(); public void testUnStarted() { PatternLayoutBase plb = getPatternLayoutBase(); @@ -46,6 +47,7 @@ */ public void testConverterStart() { PatternLayoutBase plb = getPatternLayoutBase(); + plb.setContext(getContext()); plb.getInstanceConverterMap().put("EX", ExceptionalConverter.class.getName()); plb.setPattern("%EX"); plb.start(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java Wed Dec 20 10:34:41 2006 @@ -13,21 +13,20 @@ import java.util.Map; import junit.framework.TestCase; - -import ch.qos.logback.core.BasicStatusManager; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.pattern.Converter; import ch.qos.logback.core.pattern.Converter123; import ch.qos.logback.core.pattern.ConverterHello; -import ch.qos.logback.core.pattern.parser.Node; -import ch.qos.logback.core.pattern.parser.Parser; import ch.qos.logback.core.status.StatusChecker; -import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.util.StatusPrinter; public class CompilerTest extends TestCase { Map<String, String> converterMap = new HashMap<String, String>(); - + Context context = new ContextBase(); + public CompilerTest(String arg0) { super(arg0); converterMap.put("OTT", Converter123.class.getName()); @@ -63,6 +62,7 @@ public void testBasic() throws Exception { { Parser p = new Parser("abc %hello"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -70,6 +70,7 @@ } { Parser p = new Parser("abc %hello %OTT"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -80,6 +81,7 @@ public void testFormat() throws Exception { { Parser p = new Parser("abc %7hello"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -88,6 +90,7 @@ { Parser p = new Parser("abc %-7hello"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -96,6 +99,7 @@ { Parser p = new Parser("abc %.3hello"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -104,6 +108,7 @@ { Parser p = new Parser("abc %.-3hello"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -112,6 +117,7 @@ { Parser p = new Parser("abc %4.5OTT"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -119,6 +125,7 @@ } { Parser p = new Parser("abc %-4.5OTT"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -126,6 +133,7 @@ } { Parser p = new Parser("abc %3.4hello"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -133,6 +141,7 @@ } { Parser p = new Parser("abc %-3.-4hello"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -141,22 +150,27 @@ } public void testComposite() throws Exception { +// { +// Parser p = new Parser("%(ABC)"); +// p.setContext(context); +// Node t = p.parse(); +// Converter head = p.compile(t, converterMap); +// String result = write(head, new Object()); +// assertEquals("ABC", result); +// } { - Parser p = new Parser("%(ABC)"); - Node t = p.parse(); - Converter head = p.compile(t, converterMap); - String result = write(head, new Object()); - assertEquals("ABC", result); - } - { + Context c = new ContextBase(); Parser p = new Parser("%(ABC %hello)"); + p.setContext(c); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); + StatusPrinter.print(c); assertEquals("ABC Hello", result); } { Parser p = new Parser("%(ABC %hello)"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -167,6 +181,7 @@ public void testCompositeFormatting() throws Exception { { Parser p = new Parser("xyz %4.10(ABC)"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -175,6 +190,7 @@ { Parser p = new Parser("xyz %-4.10(ABC)"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -183,6 +199,7 @@ { Parser p = new Parser("xyz %.2(ABC %hello)"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -191,6 +208,7 @@ { Parser p = new Parser("xyz %.-2(ABC)"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -199,6 +217,7 @@ { Parser p = new Parser("xyz %30.30(ABC %20hello)"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); @@ -208,11 +227,10 @@ public void testUnknownWord() throws Exception { Parser p = new Parser("%unknown"); - StatusManager sm = new BasicStatusManager(); - p.setStatusManager(sm); + p.setContext(context); Node t = p.parse(); p.compile(t, converterMap); - StatusChecker chercker = new StatusChecker(sm); + StatusChecker chercker = new StatusChecker(context.getStatusManager()); assertTrue(chercker .containsMatch("\\[unknown] is not a valid conversion word")); } @@ -220,6 +238,7 @@ public void testWithNopEscape() throws Exception { { Parser p = new Parser("xyz %hello\\_world"); + p.setContext(context); Node t = p.parse(); Converter head = p.compile(t, converterMap); String result = write(head, new Object()); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java Wed Dec 20 10:34:41 2006 @@ -16,10 +16,12 @@ public class SamplePatternLayoutTest extends AbstractPatternLayoutBaseTest { + Context context = new ContextBase(); public SamplePatternLayoutTest(String arg) { super(arg); } + public PatternLayoutBase getPatternLayoutBase() { return new SamplePatternLayout(); } @@ -42,4 +44,9 @@ assertEquals("x123", s); } + + @Override + public Context getContext() { + return context; + } }

1 0

svn commit: r1133 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util
by noreply.ceki＠qos.ch 19 Dec '06

19 Dec '06

Author: ceki Date: Tue Dec 19 21:42:35 2006 New Revision: 1133 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Log: ongoing refactoring Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Tue Dec 19 21:42:35 2006 @@ -24,12 +24,10 @@ configurator.doConfigure(url); } - public static void autoConfig(LoggerContext loggerContext) { - - ClassLoader tccl = Loader.getTCL(); - URL url = Loader.getResource(AUTOCONFIG_FILE, tccl); + public static void autoConfig(LoggerContext loggerContext, ClassLoader classLoader) { + URL url = Loader.getResource(AUTOCONFIG_FILE, classLoader); if (url == null) { - url = Loader.getResource(TEST_AUTOCONFIG_FILE, tccl); + url = Loader.getResource(TEST_AUTOCONFIG_FILE, classLoader); } if (url != null) { @@ -42,4 +40,10 @@ BasicConfigurator.configure(loggerContext); } } + + public static void autoConfig(LoggerContext loggerContext) { + ClassLoader tccl = Loader.getTCL(); + autoConfig(loggerContext, tccl); + + } }

1 0

svn commit: r1132 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/util logback-core/src/main/java/ch/qos/logback/core/util
by noreply.ceki＠qos.ch 19 Dec '06

19 Dec '06

Author: ceki Date: Tue Dec 19 21:40:25 2006 New Revision: 1132 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java Log: Simplified Loader.getResource method Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Tue Dec 19 21:40:25 2006 @@ -26,9 +26,10 @@ public static void autoConfig(LoggerContext loggerContext) { - URL url = Loader.getResource(AUTOCONFIG_FILE); + ClassLoader tccl = Loader.getTCL(); + URL url = Loader.getResource(AUTOCONFIG_FILE, tccl); if (url == null) { - url = Loader.getResource(TEST_AUTOCONFIG_FILE); + url = Loader.getResource(TEST_AUTOCONFIG_FILE, tccl); } if (url != null) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java Tue Dec 19 21:40:25 2006 @@ -44,8 +44,8 @@ * parameter is false.</li> * * - * <li>If the above step fails, search for <code>resource</code> using - * the class loader that loaded this class (<code>Loader</code>).</li> + * <li>If the above step fails, search for <code>resource</code> using the + * class loader that loaded this class (<code>Loader</code>).</li> * * * <li>Try one last time with @@ -55,61 +55,22 @@ * * </ol> */ - public static URL getResource(String resource) { - ClassLoader classLoader = null; - URL url = null; - + public static URL getResource(String resource, ClassLoader classLoader) { try { - classLoader = getTCL(); - - if (classLoader != null) { - // LogLog.debug( - // "Trying to find [" + resource + "] using context classloader " - // + classLoader + "."); - url = classLoader.getResource(resource); - - if (url != null) { - return url; - } - } - - // We could not find resource. Ler us now try with the - // classloader that loaded this class. - classLoader = Loader.class.getClassLoader(); - - if (classLoader != null) { - // LogLog.debug( - // "Trying to find [" + resource + "] using " + classLoader - // + " class loader."); - url = classLoader.getResource(resource); - - if (url != null) { - return url; - } - } + return classLoader.getResource(resource); } catch (Throwable t) { - // LogLog.warn(TSTR, t); + return null; } - // Last ditch attempt: get the resource from the class path. It - // may be the case that clazz was loaded by the Extentsion class - // loader which the parent of the system class loader. Hence the - // code below. - // LogLog.debug( - // "Trying to find [" + resource - // + "] using ClassLoader.getSystemResource()."); - - return ClassLoader.getSystemResource(resource); } - /** * Get the Thread Context Loader which is a JDK 1.2 feature. If we are running * under JDK 1.1 or anything else goes wrong the method returns * <code>null<code>. * */ - private static ClassLoader getTCL() { + public static ClassLoader getTCL() { return Thread.currentThread().getContextClassLoader(); }

1 0

svn commit: r1131 - in logback/trunk: log4j-bridge/compatibility logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 19 Dec '06

19 Dec '06

Author: seb Date: Tue Dec 19 20:17:24 2006 New Revision: 1131 Modified: logback/trunk/log4j-bridge/compatibility/build.xml logback/trunk/logback-site/src/site/xdocTemplates/manual/joran.xml Log: on going work on chapter 3 minor fix on build.xml Modified: logback/trunk/log4j-bridge/compatibility/build.xml ============================================================================== --- logback/trunk/log4j-bridge/compatibility/build.xml (original) +++ logback/trunk/log4j-bridge/compatibility/build.xml Tue Dec 19 20:17:24 2006 @@ -80,7 +80,7 @@ <javac srcdir="${source.home}" destdir="${javac.dest.12}" includes="**/Log4j12Calls.java" - deprecation="${deprecation}" debug="on"> + deprecation="${deprecation}" debug="on"> <classpath refid="log4j12.classpath" /> </javac> </target> Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/joran.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/joran.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/joran.xml Tue Dec 19 20:17:24 2006 @@ -739,6 +739,33 @@ <h4>Configuring Loggers</h4> +Loggers are configured using logger elements. A logger element takes exactly +one mandatory name atttribute and an optional additivity attribute, which takes values +true or false. The logger element admits at most one level +element which is discussed next. It may also contain zero or more appender-ref elements; +each appender thus referenced is added to the named logger. It is important to keep mind that +each named logger that is declared with a logger element first has all its +appenders removed and only then are the referenced appenders attached to it. +In particular, if there are no appender references, then the named logger will +lose all its appenders. + + + +The level element is used to set logger levels. It admits two attributes +value and class. The value attribute can be one of the strings DEBUG, +INFO, WARN ERROR, ALL or OFF. +The special case-insensitive value INHERITED, or its synonym NULL, +will force the level of the logger to be inherited from higher up in the hierarchy. +Note that the level of the root logger cannot be inherited. +If you set the level of a logger and later decide that it should inherit +its level, then you need to specify INHERITED or its synonym NULL +as the level value. The class attribute allows you to specify a custom +level where the value of the attribute is the fully qualified name of a +custom level class. You may alternatively use the level#classname syntax within +the value attribute. The level element has no children. + + + Setting the level of a logger is as simple as declaring it and setting its level, as the next example illustrates. Suppose we are no longer interested in seeing any <code>DEBUG</code> level logs from any component @@ -877,7 +904,7 @@ %lt;logger name="chapter3"> %lt;level value="INFO" /> - %lt;/logger> + %lt;/logger> %lt;root> %lt;level value="OFF" /> @@ -941,6 +968,18 @@ <h4>Configuring Appenders + multiple + additivity</h4> + + + + + + + + + + + + <h4>Variable substitution</h4> <h4></h4>

1 0

svn commit: r1130 - logback/trunk/log4j-bridge/compatibility
by noreply.ceki＠qos.ch 19 Dec '06

19 Dec '06

Author: ceki Date: Tue Dec 19 19:50:54 2006 New Revision: 1130 Modified: logback/trunk/log4j-bridge/compatibility/build.xml Log: added refresh target Modified: logback/trunk/log4j-bridge/compatibility/build.xml ============================================================================== --- logback/trunk/log4j-bridge/compatibility/build.xml (original) +++ logback/trunk/log4j-bridge/compatibility/build.xml Tue Dec 19 19:50:54 2006 @@ -1,11 +1,12 @@ <project name="testing-log4j-bridge" default="usage" basedir="."> + <property name="lbversion" value="0.8-SNAPSHOT" /> + <property name="slf4jversion" value="1.1.0-RC1" /> <property name="source.home" value="./src/main/java/" /> <property name="javac.dest.12" value="./target/classes12/" /> <property name="javac.dest.13" value="./target/classes13/" /> <property name="lib" value="./lib" /> - <property name="version" value="1.0" /> <property name="deprecation" value="on" /> <path id="basic.classpath"> @@ -27,10 +28,10 @@ <path id="log4-bridge.classpath"> <path refid="basic.classpath" /> - <pathelement location="${lib}/log4j-bridge-0.7.1.jar" /> - <pathelement location="${lib}/logback-classic-0.7.1.jar" /> - <pathelement location="${lib}/logback-core-0.7.1.jar" /> - <pathelement location="${lib}/slf4j-api-1.1.0-RC1.jar" /> + <pathelement location="${lib}/log4j-bridge-${lbversion}.jar" /> + <pathelement location="${lib}/logback-classic-${lbversion}.jar" /> + <pathelement location="${lib}/logback-core-${lbversion}.jar" /> + <pathelement location="${lib}/slf4j-api-${slf4jversion}.jar" /> </path>  @@ -41,10 +42,28 @@ These are some of the targets supported by this ANT build scpript: all - run all available tests - + refresh - copy required jar files to the lib directory </echo> </target> + <delete> + <fileset dir="." includes="**/*.bak"/> + </delete> + + <target name="refresh"> + <delete> + <fileset dir="lib"> + <include name="logback-*.jar"/> + <include name="log4j-bridge-*.jar"/> + </fileset> + </delete> + <copy file="../../logback-core/target/logback-core-${lbversion}.jar" todir="lib/"/> + <copy file="../../logback-classic/target/logback-classic-${lbversion}.jar" todir="lib/"/> + <copy file="../target/log4j-bridge-${lbversion}.jar" todir="lib/"/> + + </target> + + <target name="init"> <mkdir dir="${javac.dest.12}" /> <mkdir dir="${javac.dest.13}" />

1 0