tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amy...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteConnector.java mbeans-descriptors.xml
Date Mon, 25 Aug 2003 22:08:24 GMT
amyroh      2003/08/25 15:08:24

  Modified:    catalina/src/share/org/apache/coyote/tomcat5
                        CoyoteConnector.java mbeans-descriptors.xml
  Log:
  Update connector mbean management attributes.
  
  Revision  Changes    Path
  1.25      +48 -1     jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CoyoteConnector.java	20 Aug 2003 16:27:35 -0000	1.24
  +++ CoyoteConnector.java	25 Aug 2003 22:08:24 -0000	1.25
  @@ -1459,6 +1459,27 @@
   
       // -------------------- Management methods --------------------
   
  +
  +    public String getAlgorithm() {
  +        String ret = (String) getProperty("algorithm");
  +        if (ret == null) {
  +            ServerSocketFactory factory = this.getFactory();
  +            if (factory instanceof CoyoteServerSocketFactory) {
  +                ret = ((CoyoteServerSocketFactory)factory).getAlgorithm();
  +            }
  +        }
  +
  +        return ret;
  +    }
  +
  +    public void setAlgorithm(String algorithm) {
  +        setProperty("algorithm", algorithm);
  +        ServerSocketFactory factory = this.getFactory();
  +        if (factory instanceof CoyoteServerSocketFactory) {
  +            ((CoyoteServerSocketFactory)factory).setAlgorithm(algorithm);
  +        }
  +    }
  +    
       public boolean getClientAuth() {
           boolean ret = false;
   
  @@ -1530,6 +1551,32 @@
           }
       }
   
  +    /**
  +     * Return keystoreType
  +     */
  +    public String getKeystoreType() {
  +        String ret = (String) getProperty("keytype");
  +        if (ret == null) {
  +            ServerSocketFactory factory = getFactory();
  +            if (factory instanceof CoyoteServerSocketFactory ) {
  +                return ((CoyoteServerSocketFactory)factory).getKeystoreType();
  +            }
  +        }
  +
  +        return ret;
  +    }
  +
  +    /**
  +     * Set keystoreType
  +     */
  +    public void setKeystoreType(String keystoreType) {
  +        setProperty("keytype", keystoreType);
  +        ServerSocketFactory factory = getFactory();
  +        if( factory instanceof CoyoteServerSocketFactory ) {
  +            ((CoyoteServerSocketFactory)factory).setKeystoreType(keystoreType);
  +        }
  +    }
  +    
       /**
        * Gets the list of SSL cipher suites that are to be enabled
        *
  
  
  
  1.7       +48 -11    jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mbeans-descriptors.xml	19 Aug 2003 16:13:37 -0000	1.6
  +++ mbeans-descriptors.xml	25 Aug 2003 22:08:24 -0000	1.7
  @@ -15,6 +15,10 @@
             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="bufferSize"
             description="The input buffer size we should create on input streams"
                    type="int"/>
  @@ -32,26 +36,30 @@
             description="Comma-separated list of SSL cipher suites to be enabled"
                    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="sslProtocol"
  -          description="SSL protocol variant to be used"
  +    <attribute   name="compression"
  +          description="Compression value"
                    type="java.lang.String"/>
   
  -    <attribute   name="sslProtocols"
  -          description="Comma-separated list of SSL protocol variants to be enabled"
  -                 type="java.lang.String"/>
  +    <attribute   name="connectionLinger"
  +          description="Linger value on the incoming connection"
  +                 type="int"/>
   
       <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="debug"
             description="The debugging detail level for this component"
                    type="int"/>
   
  +    <attribute    name="disableUploadTimeout"
  +           description="Should Tomcat ignore setting a timeout for uploads?" 
  +                  type="boolean"/>
  +
       <attribute   name="enableLookups"
             description="The 'enable DNS lookups' flag for this Connector"
                    type="boolean"/>
  @@ -64,6 +72,18 @@
             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="maxKeepAliveRequests"
  +          description="Maximum number of Keep-Alive requests to honor per connection"
  +                 type="int"/>
  +
       <attribute   name="maxProcessors"
             description="The maximum number of processors allowed"
                    type="int"/>
  @@ -77,6 +97,10 @@
             description="The port number on which we listen for ajp13 requests"
                   type="int"/>
   
  +    <attribute   name="protocol"
  +          description="Coyote protocol handler in use"
  +                 type="java.lang.String"/>
  +
       <attribute   name="protocolHandlerClassName"
             description="Coyote Protocol handler class name"
                    type="java.lang.String"
  @@ -107,12 +131,25 @@
             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"/>
  +
  +    <attribute   name="tcpNoDelay"
  +          description="Should we use TCP no delay?"
  +                 type="boolean"/>
  +
       <attribute    name="tomcatAuthentication"
              description="Should Tomcat perform all authentications?"
                     type="boolean"/>
   
  -    <attribute    name="disableUploadTimeout"
  -           description="Should Tomcat ignore setting a timeout for uploads?" 
  +    <attribute    name="xpoweredBy"
  +           description="Is generation of X-Powered-By response header enabled/disabled?"
  +                    is="true"
                     type="boolean"/>
   
       <operation name="start" description="Start" impact="ACTION" returnType="void" />
  
  
  

Mime
View raw message