Author: kkolinko
Date: Sun Apr 27 22:59:14 2014
New Revision: 1590515
URL: http://svn.apache.org/r1590515
Log:
Improve documentation markup.
This is partial backport of r1518540 from trunk.
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/logging.xml
Modified: tomcat/tc7.0.x/trunk/webapps/docs/logging.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/logging.xml?rev=1590515&r1=1590514&r2=1590515&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/logging.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/logging.xml Sun Apr 27 22:59:14 2014
@@ -222,6 +222,7 @@
JULI is enabled by default, and supports per classloader configuration, in
addition to the regular global java.util.logging configuration. This means
that logging can be configured at the following layers:
+ </p>
<ul>
<li>Globally. That is usually done in the
<code>${catalina.base}/conf/logging.properties</code> file.
@@ -234,7 +235,6 @@
<code>WEB-INF/classes/logging.properties</code>
</li>
</ul>
- </p>
<p>
The default <code>logging.properties</code> in the JRE specifies a
<code>ConsoleHandler</code> that routes logging to System.err.
@@ -253,9 +253,7 @@
so FINEST or ALL should be set. Please refer to
<code>java.util.logging</code>
documentation in the JDK for the complete details:
</p>
- <p>
- <source>org.apache.catalina.level=FINEST</source>
- </p>
+ <source>org.apache.catalina.level=FINEST</source>
<p>
The configuration used by JULI is extremely similar to the one supported by
plain <code>java.util.logging</code>, but uses a few
@@ -295,8 +293,8 @@
</p>
<p>
Example logging.properties file to be placed in $CATALINA_BASE/conf:
- <source>
-handlers = 1catalina.org.apache.juli.FileHandler, \
+ </p>
+ <source><![CDATA[handlers = 1catalina.org.apache.juli.FileHandler, \
2localhost.org.apache.juli.FileHandler, \
3manager.org.apache.juli.FileHandler, \
java.util.logging.ConsoleHandler
@@ -340,15 +338,13 @@ org.apache.catalina.core.ContainerBase.[
# For example, set the org.apache.catalina.util.LifecycleBase logger to log
# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-</source>
- </p>
+#org.apache.catalina.util.LifecycleBase.level = FINE]]></source>
<p>
Example logging.properties for the servlet-examples web application to be
placed in WEB-INF/classes inside the web application:
- <source>
-handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+ </p>
+ <source><![CDATA[handlers = org.apache.juli.FileHandler,
java.util.logging.ConsoleHandler
############################################################
# Handler specific properties.
@@ -360,9 +356,8 @@ org.apache.juli.FileHandler.directory =
org.apache.juli.FileHandler.prefix = servlet-examples.
java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-</source>
- </p>
+java.util.logging.ConsoleHandler.formatter =
java.util.logging.SimpleFormatter]]></source>
+
<subsection name="Documentation references">
<p>See the following resources for additional information:</p>
@@ -423,7 +418,7 @@ java.util.logging.ConsoleHandler.formatt
<li>Create a file called <code>log4j.properties</code> with the
following content and save it into <code>$CATALINA_BASE/lib</code></li>
</ol>
- <source>
+ <source><![CDATA[
log4j.rootLogger=INFO, CATALINA
# Define all the appenders
@@ -470,8 +465,7 @@ log4j.logger.org.apache.catalina.core.Co
log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager]=\
INFO, MANAGER
log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager]=\
- INFO, HOST-MANAGER
-</source>
+ INFO, HOST-MANAGER]]></source>
<ol start="2">
<li><a href="http://logging.apache.org/log4j";>Download Log4J</a>
(v1.2 or later).</li>
@@ -537,11 +531,9 @@ log4j.logger.org.apache.catalina.core.Co
configuration files, so we recommend you use a properties file as
described until a future version of log4j allows this convention.
</p>
- <source>
-log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG<br
/>
-log4j.logger.org.apache.catalina.core=DEBUG<br />
-log4j.logger.org.apache.catalina.session=DEBUG<br />
-</source>
+
<source><![CDATA[log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG
+log4j.logger.org.apache.catalina.core=DEBUG
+log4j.logger.org.apache.catalina.session=DEBUG]]></source>
<p>
Be warned: a level of DEBUG will produce megabytes of logging and slow
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
