Author: kkolinko
Date: Mon Jan 25 18:03:31 2010
New Revision: 902899
URL: http://svn.apache.org/viewvc?rev=902899&view=rev
Log:
Align server.xml installed by .exe installer with the one bundled in zip/tgz
archives
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/resources/confinstall/server_1.xml
tomcat/tc5.5.x/trunk/build/resources/confinstall/server_2.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=902899&r1=902898&r2=902899&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Jan 25 18:03:31 2010
@@ -90,12 +90,6 @@
+1: kkolinko
-1:
-* Align server.xml installed by .exe installer with the one bundled in
- zip/tgz archives
-
http://people.apache.org/~kkolinko/patches/2009-11-15_Installer_serverxml_tc55.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Single quote should be not be treated as a separator
http://svn.apache.org/viewvc?rev=830999&view=rev
+1: markt, kkolinko
Modified: tomcat/tc5.5.x/trunk/build/resources/confinstall/server_1.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/resources/confinstall/server_1.xml?rev=902899&r1=902898&r2=902899&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/resources/confinstall/server_1.xml (original)
+++ tomcat/tc5.5.x/trunk/build/resources/confinstall/server_1.xml Mon Jan 25
18:03:31 2010
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -91,4 +91,4 @@
-->
<!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
- <Connector
+ <Connector
\ No newline at end of file
Modified: tomcat/tc5.5.x/trunk/build/resources/confinstall/server_2.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/resources/confinstall/server_2.xml?rev=902899&r1=902898&r2=902899&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/resources/confinstall/server_2.xml (original)
+++ tomcat/tc5.5.x/trunk/build/resources/confinstall/server_2.xml Mon Jan 25
18:03:31 2010
@@ -1,4 +1,4 @@
- maxHttpHeaderSize="8192"
+ maxHttpHeaderSize="8192"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
enableLookups="false" redirectPort="8443" acceptCount="100"
connectionTimeout="20000" disableUploadTimeout="true" />
@@ -59,6 +59,14 @@
example application (the source for this filter may be found in
"$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
+ Note that this Valve uses the platform's default character encoding.
+ This may cause problems for developers in another encoding, e.g.
+ UTF-8. Use the RequestDumperFilter instead.
+
+ Also note that enabling this Valve will write a ton of stuff to your
+ logs. They are likely to grow quite large. This extensive log
writing
+ will definitely slow down your server.
+
Request dumping is disabled by default. Uncomment the following
element to enable it. -->
<!--
@@ -124,13 +132,13 @@
className = the fully qualified name of the cluster class
- name = a descriptive name for your cluster, can be anything
+ clusterName = a descriptive name for your cluster, can be anything
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
- mcastBindAddr = bind the multicast socket to a specific address
+ mcastBindAddress = bind the multicast socket to a specific address
mcastTTL = the multicast TTL if you want to limit your broadcast
@@ -227,16 +235,19 @@
<Sender
className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
replicationMode="pooled"
- ackTimeout="15000"/>
+ ackTimeout="15000"
+ waitForAck="true"/>
<Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
- filter=".*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;"/>
+
filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
<Deployer
className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
tempDir="/tmp/war-temp/"
deployDir="/tmp/war-deploy/"
watchDir="/tmp/war-listen/"
watchEnabled="false"/>
+
+ <ClusterListener
className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
</Cluster>
-->
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=902899&r1=902898&r2=902899&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Mon Jan 25
18:03:31 2010
@@ -58,6 +58,10 @@
<update>
Update to commons-pool 1.5.4. This fixes regressions in 1.5.2. (markt)
</update>
+ <fix>
+ Align server.xml installed by the Windows installer with the one
+ bundled in zip/tar.gz archives. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
