Author: kkolinko
Date: Sun Apr 27 23:31:15 2014
New Revision: 1590523
URL: http://svn.apache.org/r1590523
Log:
Merged r1590461 from tomcat/trunk:
Improving valves documentation.
Wrap Access Logging valves into a distinct section.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
tomcat/tc7.0.x/trunk/webapps/docs/logging.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1590461
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1590523&r1=1590522&r2=1590523&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Apr 27 23:31:15 2014
@@ -271,6 +271,9 @@
Fix target and rel attributes on links in documentation. They were
lost during XSLT transformation. (kkolinko)
</fix>
+ <update>
+ Improve valves documentation. Split valves into groups. (kkolinko)
+ </update>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1590523&r1=1590522&r2=1590523&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Sun Apr 27 23:31:15
2014
@@ -894,7 +894,7 @@
...
</Context>]]></source>
- <p>See <a href="valve.html#Access_Log_Valve">Access Log Valve</a>
+ <p>See <a href="valve.html#Access_Logging">Access Logging Valves</a>
for more information on the configuration attributes that are
supported.</p>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml?rev=1590523&r1=1590522&r2=1590523&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml Sun Apr 27 23:31:15 2014
@@ -194,7 +194,7 @@
...
</Engine>]]></source>
- <p>See <a href="valve.html#Access_Log_Valve">Access Log Valve</a>
+ <p>See <a href="valve.html#Access_Logging">Access Logging Valves</a>
for more information on the configuration attributes that are
supported.</p>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml?rev=1590523&r1=1590522&r2=1590523&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml Sun Apr 27 23:31:15 2014
@@ -348,7 +348,7 @@
...
</Host>]]></source>
- <p>See <a href="valve.html#Access_Log_Valve">Access Log Valve</a>
+ <p>See <a href="valve.html#Access_Logging">Access Logging Valves</a>
for more information on the configuration attributes that are
supported.</p>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml?rev=1590523&r1=1590522&r2=1590523&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Sun Apr 27 23:31:15 2014
@@ -51,7 +51,12 @@
</section>
-<section name="Access Log Valve">
+<section name="Access Logging">
+
+<p>Access logging is performed by valves that implement
+<strong>org.apache.catalina.AccessLog</strong> interface.</p>
+
+<subsection name="Access Log Valve">
<subsection name="Introduction">
@@ -329,10 +334,10 @@
</subsection>
-</section>
+</subsection>
-<section name="Extended Access Log Valve">
+<subsection name="Extended Access Log Valve">
<subsection name="Introduction">
@@ -435,6 +440,8 @@
</subsection>
+</subsection>
+
</section>
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=1590523&r1=1590522&r2=1590523&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/logging.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/logging.xml Sun Apr 27 23:31:15 2014
@@ -200,7 +200,7 @@
with low overhead, so it only uses Apache Commons Logging for
its own debug messages. This implementation approach avoids
additional overhead and potentially complex configuration.
- Please refer to the <a href="config/valve.html">Valves</a>
+ Please refer to the <a href="config/valve.html#Access_Logging">Valves</a>
documentation for more details on its configuration, including
the various report formats.
</p>
@@ -395,8 +395,8 @@ java.util.logging.ConsoleHandler.formatt
<li><p>The handlers by default use the system default encoding to write
the log files. It can be configured with <code>encoding</code>
property.
See Javadoc for details.</p></li>
- <li><p>Consider configuring an <a href="config/valve.html">Access
- log</a>.</p></li>
+ <li><p>Consider configuring an
+ <a href="config/valve.html#Access_Logging">Access log</a>.</p></li>
</ul>
</subsection>
@@ -588,7 +588,7 @@ log4j.logger.org.apache.catalina.session
<strong>ExtendedAccessLogValve</strong> use their own self-contained
logging implementation, so they
<strong><i>cannot be configured to use log4j</i></strong>.
- Refer to <a href="config/valve.html#Access_Log_Valve">Valves</a>
+ Refer to <a href="config/valve.html#Access_Logging">Valves</a>
for specific configuration details.</p></li>
</ul>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
