GSOC 2010: Further improvements to o.a.c.connector

Patch provided by Chamith Buddhika

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@946258 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 6d90ab9..dca7d6e 100644 (file)
--- a/java/org/apache/catalina/connector/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml
@@ -17,6 +17,12 @@
 -->
 <mbeans-descriptors>
 
+  <!-- This MBean contains Connector attributes and some common attributes of
+       associated ProtocolHandler instances. Common attributes extracted out
+       from all ProtocolHandler implementations are denoted by a comment
+       'common' above their description. Each attribute particular to given
+       ProtocolHandler implementation can be found in relevant ProtocolHandler
+       MBean. -->
   <mbean         name="CoyoteConnector"
             className="org.apache.catalina.mbeans.ConnectorMBean"
           description="Implementation of a Coyote connector"
@@ -24,18 +30,16 @@
                 group="Connector"
                  type="org.apache.catalina.connector.Connector">
 
+       <!-- Common -->
     <attribute   name="acceptCount"
           description="The accept count for this Connector"
                  type="int"/>
-
+       
+       <!-- Common -->
     <attribute   name="address"
           description="The IP address on which to bind"
                  type="java.lang.String"/>
-
-    <attribute   name="algorithm"
-          description="The certificate encoding algorithm to be used"
-                 type="java.lang.String"/>
-
+                 
     <attribute   name="allowTrace"
           description="Allow disabling TRACE method"
                  type="boolean"/>
@@ -48,35 +52,17 @@
           description="Fully qualified class name of the managed object"
                  type="java.lang.String"
             writeable="false"/>
-
-    <attribute   name="clientAuth"
-          description="Should we require client authentication?"
-                 type="java.lang.String"/>
-
-    <attribute   name="ciphers"
-          description="Comma-separated list of SSL cipher suites to be enabled"
-                 type="java.lang.String"/>
-
-    <attribute   name="compression"
-          description="Compression value"
-                 type="java.lang.String"/>
-
+    
+    <!-- Common -->
     <attribute   name="connectionLinger"
           description="Linger value on the incoming connection"
                  type="int"/>
 
+       <!-- Common -->
     <attribute   name="connectionTimeout"
           description="Timeout value on the incoming connection"
                  type="int"/>
-
-    <attribute   name="connectionUploadTimeout"
-          description="Timeout value on the incoming connection during request processing"
-                 type="int"/>
-
-    <attribute    name="disableUploadTimeout"
-           description="Should Tomcat ignore setting a timeout for uploads?" 
-                  type="boolean"/>
-
+                 
     <attribute   name="emptySessionPath"
           description="The 'empty session path' flag for this Connector"
                  type="boolean"/>
@@ -85,31 +71,12 @@
           description="The 'enable DNS lookups' flag for this Connector"
                  type="boolean"/>
 
+       <!-- Common -->
     <attribute   name="keepAliveTimeout"
           description="The number of seconds Tomcat will wait for a subsequent request before closing the connection"
                  type="int"/>
 
-    <attribute   name="keystoreFile"
-          description="Pathname to the key store file to be used"
-                 type="java.lang.String"/>
-
-    <attribute   name="keystorePass"
-          description="Password for accessing the key store file"
-                 type="java.lang.String"/>
-
-    <attribute   name="keystoreType"
-          description="Type of keystore file to be used for the server certificate"
-                 type="java.lang.String"/>
-
-    <attribute   name="keyAlias"
-          description="Alias name of this connector's keypair and supporting certificate chain"
-                 type="java.lang.String"/>
-
-    <attribute   name="maxHttpHeaderSize"
-          description="Maximum size in bytes of the HTTP header"
-                 type="int"/>
-
-    <attribute   name="maxKeepAliveRequests"
+       <attribute   name="maxKeepAliveRequests"
           description="Maximum number of Keep-Alive requests to honor per connection"
                  type="int"/>
 
@@ -121,7 +88,8 @@
           description="Maximum size of a POST which will be saved by the container during authentication"
                  type="int"/>                
 
-    <attribute   name="maxThreads"
+       <!-- Common -->
+       <attribute   name="maxThreads"
           description="The maximum number of request processing threads to be created"
                  type="int"/>
 
@@ -129,9 +97,15 @@
           description="The number of request processing threads that will be created"
                  type="int"/>
 
+       <!-- Common -->
     <attribute   name="port"
           description="The port number on which we listen for ajp13 requests"
                 type="int"/>
+    
+    <!-- Common -->            
+    <attribute   name="processorCache"
+          description="The processor cache size."
+                 type="int"/>    
 
     <attribute   name="protocol"
           description="Coyote protocol handler in use"
@@ -166,11 +140,7 @@
     <attribute   name="secure"
           description="Is this a secure (SSL) Connector?"
                  type="boolean"/>
-
-    <attribute   name="sslProtocol"
-          description="SSL protocol variant to be used"
-                 type="java.lang.String"/>
-
+                 
     <attribute   name="sslProtocols"
           description="Comma-separated list of SSL protocol variants to be enabled"
                  type="java.lang.String"/>
@@ -184,30 +154,16 @@
           description="Thread pool strategy"
                  type="java.lang.String"/>
 
+       <!-- Common -->
     <attribute   name="tcpNoDelay"
           description="Should we use TCP no delay?"
                  type="boolean"/>
-
-    <attribute    name="tomcatAuthentication"
-           description="Should Tomcat perform all authentications?"
-                  type="boolean"/>
-
+    
+    <!-- Common -->
     <attribute    name="threadPriority"
            description="The thread priority for processors"
                   type="int"/>
-
-    <attribute   name="trustStoreFile"
-          description="Pathname to the trust store file to be used"
-                 type="java.lang.String"/>
-
-    <attribute   name="trustStorePass"
-          description="Password for accessing the trust store file"
-                 type="java.lang.String"/>
-
-    <attribute   name="trustStoreType"
-          description="Type of trust store file to be used for trusted certificates"
-                 type="java.lang.String"/>
-
+                  
     <attribute   name="URIEncoding"
           description="Character encoding used to decode the URI"
                  type="java.lang.String"/>
@@ -233,7 +189,4 @@
 
   </mbean>
 
-
 </mbeans-descriptors>
-
-