[jbossweb-commits] JBossWeb SVN: r423 - in trunk: res/confinstall and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2008-02-14 06:15:19 -0500 (Thu, 14 Feb 2008) New Revision: 423 Modified: trunk/conf/server.xml trunk/res/confinstall/server_1.xml trunk/res/confinstall/server_2.xml Log: - Default configuration cleanup. Modified: trunk/conf/server.xml =================================================================== --- trunk/conf/server.xml 2008-02-14 10:58:05 UTC (rev 422) +++ trunk/conf/server.xml 2008-02-14 11:15:19 UTC (rev 423) @@ -6,7 +6,7 @@ <!--APR library loader. Documentation at /docs/apr.html --> <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> - <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html --> + <!--Initialize Jasper prior to webapps deployment. Documentation at /docs/jasper-howto.html --> <Listener className="org.apache.catalina.core.JasperListener" /> <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html --> <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" /> @@ -19,43 +19,22 @@ --> <Service name="Catalina"> - <!--The connectors can use a shared executor, you can define one or more named thread pools--> - <!-- - <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" - maxThreads="150" minSpareThreads="4"/> - --> - <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : Java HTTP Connector: /docs/config/http.html Java AJP Connector: /docs/config/ajp.html If APR is installed, additional Connector documentation: /docs/apr.html - Define a non-SSL HTTP/1.1 Connector on port 8080 + Define a non-SSL HTTP/1.1 Connector on port 8080. + For HTTPS, refer to the documentation. + JSSE documentation: /docs/ssl-howto.html + Using APR and OpenSSL: /docs/apr.html --> <Connector port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" - redirectPort="8443" /> - <!-- A "Connector" using the shared thread pool--> - <!-- - <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" - redirectPort="8443" /> - --> - <!-- 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" protocol="HTTP/1.1" SSLEnabled="true" - maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" /> - --> + connectionTimeout="20000" redirectPort="8443" /> <!-- Define an AJP 1.3 Connector on port 8009 --> <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> - <!-- An Engine represents the entry point (within Catalina) that processes every request. The Engine implementation for Tomcat stand alone analyzes the HTTP headers included with the request, and passes them Modified: trunk/res/confinstall/server_1.xml =================================================================== --- trunk/res/confinstall/server_1.xml 2008-02-14 10:58:05 UTC (rev 422) +++ trunk/res/confinstall/server_1.xml 2008-02-14 11:15:19 UTC (rev 423) @@ -6,7 +6,7 @@ <!--APR library loader. Documentation at /docs/apr.html --> <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> - <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html --> + <!--Initialize Jasper prior to webapps deployment. Documentation at /docs/jasper-howto.html --> <Listener className="org.apache.catalina.core.JasperListener" /> <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html --> <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" /> @@ -19,17 +19,14 @@ --> <Service name="Catalina"> - <!--The connectors can use a shared executor, you can define one or more named thread pools--> - <!-- - <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" - maxThreads="150" minSpareThreads="4"/> - --> - <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : Java HTTP Connector: /docs/config/http.html Java AJP Connector: /docs/config/ajp.html If APR is installed, additional Connector documentation: /docs/apr.html - Define a non-SSL HTTP/1.1 Connector on port 8080 + Define a non-SSL HTTP/1.1 Connector on port 8080. + For HTTPS, refer to the documentation. + JSSE documentation: /docs/ssl-howto.html + Using APR and OpenSSL: /docs/apr.html --> <Connector \ No newline at end of file Modified: trunk/res/confinstall/server_2.xml =================================================================== --- trunk/res/confinstall/server_2.xml 2008-02-14 10:58:05 UTC (rev 422) +++ trunk/res/confinstall/server_2.xml 2008-02-14 11:15:19 UTC (rev 423) @@ -1,21 +1,5 @@ protocol="HTTP/1.1" - connectionTimeout="20000" - redirectPort="8443" /> - <!-- A "Connector" using the shared thread pool--> - <!-- - <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" - redirectPort="8443" /> - --> - <!-- 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" protocol="HTTP/1.1" SSLEnabled="true" - maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" /> + connectionTimeout="20000" redirectPort="8443" /> --> <!-- Define an AJP 1.3 Connector on port 8009 -->