remm 2004/01/14 05:13:30
Modified: resources/confinstall server_1.xml server_2.xml
Log:
- Sync the installer's server.xml.
Revision Changes Path
1.7 +11 -5 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- server_1.xml 29 Jul 2003 15:45:26 -0000 1.6
+++ server_1.xml 14 Jan 2004 13:13:30 -0000 1.7
@@ -13,7 +13,13 @@
<Server port="8005" shutdown="SHUTDOWN" debug="0">
- <!-- Comment out these entries to disable JMX MBeans support -->
+ <!-- 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"
@@ -66,8 +72,8 @@
entry. SSL support requires the following steps (see the SSL Config
HOWTO in the Tomcat 5 documentation bundle for more detailed
instructions):
- * Download and install JSSE 1.0.2 or later, and put the JAR files
- into "$JAVA_HOME/jre/lib/ext".
+ * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
+ later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
* Execute:
%JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
$JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix)
@@ -78,10 +84,10 @@
request.getRemoteHost(). This can have an adverse impact on
performance, so you can disable it by setting the
"enableLookups" attribute to "false". When DNS lookups are disabled,
- request.getRemoteHost() will return a String containing the
+ request.getRemoteHost() will return the String version of the
IP address of the remote client.
-->
<!-- Define a non-SSL Coyote HTTP/1.1 Connector on the port specified
- during installation -->
+ during installation -->
<Connector
1.13 +21 -19 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- server_2.xml 3 Aug 2003 10:31:37 -0000 1.12
+++ server_2.xml 14 Jan 2004 13:13:30 -0000 1.13
@@ -2,15 +2,24 @@
enableLookups="false" redirectPort="8443" acceptCount="100"
debug="0" connectionTimeout="20000"
disableUploadTimeout="true" />
+ <!-- Note : To disable connection timeouts, set connectionTimeout value
+ to -1 -->
+
+ <!-- Note : To use gzip compression you could set the following properties :
+
+ compression="on"
+ compressionMinSize="2048"
+ noCompressionUserAgents="gozilla, traviata"
+ compressableMimeType="text/html,text/xml"
+ -->
<!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
<!--
<Connector port="8443"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
enableLookups="false" disableUploadTimeout="true"
- acceptCount="100" debug="0" scheme="https" secure="true">
- <Factory clientAuth="false" protocol="TLS" />
- </Connector>
+ acceptCount="100" debug="0" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
@@ -107,21 +116,12 @@
userRoleTable="user_roles" roleNameCol="role_name" />
-->
- <!-- Define the default virtual host -->
- <Host name="localhost" debug="0" appBase="webapps"
- unpackWARs="true" autoDeploy="true">
-
- <!-- Add the following attributes if you want to turn XML validation
- on. Remember to comment the Host element above.
-
- Note: XML Schema validationn will works with Xerces 2.0.1 or
- Xerces 2.1. Xerces 2.0.2 and Xerces 2.2 have bugs that prevent
- their use with Tomcat-->
- <!--
+ <!-- Define the default virtual host
+ Note: XML Schema validation will not work with Xerces 2.2.
+ -->
<Host name="localhost" debug="0" appBase="webapps"
unpackWARs="true" autoDeploy="true"
- xmlValidation="true" xmlNamespaceAware="true">
- -->
+ xmlValidation="false" xmlNamespaceAware="false">
<!-- Defines a cluster for this node,
By defining this element, means that every manager will be changed.
@@ -166,7 +166,8 @@
HashMap map = (HashMap)session.getAttribute("map");
map.put("key","value");
%>
- replicationMode = can be either 'synchronous' or 'asynchronous'.
+ replicationMode = can be either 'pooled', 'synchronous' or
'asynchronous'.
+ * Pooled means that the replication happens using
several sockets in a synchronous way. Ie, the data gets replicated, then the request
return. This is the same as the 'synchronous' setting except it uses a pool of
sockets, hence it is multithreaded. This is the fastest and safest configuration. To
use this, also increase the nr of tcp threads that you have dealing with replication.
* Synchronous means that the thread that executes
the request, is also the
thread the replicates the data to the other nodes,
and will not return until all
nodes have received the information.
@@ -190,15 +191,16 @@
mcastPort="45564"
mcastFrequency="500"
mcastDropTime="3000"
- tcpThreadCount="2"
+ tcpThreadCount="6"
tcpListenAddress="auto"
tcpListenPort="4001"
tcpSelectorTimeout="100"
printToScreen="false"
expireSessionsOnShutdown="false"
useDirtyFlag="true"
- replicationMode="synchronous"
+ replicationMode="pooled"
/>
+
-->
<!--
When configuring for clustering, you also add in a valve to catch all
the requests
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
