- Default configuration updates.

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

diff --git a/res/confinstall/server_1.xml b/res/confinstall/server_1.xml
index 46229b5..110f968 100644 (file)
--- a/res/confinstall/server_1.xml
+++ b/res/confinstall/server_1.xml
@@ -32,7 +32,14 @@
        Documentation at /docs/config/service.html
    -->
   <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 (blocking & non-blocking)

diff --git a/res/confinstall/server_2.xml b/res/confinstall/server_2.xml
index fd54e10..11ed602 100644 (file)
--- a/res/confinstall/server_2.xml
+++ b/res/confinstall/server_2.xml
@@ -1,14 +1,20 @@
  protocol="HTTP/1.1" 
-               maxThreads="150" connectionTimeout="20000" 
+               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" 
+    <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+               maxThreads="150" scheme="https" secure="true"
                clientAuth="false" sslProtocol="TLS" />
     -->