Remove all traces of maxSpareThreads

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

diff --git a/java/org/apache/catalina/connector/mbeans-descriptors.xml b/java/org/apache/catalina/connector/mbeans-descriptors.xml
index 57a9279..22802f9 100644 (file)
--- a/java/org/apache/catalina/connector/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml
@@ -117,10 +117,6 @@
           description="Maximum size in bytes of a POST which will be handled by the servlet API provided features"
                  type="int"/>
 
-    <attribute   name="maxSpareThreads"
-          description="The maximum number of unused request processing threads"
-                 type="int"/>
-
     <attribute   name="maxThreads"
           description="The maximum number of request processing threads to be created"
                  type="int"/>

diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index 972087d..a40322b 100644 (file)
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -316,7 +316,7 @@ file installed with Tomcat.  It will look something like this:</p>
 &lt;-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;!--
 &lt;Connector 
-           port="8443" minSpareThreads="5" maxSpareThreads="75"
+           port="8443" minSpareThreads="5"
            enableLookups="true" disableUploadTimeout="true" 
            acceptCount="100"  maxThreads="200"
            scheme="https" secure="true" SSLEnabled="true"
@@ -332,7 +332,7 @@ file installed with Tomcat.  It will look something like this:</p>
 &lt;-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;!--
 &lt;Connector 
-           port="8443" minSpareThreads="5" maxSpareThreads="75"
+           port="8443" minSpareThreads="5"
            enableLookups="true" disableUploadTimeout="true" 
            acceptCount="100"  maxThreads="200"
            scheme="https" secure="true" SSLEnabled="true"
@@ -351,7 +351,7 @@ file installed with Tomcat.  It will look something like this:</p>
 &lt;-- Define a blocking Java SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;!--
 &lt;Connector protocol="org.apache.coyote.http11.Http11Protocol"
-           port="8443" minSpareThreads="5" maxSpareThreads="75"
+           port="8443" minSpareThreads="5"
            enableLookups="true" disableUploadTimeout="true" 
            acceptCount="100"  maxThreads="200"
            scheme="https" secure="true" SSLEnabled="true"
@@ -361,7 +361,7 @@ file installed with Tomcat.  It will look something like this:</p>
 &lt;-- Define a non-blocking Java SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;!--
 &lt;Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
-           port="8443" minSpareThreads="5" maxSpareThreads="75"
+           port="8443" minSpareThreads="5"
            enableLookups="true" disableUploadTimeout="true" 
            acceptCount="100"  maxThreads="200"
            scheme="https" secure="true" SSLEnabled="true"
@@ -374,7 +374,7 @@ and to specify an APR connector
 &lt;-- Define a APR SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;!--
 &lt;Connector protocol="org.apache.coyote.http11.Http11AprProtocol"
-           port="8443" minSpareThreads="5" maxSpareThreads="75"
+           port="8443" minSpareThreads="5"
            enableLookups="true" disableUploadTimeout="true" 
            acceptCount="100"  maxThreads="200"
            scheme="https" secure="true" SSLEnabled="true"

diff --git a/webapps/manager/status.xsd b/webapps/manager/status.xsd
index a9e1ba1..6433bb3 100644 (file)
--- a/webapps/manager/status.xsd
+++ b/webapps/manager/status.xsd
@@ -55,7 +55,6 @@
        <xs:complexType name="threadInfo">
                <xs:attribute name="maxThreads" type="xs:int" use="required"/>
                <xs:attribute name="minSpareThreads" type="xs:int" use="required"/>
-               <xs:attribute name="maxSpareThreads" type="xs:int" use="required"/>
                <xs:attribute name="currentThreadCount" type="xs:int" use="required"/>
                <xs:attribute name="currentThreadsBusy" type="xs:int" use="required"/>
        </xs:complexType>

diff --git a/webapps/manager/xform.xsl b/webapps/manager/xform.xsl
index 09b3028..9b087de 100644 (file)
--- a/webapps/manager/xform.xsl
+++ b/webapps/manager/xform.xsl
@@ -69,7 +69,6 @@
                 <td><b>threadInfo </b></td>
                 <td><b>maxThreads:</b> <xsl:value-of select="@maxThreads"/></td>
                 <td><b>minSpareThreads:</b> <xsl:value-of select="@minSpareThreads"/></td>
-                <td><b>maxSpareThreads:</b> <xsl:value-of select="@maxSpareThreads"/></td>
                 <td><b>currentThreadCount:</b> <xsl:value-of select="@currentThreadCount"/></td>
                 <td><b>currentThreadsBusy:</b> <xsl:value-of select="@currentThreadsBusy"/></td>
           </tr>