Modified: logging/log4php/trunk/src/site/xdoc/docs/filters.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/filters.xml?rev=1243254&r1=1243253&r2=1243254&view=diff ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/filters.xml (original) +++ logging/log4php/trunk/src/site/xdoc/docs/filters.xml Sun Feb 12 14:00:02 2012 @@ -51,13 +51,14 @@ <p>Here is a configuration example:</p> - <ul class="tabs"> - <li class="active"><a href="#xml">XML</a></li> - <li><a href="#php">PHP</a></li> - </ul> + <div class="auto-tabs"> + <ul> + <li>XML</li> + <li>PHP</li> + </ul> - <div class="pill-content" > - <div class="active" id="xml"> + <div class="tab-content" > + <div class="tab-pane"> <pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="defualt" class="LoggerAppenderEcho"> @@ -78,8 +79,8 @@ </configuration> ]]></pre> - </div> - <div id="php"> + </div> + <div class="tab-pane"> <pre class="prettyprint linenums"><![CDATA[ array( 'appenders' => array( @@ -111,6 +112,7 @@ array( ) ) ]]></pre> + </div> </div> </div>
Modified: logging/log4php/trunk/src/site/xdoc/docs/introduction.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/introduction.xml?rev=1243254&r1=1243253&r2=1243254&view=diff ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/introduction.xml (original) +++ logging/log4php/trunk/src/site/xdoc/docs/introduction.xml Sun Feb 12 14:00:02 2012 @@ -46,49 +46,53 @@ <p>Layouts are components responsible for transforming a logging event into a string. Most appender classes require a layout class to convert the event to a string so that it can be logged.</p> </subsection> - </section> - <section name="Levels" id ="Levels"> - <p>A level describes the severity of a logging message. There are six levels, show here in descending order - of severity.</p> - - <table> - <tr> - <th>Level</th> - <th>Severity</th> - <th>Description</th> - </tr> - <tr> - <td>FATAL</td> - <td>Highest</td> - <td>Very severe error events that will presumably lead the application to abort.</td> - </tr> - <tr> - <td>ERROR</td> - <td>...</td> - <td>Error events that might still allow the application to continue running.</td> - </tr> - <tr> - <td>WARN</td> - <td>...</td> - <td>Potentially harmful situations which still allow the application to continue running.</td> - </tr> - <tr> - <td>INFO</td> - <td>...</td> - <td>Informational messages that highlight the progress of the application at coarse-grained level.</td> - </tr> - <tr> - <td>DEBUG</td> - <td>...</td> - <td>Fine-grained informational events that are most useful to debug an application.</td> - </tr> - <tr> - <td>TRACE</td> - <td>Lowest</td> - <td>Finest-grained informational events.</td> - </tr> - </table> + <subsection name="Levels" id ="Levels"> + <p>A level describes the severity of a logging message. There are six levels, show here in descending order + of severity.</p> + + <table> + <thead> + <tr> + <th>Level</th> + <th>Severity</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>FATAL</td> + <td>Highest</td> + <td>Very severe error events that will presumably lead the application to abort.</td> + </tr> + <tr> + <td>ERROR</td> + <td>...</td> + <td>Error events that might still allow the application to continue running.</td> + </tr> + <tr> + <td>WARN</td> + <td>...</td> + <td>Potentially harmful situations which still allow the application to continue running.</td> + </tr> + <tr> + <td>INFO</td> + <td>...</td> + <td>Informational messages that highlight the progress of the application at coarse-grained level.</td> + </tr> + <tr> + <td>DEBUG</td> + <td>...</td> + <td>Fine-grained informational events that are most useful to debug an application.</td> + </tr> + <tr> + <td>TRACE</td> + <td>Lowest</td> + <td>Finest-grained informational events.</td> + </tr> + </tbody> + </table> + </subsection> </section> </body> </document> Added: logging/log4php/trunk/src/site/xdoc/docs/layouts.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/layouts.xml?rev=1243254&view=auto ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/layouts.xml (added) +++ logging/log4php/trunk/src/site/xdoc/docs/layouts.xml Sun Feb 12 14:00:02 2012 @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"> + + <properties> + <title>Layouts</title> + </properties> + + <body> + <section name="Layouts"> + + <p>Layouts are components responsible for transforming a logging event into a string.</p> + + <p>More often than not, users wish to customize not only the output destination but also the output format. This is + accomplished by associating a layout with an appender. All messages logged by that appender will use the given layout.</p> + + <subsection name="Layout reference" id="Layout_reference"> + + <p>The following layout classes are available:</p> + + <table> + <thead> + <tr> + <th>Name</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td><a href="layouts/html.html">LoggerLayoutHTML</a></td> + <td> Outputs events in a HTML table.</td> + </tr> + <tr> + <td><a href="layouts/pattern.html">LoggerLayoutPattern</a></td> + <td>A flexible layout configurable via a pattern string.</td> + </tr> + <tr> + <td><a href="layouts/daily-file.html">LoggerLayoutSimple</a></td> + <td>A simple, non configurable layout.</td> + </tr> + <tr> + <td><a href="layouts/rolling-file.html">LoggerLayoutSerialized</a></td> + <td>Outputs serialized objects.</td> + </tr> + <tr> + <td><a href="layouts/mail.html">LoggerLayoutTTCC</a></td> + <td>Consists of Time, Thread, Category and nested diagnostic Context.</td> + </tr> + <tr> + <td><a href="layouts/xml.html">LoggerLayoutXml</a></td> + <td>Outputs events as an XML document.</td> + </tr> + </tbody> + </table> + </subsection> + </section> + </body> +</document> Modified: logging/log4php/trunk/src/site/xdoc/docs/layouts/html.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/layouts/html.xml?rev=1243254&r1=1243253&r2=1243254&view=diff ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/layouts/html.xml (original) +++ logging/log4php/trunk/src/site/xdoc/docs/layouts/html.xml Sun Feb 12 14:00:02 2012 @@ -31,27 +31,31 @@ <p>The following parameters are available:</p> <table> - <tr> - <th>Parameter</th> - <th>Type</th> - <th>Required</th> - <th>Default</th> - <th>Description</th> - </tr> - <tr> - <td>locationInfo</td> - <td>boolean</td> - <td>No</td> - <td>false</td> - <td>If set to true, adds the file name and line number at which the log statement originated.</td> - </tr> - <tr> - <td>title</td> - <td>string</td> - <td>No</td> - <td>Log4php Log Messages</td> - <td>Sets the <![CDATA[<title>]]> of the generated HTML document.</td> - </tr> + <thead> + <tr> + <th>Parameter</th> + <th>Type</th> + <th>Required</th> + <th>Default</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>locationInfo</td> + <td>boolean</td> + <td>No</td> + <td>false</td> + <td>If set to true, adds the file name and line number at which the log statement originated.</td> + </tr> + <tr> + <td>title</td> + <td>string</td> + <td>No</td> + <td>Log4php Log Messages</td> + <td>Sets the <![CDATA[<title>]]> of the generated HTML document.</td> + </tr> + </tbody> </table> </subsection> @@ -60,14 +64,15 @@ <p>Configuration:</p> - <ul class="tabs"> - <li class="active"><a href="#xml">XML</a></li> - <li><a href="#php">PHP</a></li> - </ul> + <div class="auto-tabs"> + <ul> + <li>XML</li> + <li>PHP</li> + </ul> - <div class="pill-content" > - <div class="active" id="xml"> -<pre class="prettyprint"><![CDATA[ + <div class="tab-content" > + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderEcho"> <layout class="LoggerLayoutHtml"> @@ -79,9 +84,9 @@ </root> </configuration> ]]></pre> - </div> - <div id="php"> -<pre class="prettyprint"><![CDATA[ + </div> + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ array( 'appenders' => array( 'default' => array( @@ -96,7 +101,7 @@ array( ), ) ]]></pre> - + </div> </div> </div> @@ -112,32 +117,35 @@ $log->info("Hello World!"); <p>Produces the output as a HTML table:</p> <table> - <tr> - <th>Time</th> - <th>Thread</th> - <th>Level</th> - <th>Category</th> - <th>File:Line</th> - <th>Message</th> - </tr> - - <tr> - <td>0</td> - <td title="5868 thread">5868</td> - <td title="Level"><font color="#339933">DEBUG</font></td> - <td title="root category">root</td> - <td>D:\Projects\apache\log4php-config-adapters\src\examples\php\layout_html.php:23</td> - <td title="Message">Hello World!</td> - </tr> - - <tr> - <td>2</td> - <td title="5868 thread">5868</td> - <td title="Level">INFO</td> - <td title="root category">root</td> - <td>D:\Projects\apache\log4php-config-adapters\src\examples\php\layout_html.php:24</td> - <td title="Message">Hello World!</td> - </tr> + <thead> + <tr> + <th>Time</th> + <th>Thread</th> + <th>Level</th> + <th>Category</th> + <th>File:Line</th> + <th>Message</th> + </tr> + </thead> + <tbody> + <tr> + <td>0</td> + <td title="5868 thread">5868</td> + <td title="Level"><font color="#339933">DEBUG</font></td> + <td title="root category">root</td> + <td>D:\Projects\apache\log4php-config-adapters\src\examples\php\layout_html.php:23</td> + <td title="Message">Hello World!</td> + </tr> + + <tr> + <td>2</td> + <td title="5868 thread">5868</td> + <td title="Level">INFO</td> + <td title="root category">root</td> + <td>D:\Projects\apache\log4php-config-adapters\src\examples\php\layout_html.php:24</td> + <td title="Message">Hello World!</td> + </tr> + </tbody> </table> <p>Source of the output:</p> Modified: logging/log4php/trunk/src/site/xdoc/docs/layouts/pattern.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/layouts/pattern.xml?rev=1243254&r1=1243253&r2=1243254&view=diff ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/layouts/pattern.xml (original) +++ logging/log4php/trunk/src/site/xdoc/docs/layouts/pattern.xml Sun Feb 12 14:00:02 2012 @@ -31,20 +31,24 @@ <p>The following parameters are available:</p> <table> - <tr> - <th>Parameter</th> - <th>Type</th> - <th>Required</th> - <th>Default</th> - <th>Description</th> - </tr> - <tr> - <td>conversionPattern</td> - <td>string</td> - <td>No</td> - <td>%m%n</td> - <td>String which controls the output. See full specification below.</td> - </tr> + <thead> + <tr> + <th>Parameter</th> + <th>Type</th> + <th>Required</th> + <th>Default</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>conversionPattern</td> + <td>string</td> + <td>No</td> + <td>%m%n</td> + <td>String which controls the output. See full specification below.</td> + </tr> + </tbody> </table> <h4>Conversion patterns</h4> @@ -62,113 +66,117 @@ are:</p> <table> - <tr> - <th>Conversion character</th> - <th>Converts to</th> - </tr> - <tr> - <td> - <p><code>%c</code></p> - <p><code>%c{<![CDATA[<precision>]]>}</code></p> - </td> - <td> - <p>Name of the Logger object which recieved the logging request.</p> - - <p>Optionally, it can be can followed by <em>precision specifier</em>, which 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.</p> - - <p>For example, if the logger is named <code>foo.bar.Baz</code>, then <code>%c</code> - will be translated to the full logger name, <code>%c{2}</code> will be translated to - <code>bar.Baz</code>, and <code>%c{1}</code> will be translated to <code>Baz</code>. - </p> - </td> - </tr> - <tr> - <td> - <p><code>%C</code></p> - <p><code>%C{<![CDATA[<precision>]]>}</code></p> - </td> - <td> - <p>The fully qualified class name of the caller issuing the logging request. Currently, - this will always return "Logger".</p> - </td> - </tr> - <tr> - <td> - <p><code>%d</code></p> - <p><code>%d{<![CDATA[<format>]]>}</code></p> - </td> - <td> - <p>The date of the logging event.</p> - - <p>Optionally, may be followed by a <em>date format specifier</em> enclosed between - braces. The format specifier follows the PHP - <a href="http://php.net/manual/en/function.date.php">date</a> function. If no date - format specifier is given then ISO8601 format is assumed (Y-m-d H:i:s,u). </p> - - <p>For example: <code>%d{Y-m-d H:i:s}</code></p> - </td> - </tr> - <tr> - <td><code>%F</code></td> - <td>Name of the file from which the logging request was issued.</td> - </tr> - <tr> - <td><code>%l</code></td> - <td> - <p>Location information of the caller which generated the logging event.</p> - <p>Identical to <code>%C.%M(%F:%L)</code></p> - </td> - </tr> - <tr> - <td><code>%L</code></td> - <td>The line number at which the logging request was issued.</td> - </tr> - <tr> - <td><code>%m</code></td> - <td>The message associated with the logging event.</td> - </tr> - <tr> - <td><code>%n</code></td> - <td> - <p>A platform dependent line-break character(s).</p> - <p>Note that a line break will not be printed unless explicitely specified.</p> - </td> - </tr> - <tr> - <td><code>%M</code></td> - <td>The method or function name from which the logging request was issued.</td> - </tr> - <tr> - <td><code>%p</code></td> - <td>The level of the logging event.</td> - </tr> - <tr> - <td><code>%r</code></td> - <td>The number of milliseconds elapsed since the start of the application until the creation of the logging event.</td> - </tr> - <tr> - <td><code>%t</code></td> - <td>The ID of the process that generated the logging event.</td> - </tr> - <tr> - <td><code>%x</code></td> - <td>The NDC (Nested Diagnostic Context) associated with the thread that generated the logging event.</td> - </tr> - <tr> - <td><code>%X{<![CDATA[<key>]]>}</code></td> - <td> - <p>The MDC (Mapped Diagnostic Context) associated with the thread that generated the - logging event.</p> - <p>The X conversion character must be followed by the MDC key in braces. The value in - the MDC corresponding to the key will be output.</p> - </td> - </tr> - <tr> - <td><code>%%</code></td> - <td>A single percent sign.</td> - </tr> + <thead> + <tr> + <th>Conversion character</th> + <th>Converts to</th> + </tr> + </thead> + <tbody> + <tr> + <td> + <p><code>%c</code></p> + <p><code>%c{<![CDATA[<precision>]]>}</code></p> + </td> + <td> + <p>Name of the Logger object which recieved the logging request.</p> + + <p>Optionally, it can be can followed by <em>precision specifier</em>, which 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.</p> + + <p>For example, if the logger is named <code>foo.bar.Baz</code>, then <code>%c</code> + will be translated to the full logger name, <code>%c{2}</code> will be translated to + <code>bar.Baz</code>, and <code>%c{1}</code> will be translated to <code>Baz</code>. + </p> + </td> + </tr> + <tr> + <td> + <p><code>%C</code></p> + <p><code>%C{<![CDATA[<precision>]]>}</code></p> + </td> + <td> + <p>The fully qualified class name of the caller issuing the logging request. Currently, + this will always return "Logger".</p> + </td> + </tr> + <tr> + <td> + <p><code>%d</code></p> + <p><code>%d{<![CDATA[<format>]]>}</code></p> + </td> + <td> + <p>The date of the logging event.</p> + + <p>Optionally, may be followed by a <em>date format specifier</em> enclosed between + braces. The format specifier follows the PHP + <a href="http://php.net/manual/en/function.date.php">date</a> function. If no date + format specifier is given then ISO8601 format is assumed (Y-m-d H:i:s,u). </p> + + <p>For example: <code>%d{Y-m-d H:i:s}</code></p> + </td> + </tr> + <tr> + <td><code>%F</code></td> + <td>Name of the file from which the logging request was issued.</td> + </tr> + <tr> + <td><code>%l</code></td> + <td> + <p>Location information of the caller which generated the logging event.</p> + <p>Identical to <code>%C.%M(%F:%L)</code></p> + </td> + </tr> + <tr> + <td><code>%L</code></td> + <td>The line number at which the logging request was issued.</td> + </tr> + <tr> + <td><code>%m</code></td> + <td>The message associated with the logging event.</td> + </tr> + <tr> + <td><code>%n</code></td> + <td> + <p>A platform dependent line-break character(s).</p> + <p>Note that a line break will not be printed unless explicitely specified.</p> + </td> + </tr> + <tr> + <td><code>%M</code></td> + <td>The method or function name from which the logging request was issued.</td> + </tr> + <tr> + <td><code>%p</code></td> + <td>The level of the logging event.</td> + </tr> + <tr> + <td><code>%r</code></td> + <td>The number of milliseconds elapsed since the start of the application until the creation of the logging event.</td> + </tr> + <tr> + <td><code>%t</code></td> + <td>The ID of the process that generated the logging event.</td> + </tr> + <tr> + <td><code>%x</code></td> + <td>The NDC (Nested Diagnostic Context) associated with the thread that generated the logging event.</td> + </tr> + <tr> + <td><code>%X{<![CDATA[<key>]]>}</code></td> + <td> + <p>The MDC (Mapped Diagnostic Context) associated with the thread that generated the + logging event.</p> + <p>The X conversion character must be followed by the MDC key in braces. The value in + the MDC corresponding to the key will be output.</p> + </td> + </tr> + <tr> + <td><code>%%</code></td> + <td>A single percent sign.</td> + </tr> + </tbody> </table> </subsection> @@ -200,78 +208,80 @@ <p>The following table demonstrates various uses of format modifiers:</p> <table> - <tr> - <th>Format modifier</th> - <th>Justification</th> - <th>Minimum width</th> - <th>Maximum width</th> - <th>Comment</th> - </tr> - <tr> - <td align="center"><code>%c</code></td> - <td align="center">none</td> - <td align="center">none</td> - <td align="center">none</td> - <td>Output the logger name as-is.</td> - </tr> - <tr> - <td align="center"><code>%20c</code></td> - <td align="center">right</td> - <td align="center">20</td> - <td align="center">none</td> - <td>Left pad with spaces if the logger name is less than 20 characters long.</td> - </tr> - <tr> - <td align="center"><code>%-20c</code></td> - <td align="center">left</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.</td> - </tr> - <tr> - <td align="center"><code>%.30c</code></td> - <td align="center">none</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.</td> - </tr> - <tr> - <td align="center"><code>%20.30c</code></td> - <td align="center">right</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 - the logger name is longer than 30 characters, then truncate from the beginning.</td> - </tr> - <tr> - <td align="center"><code>%-20.30c</code></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 the - logger name is longer than 30 characters, then truncate from the beginning.</td> - </tr> + <thead> + <tr> + <th>Format modifier</th> + <th>Justification</th> + <th>Minimum width</th> + <th>Maximum width</th> + <th>Comment</th> + </tr> + </thead> + <tbody> + <tr> + <td align="center"><code>%c</code></td> + <td align="center">none</td> + <td align="center">none</td> + <td align="center">none</td> + <td>Output the logger name as-is.</td> + </tr> + <tr> + <td align="center"><code>%20c</code></td> + <td align="center">right</td> + <td align="center">20</td> + <td align="center">none</td> + <td>Left pad with spaces if the logger name is less than 20 characters long.</td> + </tr> + <tr> + <td align="center"><code>%-20c</code></td> + <td align="center">left</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.</td> + </tr> + <tr> + <td align="center"><code>%.30c</code></td> + <td align="center">none</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.</td> + </tr> + <tr> + <td align="center"><code>%20.30c</code></td> + <td align="center">right</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 + the logger name is longer than 30 characters, then truncate from the beginning.</td> + </tr> + <tr> + <td align="center"><code>%-20.30c</code></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 the + logger name is longer than 30 characters, then truncate from the beginning.</td> + </tr> + </tbody> </table> - </subsection> - <subsection name="Examples"> - <p>The following configuration configures a <code>LoggerAppenderEcho</code> which uses the pattern layout. All examples will use the same code and configuration, only the conversion pattern will change.</p> <p>Save the configuration to a file called <code>layout_pattern.xml</code>.</p> - <ul class="tabs"> - <li class="active"><a href="#xml">XML</a></li> - <li><a href="#php">PHP</a></li> - </ul> - - <div class="pill-content" > - <div class="active" id="xml"> -<pre class="prettyprint"><![CDATA[ + <div class="auto-tabs"> + <ul> + <li>XML</li> + <li>PHP</li> + </ul> + + <div class="tab-content" > + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderEcho"> <layout class="LoggerLayoutPattern"> @@ -283,9 +293,9 @@ </root> </configuration> ]]></pre> - </div> - <div id="php"> -<pre class="prettyprint"><![CDATA[ + </div> + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ array( 'appenders' => array( 'default' => array( @@ -303,13 +313,14 @@ array( ), ) ]]></pre> + </div> </div> </div> <p>Run the following code:</p> -<pre class="prettyprint"> +<pre class="prettyprint linenums"> Logger::configure("layout_pattern.xml"); $logger = Logger::getLogger('myLogger'); $logger->info("Lorem ipsum dolor sit amet, consectetur adipiscing elit."); Modified: logging/log4php/trunk/src/site/xdoc/docs/layouts/serialized.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/layouts/serialized.xml?rev=1243254&r1=1243253&r2=1243254&view=diff ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/layouts/serialized.xml (original) +++ logging/log4php/trunk/src/site/xdoc/docs/layouts/serialized.xml Sun Feb 12 14:00:02 2012 @@ -32,21 +32,25 @@ <p>The following parameters are available:</p> <table> - <tr> - <th>Parameter</th> - <th>Type</th> - <th>Required</th> - <th>Default</th> - <th>Description</th> - </tr> - <tr> - <td>locationInfo</td> - <td>boolean</td> - <td>No</td> - <td>false</td> - <td>If set to true, event's location information will be initialized before serialization. - Enabling this parameter makes logging slower and should be used only if required.</td> - </tr> + <thead> + <tr> + <th>Parameter</th> + <th>Type</th> + <th>Required</th> + <th>Default</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>locationInfo</td> + <td>boolean</td> + <td>No</td> + <td>false</td> + <td>If set to true, event's location information will be initialized before serialization. + Enabling this parameter makes logging slower and should be used only if required.</td> + </tr> + </tbody> </table> </subsection> @@ -55,14 +59,15 @@ <p>Sample configuration file:</p> - <ul class="tabs"> - <li class="active"><a href="#xml">XML</a></li> - <li><a href="#php">PHP</a></li> - </ul> - - <div class="pill-content" > - <div class="active" id="xml"> -<pre class="prettyprint"><![CDATA[ + <div class="auto-tabs"> + <ul> + <li>XML</li> + <li>PHP</li> + </ul> + + <div class="tab-content" > + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderEcho"> <layout class="LoggerLayoutSerialized" /> @@ -72,9 +77,9 @@ </root> </configuration> ]]></pre> - </div> - <div id="php"> -<pre class="prettyprint"><![CDATA[ + </div> + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ array( 'appenders' => array( 'default' => array( @@ -89,6 +94,7 @@ array( ), ) ]]></pre> + </div> </div> </div> Modified: logging/log4php/trunk/src/site/xdoc/docs/layouts/simple.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/layouts/simple.xml?rev=1243254&r1=1243253&r2=1243254&view=diff ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/layouts/simple.xml (original) +++ logging/log4php/trunk/src/site/xdoc/docs/layouts/simple.xml Sun Feb 12 14:00:02 2012 @@ -40,15 +40,15 @@ <p>Configuration:</p> - - <ul class="tabs"> - <li class="active"><a href="#xml">XML</a></li> - <li><a href="#php">PHP</a></li> - </ul> - - <div class="pill-content" > - <div class="active" id="xml"> -<pre class="prettyprint"><![CDATA[ + <div class="auto-tabs"> + <ul> + <li>XML</li> + <li>PHP</li> + </ul> + + <div class="tab-content" > + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderEcho"> <layout class="LoggerLayoutSimple" /> @@ -58,9 +58,9 @@ </root> </configuration> ]]></pre> - </div> - <div id="php"> -<pre class="prettyprint"><![CDATA[ + </div> + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ array( 'appenders' => array( 'default' => array( @@ -75,6 +75,7 @@ array( ), ) ]]></pre> + </div> </div> </div> @@ -91,11 +92,11 @@ $log->warn("My third message."); <p>Produces the following output:</p> -<pre class="prettyprint"><![CDATA[ +<pre> INFO - My first message. DEBUG - My second message. WARN - My third message. -]]></pre> +</pre> </subsection> </section> Modified: logging/log4php/trunk/src/site/xdoc/docs/layouts/ttcc.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/layouts/ttcc.xml?rev=1243254&r1=1243253&r2=1243254&view=diff ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/layouts/ttcc.xml (original) +++ logging/log4php/trunk/src/site/xdoc/docs/layouts/ttcc.xml Sun Feb 12 14:00:02 2012 @@ -45,67 +45,70 @@ <p>The following parameters are available:</p> <table> - <tr> - <th>Parameter</th> - <th>Type</th> - <th>Required</th> - <th>Default</th> - <th>Description</th> - </tr> - <tr> - <td>threadPrinting</td> - <td>boolean</td> - <td>No</td> - <td>true</td> - <td>If set to true, the process ID will be included in output.</td> - </tr> - <tr> - <td>categoryPrefixing</td> - <td>boolean</td> - <td>No</td> - <td>true</td> - <td>If set to true, the logger name will be included in output.</td> - </tr> - <tr> - <td>contextPrinting</td> - <td>boolean</td> - <td>No</td> - <td>true</td> - <td>If set to true, the nested diagnostic context will be included in output.</td> - </tr> - <tr> - <td>microSecondsPrinting</td> - <td>boolean</td> - <td>No</td> - <td>true</td> - <td>If set to true, the microseconds will be included in output.</td> - </tr> - <tr> - <td>microSecondsPrinting</td> - <td>string</td> - <td>No</td> - <td>%c</td> - <td>Overrides the date format, using the format used in PHP - <code> - <a class="externalLink" target="_blank" href="http://php.net/manual/en/function.strftime.php">strftime()</a> - </code> function.</td> - </tr> - + <thead> + <tr> + <th>Parameter</th> + <th>Type</th> + <th>Required</th> + <th>Default</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>threadPrinting</td> + <td>boolean</td> + <td>No</td> + <td>true</td> + <td>If set to true, the process ID will be included in output.</td> + </tr> + <tr> + <td>categoryPrefixing</td> + <td>boolean</td> + <td>No</td> + <td>true</td> + <td>If set to true, the logger name will be included in output.</td> + </tr> + <tr> + <td>contextPrinting</td> + <td>boolean</td> + <td>No</td> + <td>true</td> + <td>If set to true, the nested diagnostic context will be included in output.</td> + </tr> + <tr> + <td>microSecondsPrinting</td> + <td>boolean</td> + <td>No</td> + <td>true</td> + <td>If set to true, the microseconds will be included in output.</td> + </tr> + <tr> + <td>microSecondsPrinting</td> + <td>string</td> + <td>No</td> + <td>%c</td> + <td>Overrides the date format, using the format used in PHP + <code><a class="externalLink" href="http://php.net/manual/en/function.strftime.php">strftime()</a></code> + function.</td> + </tr> + </tbody> </table> </subsection> <subsection name="Examples"> <p>Configuration:</p> - - <ul class="tabs"> - <li class="active"><a href="#xml">XML</a></li> - <li><a href="#php">PHP</a></li> - </ul> - - <div class="pill-content" > - <div class="active" id="xml"> -<pre class="prettyprint"><![CDATA[ + + <div class="auto-tabs"> + <ul> + <li>XML</li> + <li>PHP</li> + </ul> + + <div class="tab-content" > + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderEcho"> <layout class="LoggerLayoutTTCC" /> @@ -115,9 +118,9 @@ </root> </configuration> ]]></pre> - </div> - <div id="php"> -<pre class="prettyprint"><![CDATA[ + </div> + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ array( 'appenders' => array( 'default' => array( @@ -132,6 +135,7 @@ array( ), ) ]]></pre> + </div> </div> </div> @@ -148,11 +152,11 @@ $logger->warn("Sed sit amet ipsum mauris <p>Produces the following output:</p> -<pre class="prettyprint"><![CDATA[ +<pre> INFO - My first message. DEBUG - My second message. WARN - My third message. -]]></pre> +</pre> </subsection> </section> Modified: logging/log4php/trunk/src/site/xdoc/docs/layouts/xml.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/layouts/xml.xml?rev=1243254&r1=1243253&r2=1243254&view=diff ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/layouts/xml.xml (original) +++ logging/log4php/trunk/src/site/xdoc/docs/layouts/xml.xml Sun Feb 12 14:00:02 2012 @@ -31,31 +31,34 @@ <p>The following parameters are available:</p> <table> - <tr> - <th>Parameter</th> - <th>Type</th> - <th>Required</th> - <th>Default</th> - <th>Description</th> - </tr> - <tr> - <td>locationInfo</td> - <td>boolean</td> - <td>No</td> - <td>true</td> - <td>If set to true, adds the file name and line number at which the log statement originated.</td> - </tr> - <tr> - <td>log4jNamespace</td> - <td>boolean</td> - <td>No</td> - <td>false</td> - <td>If set to true then log4j XML namespace will be used instead of the log4php namespace. - This can be usefull when using log viewers which can only parse the log4j namespace such as - Apache Chainsaw.</td> - </tr> + <thead> + <tr> + <th>Parameter</th> + <th>Type</th> + <th>Required</th> + <th>Default</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>locationInfo</td> + <td>boolean</td> + <td>No</td> + <td>true</td> + <td>If set to true, adds the file name and line number at which the log statement originated.</td> + </tr> + <tr> + <td>log4jNamespace</td> + <td>boolean</td> + <td>No</td> + <td>false</td> + <td>If set to true then log4j XML namespace will be used instead of the log4php namespace. + This can be usefull when using log viewers which can only parse the log4j namespace such as + Apache Chainsaw.</td> + </tr> + </tbody> </table> - </subsection> <subsection name="Examples"> @@ -67,14 +70,15 @@ <p>Configuration file:</p> - <ul class="tabs"> - <li class="active"><a href="#xml">XML</a></li> - <li><a href="#php">PHP</a></li> - </ul> - - <div class="pill-content" > - <div class="active" id="xml"> -<pre class="prettyprint"><![CDATA[ + <div class="auto-tabs"> + <ul> + <li>XML</li> + <li>PHP</li> + </ul> + + <div class="tab-content" > + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderEcho"> <layout class="LoggerLayoutXml" /> @@ -84,9 +88,9 @@ </root> </configuration> ]]></pre> - </div> - <div id="php"> -<pre class="prettyprint"><![CDATA[ + </div> + <div class="tab-pane"> +<pre class="prettyprint linenums"><![CDATA[ array( 'appenders' => array( 'default' => array( @@ -101,6 +105,7 @@ array( ), ) ]]></pre> + </div> </div> </div> Modified: logging/log4php/trunk/src/site/xdoc/docs/loggers.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/loggers.xml?rev=1243254&r1=1243253&r2=1243254&view=diff ============================================================================== --- logging/log4php/trunk/src/site/xdoc/docs/loggers.xml (original) +++ logging/log4php/trunk/src/site/xdoc/docs/loggers.xml Sun Feb 12 14:00:02 2012 @@ -53,7 +53,7 @@ <p>An example of setting the root logger threshold to <code>DEBUG</code>:</p> -<pre class="prettyprint"><![CDATA[ +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderConsole" /> <root> @@ -73,7 +73,7 @@ <p>The simplest example is to configure the root logger, since all other loggers will inherit its settings, as explained in the <a href="#Logger_hierarchy">next section</a>.</p> -<pre class="prettyprint"><![CDATA[ +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderConsole" /> <root> @@ -88,7 +88,7 @@ <p>It is also possible to configure individual named loggers. For example, let's configure the <code>foo</code> logger, used in the example above, and set it's threshold to WARN:</p> -<pre class="prettyprint"><![CDATA[ +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderConsole" /> <logger name="foo"> @@ -126,7 +126,7 @@ <p>For example examine the following configuration:</p> -<pre class="prettyprint"><![CDATA[ +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="default" class="LoggerAppenderConsole" /> <root> @@ -139,7 +139,7 @@ <p>The threshold level of the root logger is set to debug. Also, the root logger is linked to a console appender. Any named logger that is created will inherit these root settings.</p> -<pre class="prettyprint"><![CDATA[ +<pre class="prettyprint linenums"><![CDATA[ $main = Logger::getLogger('main'); $main->trace('This will not be logged.'); $main->info('This will be logged.'); @@ -157,7 +157,7 @@ $main->info('This will be logged.'); <p>Let's take the following example:</p> -<pre class="prettyprint"><![CDATA[ +<pre class="prettyprint linenums"><![CDATA[ <configuration xmlns="http://logging.apache.org/log4php/"> <appender name="A1" class="LoggerAppenderConsole" /> <appender name="A2" class="LoggerAppenderConsole" /> @@ -174,7 +174,7 @@ $main->info('This will be logged.'); <p>Therefore, by executing the following code:</p> -<pre class="prettyprint"><![CDATA[ +<pre class="prettyprint linenums"><![CDATA[ $main = Logger::getLogger('foo'); $main->info('This will be logged twice.'); ]]></pre> @@ -191,7 +191,7 @@ INFO - This will be logged twice. <p>If the <code>foo</code> logger in the previous example was configured like this:</p> -<pre class="prettyprint"><