merge of '6ccace0742effd1eaadcc151f428825fa3215e12'

and 'dc06981e777b7e1c191937d6d8190b26a8f6bbc7'

installer/resources/eepsite/jetty.xml

@@ -12,7 +12,7 @@
 <!--   * port: Default 7658 in the addConnector section                         -->
 <!--   * docroot: Change the ResourceBase in the contexts/base-context.xml file -->
 <!--           to serve files from a different location.                       -->
-<!--   * threads: Raise MinThreads and/or MaxThreads in the addListener section -->
+<!--   * threads: Raise maximumPoolSize in the ThreadPool section              -->
 <!--           if you have a high-traffic site and get a lot of warnings.      -->
 <!--   * Uncomment the addWebApplications section to use to enable             -->
 <!--           war files placed in the webapps/ dir.                           -->
@@ -65,7 +65,8 @@
      -->
 
       <!-- Optional Java 5 bounded threadpool with job queue 
-           Requests above the max will be rejected
+           Requests above the max will be rejected and logged.
+           High-traffic sites should increase maximumPoolSize.
            TODO: would be nice to use the 5-arg constructor but
                  how do you use an Enum as the TimeUnit argument?
            Alternatively, make a custom class where we can
@@ -75,7 +76,7 @@
       <New class="org.mortbay.thread.concurrent.ThreadPool">
         <Arg type="int">0</Arg>
         <Set name="corePoolSize">1</Set>
-        <Set name="maximumPoolSize">16</Set>
+        <Set name="maximumPoolSize">24</Set>
       </New>
     </Set>
 
@@ -89,6 +90,8 @@
 
     <!-- Use this connector for many frequently idle connections
          and for threadless continuations.
+         Not recommended on Java 5 - comment out and uncomment the
+         SocketConnector below.
     -->    
     <Call name="addConnector">
       <Arg>
@@ -106,6 +109,24 @@
       </Arg>
     </Call>
 
+    <!-- Recommended to use this connector on Java 5, as
+         Jetty 6 and Java 5 NIO don't play well together.
+    -->
+    <!--
+    <Call name="addConnector">
+      <Arg>
+          <New class="org.mortbay.jetty.bio.SocketConnector">
+            <Set name="host">127.0.0.1</Set>
+            <Set name="port">7658</Set>
+            <Set name="maxIdleTime">60000</Set>
+            <Set name="Acceptors">1</Set>
+            <Set name="statsOn">false</Set>
+            <Set name="confidentialPort">8443</Set>
+          </New>
+      </Arg>
+    </Call>
+    -->
+
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <!-- To add a HTTPS SSL listener                                     -->
     <!-- see jetty-ssl.xml to add an ssl connector. use                  -->