- Cleanup the configuration (and fix the one used for the installer).

- Tweak a bit the installer packaging.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@428563 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/server.xml b/conf/server.xml
index 424bd78..ccf5ed6 100644 (file)
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -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

diff --git a/dist.xml b/dist.xml
index f3529ca..b8213ff 100644 (file)
--- a/dist.xml
+++ b/dist.xml
@@ -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}"/>

diff --git a/res/confinstall/server_1.xml b/res/confinstall/server_1.xml
index 809fc9a..648e7d5 100644 (file)
--- a/res/confinstall/server_1.xml
+++ b/res/confinstall/server_1.xml
@@ -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

diff --git a/res/confinstall/server_2.xml b/res/confinstall/server_2.xml
index f3ee0f1..c864af0 100644 (file)
--- a/res/confinstall/server_2.xml
+++ b/res/confinstall/server_2.xml
@@ -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>
         -->        
 

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index c9c7838..8e0550f 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -293,15 +293,15 @@ SectionEnd
 ;\r
 ;SectionEnd\r
 \r
-Section "Webapps" SecWebapps\r
-\r
-  SectionIn 3\r
-\r
-  SetOutPath $INSTDIR\webapps\r
-  File /nonfatal /r webapps\balancer\r
-  File /nonfatal /r webapps\webdav\r
-\r
-SectionEnd\r
+;Section "Webapps" SecWebapps\r
+;\r
+;  SectionIn 3\r
+;\r
+;  SetOutPath $INSTDIR\webapps\r
+;  File /nonfatal /r webapps\balancer\r
+;  File /nonfatal /r webapps\webdav\r
+;\r
+;SectionEnd\r
 \r
 ;Section "Compatibility" SecCompat\r
 ;\r
@@ -365,7 +365,7 @@ FunctionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDocs} $(DESC_SecDocs)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(DESC_SecExamples)\r
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${SecAdmin} $(DESC_SecAdmin)\r
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWebapps} $(DESC_SecWebapps)\r
+;  !insertmacro MUI_DESCRIPTION_TEXT ${SecWebapps} $(DESC_SecWebapps)\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_END\r
 \r
 \r
@@ -653,13 +653,12 @@ Section Uninstall
   RMDir /r "$INSTDIR\lib"\r
   Delete "$INSTDIR\conf\*.dtd"\r
   RMDir "$INSTDIR\logs"\r
-  RMDir /r "$INSTDIR\webapps\balancer"\r
+;  RMDir /r "$INSTDIR\webapps\balancer"\r
   RMDir /r "$INSTDIR\webapps\docs"\r
   RMDir /r "$INSTDIR\webapps\examples"\r
-  RMDir /r "$INSTDIR\webapps\webdav"\r
+;  RMDir /r "$INSTDIR\webapps\webdav"\r
   RMDir /r "$INSTDIR\work"\r
   RMDir /r "$INSTDIR\temp"\r
-  RMDir /r "$INSTDIR\src"\r
   RMDir "$INSTDIR"\r
 \r
   IfSilent Removed 0\r