amyroh      02/02/13 23:47:14

  Modified:    catalina/src/share/org/apache/catalina/mbeans
                        MBeanUtils.java mbeans-descriptors.xml
  Log:
  Add additional Catalina components MBeans.
  
  Revision  Changes    Path
  1.25      +39 -56    
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- MBeanUtils.java   12 Feb 2002 19:05:25 -0000      1.24
  +++ MBeanUtils.java   14 Feb 2002 07:47:14 -0000      1.25
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
 1.24 2002/02/12 19:05:25 craigmcc Exp $
  - * $Revision: 1.24 $
  - * $Date: 2002/02/12 19:05:25 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
 1.25 2002/02/14 07:47:14 amyroh Exp $
  + * $Revision: 1.25 $
  + * $Date: 2002/02/14 07:47:14 $
    *
    * ====================================================================
    *
  @@ -109,7 +109,7 @@
    *
    * @author Craig R. McClanahan
    * @author Amy Roh
  - * @version $Revision: 1.24 $ $Date: 2002/02/12 19:05:25 $
  + * @version $Revision: 1.25 $ $Date: 2002/02/14 07:47:14 $
    */
   
   public class MBeanUtils {
  @@ -203,9 +203,8 @@
           String mname = createManagedName(connector);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -232,9 +231,8 @@
           String mname = createManagedName(context);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -261,9 +259,8 @@
           String mname = createManagedName(context);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -290,9 +287,8 @@
           String mname = createManagedName(engine);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -319,9 +315,8 @@
           String mname = createManagedName(group);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -348,9 +343,8 @@
           String mname = createManagedName(host);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -377,9 +371,8 @@
           String mname = createManagedName(loader);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -405,9 +398,8 @@
           String mname = createManagedName(logger);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -434,9 +426,8 @@
           String mname = createManagedName(manager);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -463,9 +454,8 @@
           String mname = createManagedName(factory);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -492,9 +482,8 @@
           String mname = createManagedName(realm);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -521,9 +510,8 @@
           String mname = createManagedName(role);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -550,9 +538,8 @@
           String mname = createManagedName(server);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -579,9 +566,8 @@
           String mname = createManagedName(service);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -608,9 +594,8 @@
           String mname = createManagedName(user);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -637,9 +622,8 @@
           String mname = createManagedName(userDatabase);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -666,9 +650,8 @@
           String mname = createManagedName(valve);
           ManagedBean managed = registry.findManagedBean(mname);
           if (managed == null) {
  -            //Exception e = new Exception("ManagedBean is not found with "+mname);
  -            //throw new MBeanException(e);
  -            return null;
  +            Exception e = new Exception("ManagedBean is not found with "+mname);
  +            throw new MBeanException(e);
           }
           String domain = managed.getDomain();
           if (domain == null)
  @@ -1204,7 +1187,7 @@
                   path = "/";
               }
               Host host = (Host) container.getParent();
  -            Service service = ((Engine)container.getParent()).getService();
  +            Service service = ((Engine) host.getParent()).getService();
               Integer sequenceInt = new Integer(contextValveSequence);
               String sequenceStr = sequenceInt.toString();
               name = new ObjectName(domain + ":type=Valve,sequence=" +
  
  
  
  1.30      +517 -57   
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mbeans-descriptors.xml    12 Feb 2002 01:05:56 -0000      1.29
  +++ mbeans-descriptors.xml    14 Feb 2002 07:47:14 -0000      1.30
  @@ -6,7 +6,7 @@
   <!--
        Descriptions of JMX MBeans for Catalina
   
  -     $Id: mbeans-descriptors.xml,v 1.29 2002/02/12 01:05:56 amyroh Exp $
  +     $Id: mbeans-descriptors.xml,v 1.30 2002/02/14 07:47:14 amyroh Exp $
    -->
   
   <mbeans-descriptors>
  @@ -93,7 +93,8 @@
                    type="int"/>
   
       <attribute   name="minProcessors"
  -          description="The minimum number of processors to start at initialization 
time"
  +          description="The minimum number of processors to start at
  +                        initialization time"
                    type="int"/>
   
       <attribute   name="port"
  @@ -115,19 +116,79 @@
     </mbean>
   
   
  +  <mbean         name="BasicAuthenticator"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="An Authenticator and Valve implementation of HTTP BASIC
  +                        Authentication"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.authenticator.BasicAuthenticator">
  +
  +    <attribute   name="algorithm"
  +          description="The message digest algorithm to be used when generating
  +                        session identifiers"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="cache"
  +          description="Should we cache authenticated Principals if the request
  +                        is part of an HTTP session?"
  +                 type="boolean"/>
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +    <attribute   name="entropy"
  +          description="A String initialization parameter used to increase the
  +                        entropy of the initialization of our random number
  +                        generator"
  +                 type="java.lang.String"/>
  +  </mbean>
  +
  +
  +  <mbean         name="ContextConfig"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Startup event listener for a Context that configures the
  +                        properties of that Context, and the associated defined
  +                        servlets"
  +               domain="Catalina"
  +                group="Listener"
  +                 type="org.apache.catalina.startup.ContextConfig">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +
     <mbean         name="DefaultContext"
                 className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Used to store the default configuration a Host will use when 
creating a Context"
  +          description="Used to store the default configuration a Host will use
  +                        when creating a Context"
                  domain="Catalina"
                   group="Default-Context"
                    type="org.apache.catalina.core.StandardDefaultContext">
   
       <attribute   name="cookies"
  -          description="Should we attempt to use cookies for session id 
communication?"
  +          description="Should we attempt to use cookies for session id
  +                        communication?"
                    type="boolean"/>
   
       <attribute   name="crossContext"
  -          description="Should we allow the ServletContext.getContext() method to 
access the context of other web applications in this server?"
  +          description="Should we allow the ServletContext.getContext() method to
  +                        access the context of other web applications in this
  +                        server?"
                    type="boolean"/>
   
       <attribute   name="reloadable"
  @@ -142,9 +203,104 @@
     </mbean>
   
   
  +  <mbean         name="DigestAuthenticator"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="An Authenticator and Valve implementation of HTTP DIGEST
  +                        Authentication"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.authenticator.DigestAuthenticator">
  +
  +    <attribute   name="algorithm"
  +          description="The message digest algorithm to be used when generating
  +                        session identifiers"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="cache"
  +          description="Should we cache authenticated Principals if the request
  +                        is part of an HTTP session?"
  +                 type="boolean"/>
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +    <attribute   name="entropy"
  +          description="A String initialization parameter used to increase the
  +                        entropy of the initialization of our random number
  +                        generator"
  +                 type="java.lang.String"/>
  +  </mbean>
  +
  +  <mbean         name="EngineConfig"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Startup event listener for a Engine that configures the
  +                        properties of that Engine, and the associated defined
  +                        contexts"
  +               domain="Catalina"
  +                group="Listener"
  +                 type="org.apache.catalina.startup.EngineConfig">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +
  +  <mbean         name="ErrorReportValve"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Implementation of a Valve that outputs HTML error pages"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.valves.ErrorReportValve">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +
  +  <mbean         name="ErrorDispatcherValve"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Implementation of a Valve that handles the error
  +                        dispatch"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.valves.ErrorDispatcherValve">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +
     <mbean         name="FileLogger"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Implementation of Logger that appends log messages to a file"
  +          description="Implementation of Logger that appends log messages to a
  +                        file"
                  domain="Catalina"
                   group="Logger"
                    type="org.apache.catalina.logger.FileLogger">
  @@ -175,9 +331,44 @@
                    type="boolean"/>
   
       <attribute   name="verbosity"
  -          description="The verbosity level for above which log messages may be 
filtered"
  +          description="The verbosity level for above which log messages may be
  +                        filtered"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +  <mbean         name="FormAuthenticator"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="An Authenticator and Valve implementation of FORM BASED
  +                        Authentication"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.authenticator.FormAuthenticator">
  +
  +    <attribute   name="algorithm"
  +          description="The message digest algorithm to be used when generating
  +                        session identifiers"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="cache"
  +          description="Should we cache authenticated Principals if the request
  +                        is part of an HTTP session?"
  +                 type="boolean"/>
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
                    type="int"/>
   
  +    <attribute   name="entropy"
  +          description="A String initialization parameter used to increase the
  +                        entropy of the initialization of our random number
  +                        generator"
  +                 type="java.lang.String"/>
     </mbean>
   
   
  @@ -233,6 +424,37 @@
     </mbean>
   
   
  +  <mbean         name="HostConfig"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Startup event listener for a Host that configures the
  +                        properties of that Host, and the associated defined
  +                        contexts"
  +               domain="Catalina"
  +                group="Listener"
  +                 type="org.apache.catalina.startup.HostConfig">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="configClass"
  +          description="The Java class name of the Context configuration class we
  +                        should use"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="contextClass"
  +          description="The Java class name of the Context implementation we
  +                        should use"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +
     <mbean         name="Http10Connector"
               className="org.apache.catalina.mbeans.ClassNameMBean"
             description="HTTP/1.0 Connector for Tomcat Standalone"
  @@ -274,7 +496,8 @@
                    type="int"/>
   
       <attribute   name="minProcessors"
  -          description="The minimum number of processors to start at initialization 
time"
  +          description="The minimum number of processors to start at
  +                        initialization time"
                    type="int"/>
   
       <attribute   name="port"
  @@ -282,11 +505,13 @@
                    type="int"/>
   
       <attribute   name="proxyName"
  -          description="The server name to which we should pretend requests to this 
Connector were directed"
  +          description="The server name to which we should pretend requests to
  +                        this Connector were directed"
                    type="java.lang.String"/>
   
       <attribute   name="proxyPort"
  -          description="The server port to which we should pretend requests to this 
Connector were directed"
  +          description="The server port to which we should pretend requests to
  +                        this Connector were directed"
                    type="int"/>
   
       <attribute   name="redirectPort"
  @@ -320,7 +545,8 @@
                    type="java.lang.String"/>
   
       <attribute   name="allowChunking"
  -          description="Flag which indicates if HTTP/1.1 chunking transfer encoding 
can be used"
  +          description="Flag which indicates if HTTP/1.1 chunking transfer
  +                        encoding can be used"
                    type="boolean"/>
   
       <attribute   name="bufferSize"
  @@ -349,7 +575,8 @@
                    type="int"/>
   
       <attribute   name="minProcessors"
  -          description="The minimum number of processors to start at initialization 
time"
  +          description="The minimum number of processors to start at
  +                        initialization time"
                    type="int"/>
   
       <attribute   name="port"
  @@ -357,11 +584,13 @@
                    type="int"/>
   
       <attribute   name="proxyName"
  -          description="The server name to which we should pretend requests to this 
Connector were directed"
  +          description="The server name to which we should pretend requests to
  +                        this Connector were directed"
                    type="java.lang.String"/>
   
       <attribute   name="proxyPort"
  -          description="The server port to which we should pretend requests to this 
Connector were directed"
  +          description="The server port to which we should pretend requests to
  +                        this Connector were directed"
                    type="int"/>
   
       <attribute   name="redirectPort"
  @@ -379,9 +608,56 @@
     </mbean>
   
   
  +  <mbean         name="JAASRealm"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Implmentation of Realm that authenticates users via the
  +                        Java Authentication and Authorization Service (JAAS)"
  +               domain="Catalina"
  +                group="Realm"
  +                 type="org.apache.catalina.realm.JAASRealm">
  +
  +    <attribute   name="appName"
  +          description="The application name passed to the JAAS LoginContext,
  +                        which uses it to select the set of relevant
  +                        LoginModules"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +    <attribute   name="digest"
  +          description="Digest algorithm used in storing passwords in a
  +                        non-plaintext format"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="roleClassNames"
  +          description="Comma-delimited list of javax.security.Principal classes
  +                        that represent security roles"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="userClassNames"
  +          description="Comma-delimited list of javax.security.Principal classes
  +                        that represent individual users"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="validate"
  +          description="Should we validate client certificate chains when they
  +                        are presented?"
  +                 type="java.lang.String"/>
  +
  +  </mbean>
  +
  +
     <mbean         name="JDBCRealm"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Implementation of Realm that works with any JDBC supported 
database"
  +          description="Implementation of Realm that works with any JDBC
  +                        supported database"
                  domain="Catalina"
                   group="Realm"
                    type="org.apache.catalina.realm.JDBCRealm">
  @@ -392,15 +668,18 @@
               writeable="false"/>
   
       <attribute   name="connectionName"
  -          description="The connection username to use when trying to connect to the 
database"
  +          description="The connection username to use when trying to connect to
  +                        the database"
                    type="java.lang.String"/>
   
       <attribute   name="connectionPassword"
  -          description="The connection URL to use when trying to connect to the 
database"
  +          description="The connection URL to use when trying to connect to the
  +                        database"
                    type="java.lang.String"/>
   
       <attribute   name="connectionURL"
  -          description="The connection URL to use when trying to connect to the 
database"
  +          description="The connection URL to use when trying to connect to the
  +                        database"
                    type="java.lang.String"/>
   
       <attribute   name="debug"
  @@ -408,7 +687,8 @@
                    type="int"/>
   
       <attribute   name="digest"
  -          description="Digest algorithm used in storing passwords in a 
non-plaintext format"
  +          description="Digest algorithm used in storing passwords in a
  +                        non-plaintext format"
                    type="java.lang.String"/>
   
       <attribute   name="driverName"
  @@ -420,15 +700,18 @@
                    type="java.lang.String"/>
   
       <attribute   name="userCredCol"
  -          description="The column in the user table that holds the user's 
credentials"
  +          description="The column in the user table that holds the user's
  +                        credentials"
                    type="java.lang.String"/>
   
       <attribute   name="userNameCol"
  -          description="The column in the user table that holds the user's username"
  +          description="The column in the user table that holds the user's
  +                        username"
                    type="java.lang.String"/>
   
       <attribute   name="userRoleTable"
  -          description="The table that holds the relation between user's and roles"
  +          description="The table that holds the relation between user's and
  +                        roles"
                    type="java.lang.String"/>
   
       <attribute   name="userTable"
  @@ -440,7 +723,9 @@
   
     <mbean         name="JNDIRealm"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Implementation of Realm that works with a directory server 
accessed via the Java Naming and Directory Interface (JNDI) APIs"
  +          description="Implementation of Realm that works with a directory
  +                        server accessed via the Java Naming and Directory
  +                        Interface (JNDI) APIs"
                  domain="Catalina"
                   group="Realm"
                    type="org.apache.catalina.realm.JNDIRealm">
  @@ -467,7 +752,8 @@
                    type="int"/>
   
       <attribute   name="digest"
  -          description="Digest algorithm used in storing passwords in a 
non-plaintext format"
  +          description="Digest algorithm used in storing passwords in a
  +                        non-plaintext format"
                    type="java.lang.String"/>
   
       <attribute   name="roleBase"
  @@ -479,7 +765,8 @@
                    type="java.lang.String"/>
   
       <attribute   name="roleSubtree"
  -          description="Should we search the entire subtree for matching 
memberships?"
  +          description="Should we search the entire subtree for matching
  +                        memberships?"
                    type="boolean"/>
   
       <attribute   name="userPattern"
  @@ -708,7 +995,8 @@
   
     <mbean         name="MemoryRealm"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Simple implementation of Realm that reads an XML file to 
configure the valid users, passwords, and roles"
  +          description="Simple implementation of Realm that reads an XML file to
  +                        configure the valid users, passwords, and roles"
                  domain="Catalina"
                   group="Realm"
                    type="org.apache.catalina.realm.MemoryRealm">
  @@ -723,7 +1011,8 @@
                    type="int"/>
   
       <attribute   name="pathname"
  -          description="The pathname of the XML file containing our database 
information"
  +          description="The pathname of the XML file containing our database
  +                        information"
                    type="java.lang.String"/>
   
     </mbean>
  @@ -861,9 +1150,31 @@
     </mbean>
   
   
  +  <mbean         name="NamingContextListener"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Helper class used to initialize and populate the JNDI
  +          context associated with each context and server"
  +               domain="Catalina"
  +                group="Listener"
  +                 type="org.apache.catalina.core.NamingContextListener">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +
     <mbean         name="RemoteAddrValve"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Concrete implementation of RequestFilterValve that filters 
based on the string representation of the remote client's IP address"
  +          description="Concrete implementation of RequestFilterValve that
  +                        filters based on the string representation of the remote
  +                        client's IP address"
                  domain="Catalina"
                   group="Valve"
                    type="org.apache.catalina.valves.RemoteAddrValve">
  @@ -890,7 +1201,9 @@
   
     <mbean         name="RemoteHostValve"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Concrete implementation of RequestFilterValve that filters 
based on the string representation of the remote client's host name"
  +          description="Concrete implementation of RequestFilterValve that
  +                        filters based on the string representation of the remote
  +                        client's host name"
                  domain="Catalina"
                   group="Valve"
                    type="org.apache.catalina.valves.RemoteHostValve">
  @@ -917,7 +1230,9 @@
   
     <mbean         name="RequestDumperValve"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Implementation of a Valve that logs interesting contents 
from the specified Request and the corresponding Response"
  +          description="Implementation of a Valve that logs interesting contents
  +                        from the specified Request and the corresponding
  +                        Response"
                  domain="Catalina"
                   group="Valve"
                    type="org.apache.catalina.valves.RequestDumperValve">
  @@ -971,6 +1286,42 @@
     </mbean>
   
   
  +  <mbean         name="SSLAuthenticator"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="An Authenticator and Valve implementation of
  +                        authentication that utilizes SSL certificates to
  +                        identify client users"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.authenticator.SSLAuthenticator">
  +
  +    <attribute   name="algorithm"
  +          description="The message digest algorithm to be used when generating
  +                        session identifiers"
  +                 type="java.lang.String"/>
  +
  +    <attribute   name="cache"
  +          description="Should we cache authenticated Principals if the request
  +                        is part of an HTTP session?"
  +                 type="boolean"/>
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +    <attribute   name="entropy"
  +          description="A String initialization parameter used to increase the
  +                        entropy of the initialization of our random number
  +                        generator"
  +                 type="java.lang.String"/>
  +  </mbean>
  +
  +
     <mbean         name="StandardContext"
               className="org.apache.catalina.mbeans.StandardContextMBean"
             description="Standard Context Component"
  @@ -979,15 +1330,19 @@
                    type="org.apache.catalina.core.StandardContext">
   
       <attribute   name="cookies"
  -          description="Should we attempt to use cookies for session id 
communication?"
  +          description="Should we attempt to use cookies for session id
  +                        communication?"
                    type="boolean"/>
   
       <attribute   name="cookies"
  -          description="Should we attempt to use cookies for session id 
communication?"
  +          description="Should we attempt to use cookies for session id
  +                        communication?"
                    type="boolean"/>
   
       <attribute   name="crossContext"
  -          description="Should we allow the ServletContext.getContext() method to 
access the context of other web applications in this server?"
  +          description="Should we allow the ServletContext.getContext() method to
  +                        access the context of other web applications in this
  +                        server?"
                    type="boolean"/>
   
       <attribute   name="debug"
  @@ -1003,7 +1358,8 @@
                    type="java.lang.Object"/>
   
       <attribute   name="override"
  -          description="The DefaultContext override flag for this web application"
  +          description="The DefaultContext override flag for this web
  +                        application"
                    type="boolean"/>
   
       <attribute   name="path"
  @@ -1033,7 +1389,8 @@
       </operation>
   
       <operation   name="removeValve"
  -          description="Remove the specified Valve from those associated with this 
Context"
  +          description="Remove the specified Valve from those associated with
  +                        this Context"
                  impact="ACTION"
              returnType="void">
         <parameter name="valve"
  @@ -1080,6 +1437,26 @@
     </mbean>
   
   
  +  <mbean         name="StandardContextValve"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Valve that implements the default basic behavior for the
  +                        StandardContext container implementation"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.core.StandardContextValve">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +
     <mbean         name="StandardEngine"
               className="org.apache.catalina.mbeans.StandardEngineMBean"
             description="Standard Engine Component"
  @@ -1122,7 +1499,8 @@
       </operation>
   
       <operation   name="removeValve"
  -          description="Remove the specified Valve from those associated with this 
Engine"
  +          description="Remove the specified Valve from those associated with
  +                        this Engine"
                  impact="ACTION"
              returnType="void">
         <parameter name="valve"
  @@ -1131,7 +1509,8 @@
       </operation>
   
       <operation   name="removeHost"
  -          description="Remove the specified Host from those associated with this 
Engine"
  +          description="Remove the specified Host from those associated with
  +                        this Engine"
                  impact="ACTION"
              returnType="void">
         <parameter name="host"
  @@ -1160,6 +1539,26 @@
     </mbean>
   
   
  +  <mbean         name="StandardEngineValve"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Valve that implements the default basic behavior for the
  +                        StandardEngine container implementation"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.core.StandardEngineValve">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +  
     <mbean         name="StandardHost"
               className="org.apache.catalina.mbeans.StandardHostMBean"
             description="Standard Host Component"
  @@ -1221,12 +1620,14 @@
              returnType="java.lang.String[]"/>
   
       <operation   name="getValves"
  -          description="Return the MBean Names of the Valves associated with this 
Host"
  +          description="Return the MBean Names of the Valves associated with this
  +                        Host"
                  impact="INFO"
              returnType="java.lang.String[]"/>
   
       <operation   name="removeAlias"
  -          description="Remove the specified alias name from the aliases for this 
Host"
  +          description="Remove the specified alias name from the aliases for this
  +                        Host"
                  impact="ACTION"
              returnType="void">
         <parameter name="alias"
  @@ -1235,7 +1636,8 @@
       </operation>
   
       <operation   name="removeContext"
  -          description="Remove the specified Context from those associated with this 
Host"
  +          description="Remove the specified Context from those associated with
  +                        this Host"
                  impact="ACTION"
              returnType="void">
         <parameter name="context"
  @@ -1244,7 +1646,8 @@
       </operation>
   
       <operation   name="removeValve"
  -          description="Remove the specified Valve from those associated with this 
Host"
  +          description="Remove the specified Valve from those associated with
  +                        this Host"
                  impact="ACTION"
              returnType="void">
         <parameter name="valve"
  @@ -1273,6 +1676,26 @@
     </mbean>
   
   
  +  <mbean         name="StandardHostValve"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Valve that implements the default basic behavior for the
  +                        StandardHost container implementation"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.core.StandardHostValve">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +
  +
     <mbean         name="StandardManager"
                 className="org.apache.catalina.mbeans.ClassNameMBean"
             description="Standard implementation of the Manager interface"
  @@ -1281,11 +1704,13 @@
                    type="org.apache.catalina.session.StandardManager">
   
       <attribute   name="algorithm"
  -          description="The message digest algorithm to be used when generating 
session identifiers"
  +          description="The message digest algorithm to be used when generating
  +                        session identifiers"
                    type="java.lang.String"/>
   
       <attribute   name="checkInterval"
  -          description="The interval (in seconds) between checks for expired 
sessions"
  +          description="The interval (in seconds) between checks for expired
  +                        sessions"
                    type="int"/>
   
       <attribute   name="debug"
  @@ -1293,11 +1718,14 @@
                    type="int"/>
   
       <attribute   name="distributable"
  -          description="The distributable flag for Sessions created by this Manager"
  +          description="The distributable flag for Sessions created by this
  +                        Manager"
                    type="boolean"/>
   
       <attribute   name="entropy"
  -          description="A String initialization parameter used to increase the 
entropy of the initialization of our random number generator"
  +          description="A String initialization parameter used to increase the
  +                        entropy of the initialization of our random number
  +                        generator"
                    type="java.lang.String"/>
   
       <attribute   name="managedResource"
  @@ -1305,15 +1733,18 @@
                    type="java.lang.Object"/>
   
       <attribute   name="maxActiveSessions"
  -          description="The maximum number of active Sessions allowed, or -1 for no 
limit"
  +          description="The maximum number of active Sessions allowed, or -1
  +                        for no limit"
                    type="int"/>
   
       <attribute   name="maxInactiveInterval"
  -          description="The default maximum inactive interval for Sessions created 
by this Manager"
  +          description="The default maximum inactive interval for Sessions
  +                        created by this Manager"
                    type="int"/>
   
       <attribute   name="name"
  -          description="The descriptive name of this Manager implementation (for 
logging)"
  +          description="The descriptive name of this Manager implementation
  +                        (for logging)"
                    type="java.lang.String"
               writeable="false"/>
   
  @@ -1393,7 +1824,8 @@
       </operation>
   
       <operation   name="removeConnector"
  -          description="Remove an existing Connector associated with this Service"
  +          description="Remove an existing Connector associated with this
  +                        Service"
                  impact="ACTION"
              returnType="void">
         <parameter name="connector"
  @@ -1404,9 +1836,30 @@
     </mbean>
   
   
  +  <mbean         name="StandardWrapperValve"
  +            className="org.apache.catalina.mbeans.ClassNameMBean"
  +          description="Valve that implements the default basic behavior for the
  +                        StandardWrapper container implementation"
  +               domain="Catalina"
  +                group="Valve"
  +                 type="org.apache.catalina.core.StandardWrapperValve">
  +
  +    <attribute   name="className"
  +          description="Fully qualified class name of the managed object"
  +                 type="java.lang.String"
  +            writeable="false"/>
  +
  +    <attribute   name="debug"
  +          description="The debugging detail level for this component"
  +                 type="int"/>
  +
  +  </mbean>
  +  
  +
     <mbean         name="SystemErrLogger"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Simple implementation of Logger that writes to System.err"
  +          description="Simple implementation of Logger that writes to
  +                        System.err"
                  domain="Catalina"
                   group="Logger"
                    type="org.apache.catalina.logger.SystemErrLogger">
  @@ -1421,7 +1874,8 @@
                    type="int"/>
   
       <attribute   name="verbosity"
  -          description="The verbosity level for above which log messages may be 
