Author: ceki Date: Fri May 4 15:27:20 2007 New Revision: 1526 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java logback/trunk/logback-site/src/site/pages/manual/index.html logback/trunk/logback-site/src/site/pages/manual/layouts.html logback/trunk/logback-site/src/site/pages/templates/right.js Log: Fixing bug 70 involving the %throwable conversion word. http://bugzilla.qos.ch/show_bug.cgi?id=70 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 Fri May 4 15:27:20 2007 @@ -94,7 +94,9 @@ .put("ex", ThrowableInformationConverter.class.getName()); defaultConverterMap.put("exception", ThrowableInformationConverter.class .getName()); - + defaultConverterMap.put("throwable", ThrowableInformationConverter.class + .getName()); + defaultConverterMap.put("nopex", NopThrowableInformationConverter.class .getName()); defaultConverterMap.put("nopexception", Modified: logback/trunk/logback-site/src/site/pages/manual/index.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/index.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/index.html Fri May 4 15:27:20 2007 @@ -14,7 +14,7 @@ <script src="../templates/left.js"></script> </div> <div id="right"> - <script src="../templates/right.js"></script> + <script src="index_menu.js"></script> </div> <div id="content"> Modified: logback/trunk/logback-site/src/site/pages/manual/layouts.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/layouts.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/layouts.html Fri May 4 15:27:20 2007 @@ -385,13 +385,14 @@ </p> <table class="bodyTable" border="0" CELLPADDING="8"> - <th>Conversion Word</th> - <th>Effect</th> + <tr> + <th>Conversion Word</th> + <th>Effect</th> + </tr> <tr class="b"> <td align="center"> - <b>c</b>{<em>length</em>} <br /> - <b>l</b>{<em>length</em>} <br /> + <b>c</b>{<em>length</em>} <br /> <b>lo</b>{<em>length</em>} <br /> <b>logger</b>{<em>length</em>} <br /> </td> @@ -719,17 +720,29 @@ <tr class="a"> <td align="center"> <b>ex</b>{<em>length</em>} <br /> + <b>exception</b>{<em>length</em>} <br /> <b>throwable</b>{<em>length</em>} <br /> + <br /> <b>ex</b>{length, evaluator-1, ..., evaluator-n} <br /> + <b>exception</b>{length, evaluator-1, ..., evaluator-n} <br /> <b>throwable</b>{length, evaluator-1, ..., evaluator-n} </td> <td> - <p> - Used to output the stack trace of the exception associated - with the logging event, if any. By default the full stack trace - will be output. + <p>Used to output the stack trace of the exception + associated with the logging event, if any. By default the + full stack trace will be output. </p> + + <p>If you do not specify the %ex conversion word (or one of + its aliases) in the conversion pattern, + <code>PatternLayout</code> will automatically add it as the + last conversion word, on account of the importance of stack + trace information. The $nopex conversion word can be + substituted for %ex, in case you do not wish stack trace + information to be displayed. See also %nopex conversion word. + </p> + <p>The <em>throwable</em> conversion word can followed by one of the following options: </p> @@ -786,25 +799,43 @@ <tr class="b"> <td align="center"> - <b>marker</b> + <b>nopex</b> <br /> + <b>nopexception</b> </td> <td> - <p>Used to output the marker associated with the logger - request. + <p>Altough it pretends to handle stack trace data, this + conversion word does not output any data, thus, effectively + ignoring exceptions. </p> - <p> - If there is a single marker available, its name is displayed. - In case the marker has children markers, the converter displays - the parent's and children's names as shown below. + <p>The %nopex conversion word allows the user to override + PatternLayout's internal safety mechanism which silently + adds %ex conversion keyword, even it was not specified in + the conversion pattern. + </p> + </td> + </tr> + + <tr class="a"> + <td align="center"> + <b>marker</b> + </td> + + <td> + <p>Used to output the marker associated with the logger + request.</p> + + <p>In case the marker contains children markers, the + converter displays the parent as well as childrens' names + according to the format shown below. </p> <p> <em>parentName [ child1, child2 ]</em> </p> </td> </tr> - <tr class="a"> + <tr class="b"> <td align="center"> <b>%</b> Modified: logback/trunk/logback-site/src/site/pages/templates/right.js ============================================================================== --- logback/trunk/logback-site/src/site/pages/templates/right.js (original) +++ logback/trunk/logback-site/src/site/pages/templates/right.js Fri May 4 15:27:20 2007 @@ -3,6 +3,10 @@ document.write('<p class="menu_header">New and noteworthy</p>') +document.write('<p class="menu"><a href="http://wizardforge.org/pc?action=showVersion&id=72">Configuration Wizard</a>') + +http://wizardforge.org/pc?action=showVersion&id=72 + document.write('<p class="menu"><a href="http://www.javadonkey.com/blog/log4j-isdebugenabled-logback/">isDebugEnabled()</a>') document.write('<p class="menu"><a href="http://xhab.blogspot.com/2007/03/new-logging-experience.html">A new logging experience!</a>')