Author: remm
Date: Thu Aug 3 16:30:17 2006
New Revision: 428563
URL: http://svn.apache.org/viewvc?rev=428563&view=rev
Log:
- Cleanup the configuration (and fix the one used for the installer).
- Tweak a bit the installer packaging.
Modified:
tomcat/tc6.0.x/trunk/conf/server.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml
tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
Modified: tomcat/tc6.0.x/trunk/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/server.xml?rev=428563&r1=428562&r2=428563&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/server.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/server.xml Thu Aug 3 16:30:17 2006
@@ -74,10 +74,8 @@
-->
<!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
- <Connector port="8080" maxHttpHeaderSize="8192"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" redirectPort="8443" acceptCount="100"
- connectionTimeout="20000" disableUploadTimeout="true" />
+ <Connector port="8080" maxThreads="150" connectionTimeout="20000"
+ redirectPort="8443" />
<!-- Note : To disable connection timeouts, set connectionTimeout value
to 0 -->
@@ -90,25 +88,22 @@
-->
<!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
+ <!-- This connector uses the JSSE configuration, when using APR, the
+ connector should be using the OpenSSL style configuration
+ described in the APR documentation -->
<!--
- <Connector port="8443" maxHttpHeaderSize="8192"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" disableUploadTimeout="true"
- acceptCount="100" scheme="https" secure="true"
+ <Connector port="8443" maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009"
- enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
<!-- 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"
connectionTimeout="20000"
- proxyPort="80" disableUploadTimeout="true" />
+ <Connector port="8082" maxThreads="150" connectionTimeout="20000"
+ proxyPort="80" />
-->
<!-- An Engine represents the entry point (within Catalina) that processes
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=428563&r1=428562&r2=428563&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Aug 3 16:30:17 2006
@@ -495,7 +495,7 @@
<!-- ==================== RELEASE: Create Release ======================= -->
- <target name="release"
depends="clean,dist-static,dist-source,dist-deployer,installer,package-zip,package-tgz,package-deployer-zip,package-deployer-tgz,package-admin-zip,package-admin-tgz,package-src-zip,package-src-tgz,dist-javadoc,package-docs-tgz"
+ <target name="release"
depends="clean,dist-static,dist-deployer,installer,package-zip,package-tgz,package-deployer-zip,package-deployer-tgz,package-admin-zip,package-admin-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz"
description="Create a Tomcat 5 packaged distribution">
<filter token="VERSION" value="${version}"/>
Modified: tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml?rev=428563&r1=428562&r2=428563&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml (original)
+++ tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml Thu Aug 3 16:30:17 2006
@@ -17,7 +17,7 @@
<Listener className="org.apache.catalina.core.AprLifecycleListener" />
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
<Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
- <Listener
className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
+ <!--<Listener
className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>-->
<!-- Global JNDI resources -->
<GlobalNamingResources>
@@ -74,4 +74,4 @@
-->
<!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
- <Connector
+ <Connector
\ No newline at end of file
Modified: tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml?rev=428563&r1=428562&r2=428563&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml (original)
+++ tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml Thu Aug 3 16:30:17 2006
@@ -1,7 +1,5 @@
- maxHttpHeaderSize="8192"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" redirectPort="8443" acceptCount="100"
- connectionTimeout="20000" disableUploadTimeout="true" />
+ maxThreads="150" connectionTimeout="20000"
+ redirectPort="8443" />
<!-- Note : To disable connection timeouts, set connectionTimeout value
to 0 -->
@@ -14,25 +12,22 @@
-->
<!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
+ <!-- This connector uses the JSSE configuration, when using APR, the
+ connector should be using the OpenSSL style configuration
+ described in the APR documentation -->
<!--
- <Connector port="8443" maxHttpHeaderSize="8192"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" disableUploadTimeout="true"
- acceptCount="100" scheme="https" secure="true"
+ <Connector port="8443" maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009"
- enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
<!-- 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"
connectionTimeout="20000"
- proxyPort="80" disableUploadTimeout="true" />
+ <Connector port="8082" maxThreads="150" connectionTimeout="20000"
+ proxyPort="80" />
-->
<!-- An Engine represents the entry point (within Catalina) that processes
@@ -124,13 +119,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 +222,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/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=428563&r1=428562&r2=428563&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Aug 3 16:30:17 2006
@@ -293,15 +293,15 @@
;
;SectionEnd
-Section "Webapps" SecWebapps
-
- SectionIn 3
-
- SetOutPath $INSTDIR\webapps
- File /nonfatal /r webapps\balancer
- File /nonfatal /r webapps\webdav
-
-SectionEnd
+;Section "Webapps" SecWebapps
+;
+; SectionIn 3
+;
+; SetOutPath $INSTDIR\webapps
+; File /nonfatal /r webapps\balancer
+; File /nonfatal /r webapps\webdav
+;
+;SectionEnd
;Section "Compatibility" SecCompat
;
@@ -365,7 +365,7 @@
!insertmacro MUI_DESCRIPTION_TEXT ${SecDocs} $(DESC_SecDocs)
!insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(DESC_SecExamples)
; !insertmacro MUI_DESCRIPTION_TEXT ${SecAdmin} $(DESC_SecAdmin)
- !insertmacro MUI_DESCRIPTION_TEXT ${SecWebapps} $(DESC_SecWebapps)
+; !insertmacro MUI_DESCRIPTION_TEXT ${SecWebapps} $(DESC_SecWebapps)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
@@ -653,13 +653,12 @@
RMDir /r "$INSTDIR\lib"
Delete "$INSTDIR\conf\*.dtd"
RMDir "$INSTDIR\logs"
- RMDir /r "$INSTDIR\webapps\balancer"
+; RMDir /r "$INSTDIR\webapps\balancer"
RMDir /r "$INSTDIR\webapps\docs"
RMDir /r "$INSTDIR\webapps\examples"
- RMDir /r "$INSTDIR\webapps\webdav"
+; RMDir /r "$INSTDIR\webapps\webdav"
RMDir /r "$INSTDIR\work"
RMDir /r "$INSTDIR\temp"
- RMDir /r "$INSTDIR\src"
RMDir "$INSTDIR"
IfSilent Removed 0
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