filtered"
  +          description="The verbosity level for above which log messages may be
  +                        filtered"
                    type="int"/>
   
     </mbean>
  @@ -1429,7 +1883,8 @@
   
     <mbean         name="SystemOutLogger"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Simple implementation of Logger that writes to System.out"
  +          description="Simple implementation of Logger that writes to
  +                        System.out"
                  domain="Catalina"
                   group="Logger"
                    type="org.apache.catalina.logger.SystemOutLogger">
  @@ -1444,7 +1899,8 @@
                    type="int"/>
   
       <attribute   name="verbosity"
  -          description="The verbosity level for above which log messages may be 
filtered"
  +          description="The verbosity level for above which log messages may be
  +                        filtered"
                    type="int"/>
   
     </mbean>
  @@ -1531,7 +1987,8 @@
   
     <mbean         name="UserDatabaseRealm"
               className="org.apache.catalina.mbeans.ClassNameMBean"
  -          description="Realm connected to a UserDatabase as a global JNDI resource"
  +          description="Realm connected to a UserDatabase as a global JNDI
  +                        resource"
                  domain="Catalina"
                   group="Realm"
                    type="org.apache.catalina.realm.UserDatabaseRealm">
  @@ -1553,13 +2010,15 @@
   
   
     <mbean         name="WebappLoader"
  -          description="Classloader implementation which is specialized for handling 
web applications"
  +          description="Classloader implementation which is specialized for
  +                        handling web applications"
                  domain="Catalina"
                   group="Loader"
                    type="org.apache.catalina.loader.WebappLoader">
   
       <attribute   name="checkInterval"
  -          description="The number of seconds between checks for modified classes"
  +          description="The number of seconds between checks for modified
  +                        classes"
                    type="int"/>
   
       <attribute   name="debug"
  @@ -1567,7 +2026,8 @@
                    type="int"/>
   
       <attribute   name="delegate"
  -          description="The 'follow standard delegation model' flag that will be 
used to configure our ClassLoader"
  +          description="The 'follow standard delegation model' flag that will be
  +                        used to configure our ClassLoader"
                    type="boolean"/>
   
       <attribute   name="reloadable"
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to