remm 2004/10/25 08:29:41
Modified: webapps/docs/config valve.xml
resources/confinstall server_1.xml server_2.xml
catalina/src/conf server.xml
Log:
- Document new access log valve.
- Add it in the default config.
Revision Changes Path
1.11 +9 -2 jakarta-tomcat-catalina/webapps/docs/config/valve.xml
Index: valve.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/valve.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- valve.xml 27 Sep 2004 16:00:31 -0000 1.10
+++ valve.xml 25 Oct 2004 15:29:41 -0000 1.11
@@ -60,7 +60,12 @@
<attribute name="className" required="true">
<p>Java class name of the implementation to use. This MUST be set to
- <strong>org.apache.catalina.valves.AccessLogValve</strong>.</p>
+ <strong>org.apache.catalina.valves.AccessLogValve</strong> to use the
+ default access log valve. To use a more optimized access log valve
+ designed for production use, you MUST set this attribute to
+ <strong>org.apache.catalina.valves.FastCommonAccessLogValve</strong>.
+ In this case, only the <code>common</code> and <code>combined</code>
+ patterns are supported.</p>
</attribute>
<attribute name="directory" required="false">
@@ -76,7 +81,9 @@
from the request and response to be logged, or the word
<code>common</code> or <code>combined</code> to select a
standard format. See below for more information on configuring
- this attribute.</p>
+ this attribute. Note that the optimized access does only support
+ <code>common</code> and <code>combined</code> as the value for this
+ attribute.</p>
</attribute>
<attribute name="prefix" required="false">
1.9 +6 -14 jakarta-tomcat-5/resources/confinstall/server_1.xml
Index: server_1.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/resources/confinstall/server_1.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- server_1.xml 26 Aug 2004 17:03:34 -0000 1.8
+++ server_1.xml 25 Oct 2004 15:29:41 -0000 1.9
@@ -10,20 +10,12 @@
define subcomponents such as "Valves" or "Loggers" at this level.
-->
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
+<Server port="8005" shutdown="SHUTDOWN">
-
- <!-- Comment these entries out to disable JMX MBeans support -->
- <!-- You may also configure custom components (e.g. Valves/Realms) by
- including your own mbean-descriptor file(s), and setting the
- "descriptors" attribute to point to a ';' seperated list of paths
- (in the ClassLoader sense) of files to add to the default list.
- e.g. descriptors="/com/myfirm/mypackage/mbean-descriptor.xml"
- -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
- debug="0"/>
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
- debug="0"/>
+ <!-- Comment these entries out to disable JMX MBeans support used for the
+ administration web application -->
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
/>
<!-- Global JNDI resources -->
<GlobalNamingResources>
@@ -80,4 +72,4 @@
-->
<!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
- <Connector
+ <Connector
1.17 +31 -21 jakarta-tomcat-5/resources/confinstall/server_2.xml
Index: server_2.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/resources/confinstall/server_2.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- server_2.xml 26 Aug 2004 17:03:34 -0000 1.16
+++ server_2.xml 25 Oct 2004 15:29:41 -0000 1.17
@@ -1,7 +1,6 @@
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
enableLookups="false" redirectPort="8443" acceptCount="100"
- debug="0" connectionTimeout="20000"
- disableUploadTimeout="true" />
+ connectionTimeout="20000" disableUploadTimeout="true" />
<!-- Note : To disable connection timeouts, set connectionTimeout value
to 0 -->
@@ -18,22 +17,20 @@
<Connector port="8443"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
enableLookups="false" disableUploadTimeout="true"
- acceptCount="100" debug="0" scheme="https" secure="true"
+ acceptCount="100" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009"
- enableLookups="false" redirectPort="8443" debug="0"
- protocol="AJP/1.3" />
+ enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
<!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
<!-- See proxy documentation for more information about using this. -->
<!--
<Connector port="8082"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false"
- acceptCount="100" debug="0" connectionTimeout="20000"
+ enableLookups="false" acceptCount="100" connectionTimeout="20000"
proxyPort="80" disableUploadTimeout="true" />
-->
@@ -43,11 +40,11 @@
on to the appropriate Host (virtual host). -->
<!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1">
+ <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
-->
<!-- Define the top level container in our container hierarchy -->
- <Engine name="Catalina" defaultHost="localhost" debug="0">
+ <Engine name="Catalina" defaultHost="localhost">
<!-- The request dumper valve dumps useful debugging information about
the request headers and cookies that were received, and the response
@@ -74,7 +71,7 @@
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- debug="0" resourceName="UserDatabase"/>
+ resourceName="UserDatabase"/>
<!-- Comment out the old realm but leave here for now in case we
need to go back quickly -->
@@ -86,7 +83,7 @@
stored in a database and accessed via JDBC -->
<!--
- <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
+ <Realm className="org.apache.catalina.realm.JDBCRealm"
driverName="org.gjt.mm.mysql.Driver"
connectionURL="jdbc:mysql://localhost/authority"
connectionName="test" connectionPassword="test"
@@ -95,7 +92,7 @@
-->
<!--
- <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
+ <Realm className="org.apache.catalina.realm.JDBCRealm"
driverName="oracle.jdbc.driver.OracleDriver"
connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
connectionName="scott" connectionPassword="tiger"
@@ -104,7 +101,7 @@
-->
<!--
- <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
+ <Realm className="org.apache.catalina.realm.JDBCRealm"
driverName="sun.jdbc.odbc.JdbcOdbcDriver"
connectionURL="jdbc:odbc:CATALINA"
userTable="users" userNameCol="user_name" userCredCol="user_pass"
@@ -114,7 +111,7 @@
<!-- Define the default virtual host
Note: XML Schema validation will not work with Xerces 2.2.
-->
- <Host name="localhost" debug="0" appBase="webapps"
+ <Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true"
xmlValidation="false" xmlNamespaceAware="false">
@@ -128,8 +125,6 @@
name = a descriptive name for your cluster, can be anything
- debug = the debug level, higher means more output
-
mcastAddr = the multicast address, has to be the same for all the nodes
mcastPort = the multicast port, has to be the same for all the nodes
@@ -162,7 +157,7 @@
useDirtyFlag = true means that we only replicate a session after
setAttribute,removeAttribute has been called.
false means to replicate the session after each request.
- false means that replication would work for the
following piece of code:
+ false means that replication would work for the
following piece of code: (only for SimpleTcpReplicationManager)
<%
HashMap map = (HashMap)session.getAttribute("map");
map.put("key","value");
@@ -211,7 +206,8 @@
<Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
managerClassName="org.apache.catalina.cluster.session.DeltaManager"
expireSessionsOnShutdown="false"
- useDirtyFlag="true">
+ useDirtyFlag="true"
+ notifyListenersOnReplication="true">
<Membership
className="org.apache.catalina.cluster.mcast.McastService"
@@ -229,7 +225,8 @@
<Sender
className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
- replicationMode="pooled"/>
+ replicationMode="pooled"
+ ackTimeout="15000"/>
<Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
filter=".*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;"/>
@@ -251,8 +248,7 @@
user identity maintained across *all* web applications contained
in this virtual host. -->
<!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn"
- debug="0"/>
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-->
<!-- Access log processes all requests for this virtual host. By
@@ -263,6 +259,20 @@
-->
<!--
<Valve className="org.apache.catalina.valves.AccessLogValve"
+ directory="logs" prefix="localhost_access_log." suffix=".txt"
+ pattern="common" resolveHosts="false"/>
+ -->
+
+ <!-- Access log processes all requests for this virtual host. By
+ default, log files are created in the "logs" directory relative to
+ $CATALINA_HOME. If you wish, you can specify a different
+ directory with the "directory" attribute. Specify either a relative
+ (to $CATALINA_HOME) or absolute path to the desired directory.
+ This access log implementation is optimized for maximum performance,
+ but is hardcoded to support only the "common" and "combined" patterns.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
directory="logs" prefix="localhost_access_log." suffix=".txt"
pattern="common" resolveHosts="false"/>
-->
1.41 +14 -0 jakarta-tomcat-catalina/catalina/src/conf/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- server.xml 19 Oct 2004 23:19:45 -0000 1.40
+++ server.xml 25 Oct 2004 15:29:41 -0000 1.41
@@ -338,6 +338,20 @@
pattern="common" resolveHosts="false"/>
-->
+ <!-- Access log processes all requests for this virtual host. By
+ default, log files are created in the "logs" directory relative to
+ $CATALINA_HOME. If you wish, you can specify a different
+ directory with the "directory" attribute. Specify either a relative
+ (to $CATALINA_HOME) or absolute path to the desired directory.
+ This access log implementation is optimized for maximum performance,
+ but is hardcoded to support only the "common" and "combined" patterns.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+ directory="logs" prefix="localhost_access_log." suffix=".txt"
+ pattern="common" resolveHosts="false"/>
+ -->
+
</Host>
</Engine>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
