[jboss-cvs] JBossAS SVN: r62484 - trunk/tomcat/src/resources.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2007-04-23 10:06:24 -0400 (Mon, 23 Apr 2007)
New Revision: 62484

Modified:
   trunk/tomcat/src/resources/server.xml
   trunk/tomcat/src/resources/web.xml
Log:
- Merge the current configuration style.

Modified: trunk/tomcat/src/resources/server.xml
===================================================================
--- trunk/tomcat/src/resources/server.xml	2007-04-23 13:26:12 UTC (rev 62483)
+++ trunk/tomcat/src/resources/server.xml	2007-04-23 14:06:24 UTC (rev 62484)
@@ -2,30 +2,29 @@
 
    <!-- Optional listener which ensures correct init and shutdown of APR,
         and provides information if it is not installed -->
-   <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+   <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+   <Listener className="org.apache.catalina.core.JasperListener" />
 
    <Service name="jboss.web">
 
       <!-- A HTTP/1.1 Connector on port 8080 -->
-      <Connector port="8080" address="${jboss.bind.address}"
-         maxThreads="250" strategy="ms" maxHttpHeaderSize="8192"
-         emptySessionPath="true"
-         enableLookups="false" redirectPort="8443" acceptCount="100"
-         connectionTimeout="20000" disableUploadTimeout="true"/>
+      <Connector protocol="HTTP/1.1" port="8080" address="${jboss.bind.address}" 
+               connectionTimeout="20000" emptySessionPath="true"
+               redirectPort="8443" />
 
       <!-- Add this option to the connector to avoid problems with 
           .NET clients that don't implement HTTP/1.1 correctly 
          restrictedUserAgents="^.*MS Web Services Client Protocol 1.1.4322.*$"
       -->
-	
+
       <!-- A AJP 1.3 Connector on port 8009 -->
-      <Connector port="8009" address="${jboss.bind.address}"
-         emptySessionPath="true" enableLookups="false" redirectPort="8443" 
-         protocol="AJP/1.3"/>
+      <Connector protocol="AJP/1.3" port="8009" address="${jboss.bind.address}"
+         emptySessionPath="true" redirectPort="8443" />
 
       <!-- SSL/TLS Connector configuration using the admin devl guide keystore
-      <Connector port="8443" address="${jboss.bind.address}"
-           maxThreads="100" strategy="ms" maxHttpHeaderSize="8192"
+      <Connector protocol="HTTP/1.1" SSLEnabled="true" 
+           port="8443" address="${jboss.bind.address}"
            emptySessionPath="true"
            scheme="https" secure="true" clientAuth="false" 
            keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore"
@@ -82,7 +81,7 @@
  
             <!-- Access logger -->
             <!--
-            <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+            <Valve className="org.apache.catalina.valves.AccessLogValve"
                 prefix="localhost_access_log." suffix=".log"
                 pattern="common" directory="${jboss.server.home.dir}/log" 
                 resolveHosts="false" />

Modified: trunk/tomcat/src/resources/web.xml
===================================================================
--- trunk/tomcat/src/resources/web.xml	2007-04-23 13:26:12 UTC (rev 62483)
+++ trunk/tomcat/src/resources/web.xml	2007-04-23 14:06:24 UTC (rev 62484)
@@ -108,7 +108,7 @@
       </init-param>
       <init-param>
          <param-name>listings</param-name>
-         <param-value>true</param-value>
+         <param-value>false</param-value>
       </init-param>
       <load-on-startup>1</load-on-startup>
    </servlet>