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/catalina/core mbeans-descriptors.xml StandardContext.java StandardWrapper.java
Date Mon, 28 Apr 2003 05:19:32 GMT
amyroh      2003/04/27 22:19:32

  Modified:    catalina/src/share/org/apache/catalina/core
                        mbeans-descriptors.xml StandardContext.java
                        StandardWrapper.java
  Log:
  Add StandardWrapper mbean description and workaround for introspection.
  
  Revision  Changes    Path
  1.12      +43 -7     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mbeans-descriptors.xml	25 Apr 2003 22:19:47 -0000	1.11
  +++ mbeans-descriptors.xml	28 Apr 2003 05:19:31 -0000	1.12
  @@ -292,6 +292,18 @@
                  returnType="void">
       </operation>
       
  +    <operation name="findMappingObject"
  +               description="Return an object which may be utilized for mapping to this
component"
  +               impact="INFO"
  +               returnType="org.apache.catalina.Context">    
  +    </operation>    
  +    
  +    <operation name="findStaticResources"
  +               description="Return the naming resources associated with this web application"
  +               impact="INFO"
  +               returnType="javax.naming.directory.DirContext">    
  +    </operation>
  +    
     </mbean>
     
     <mbean name="StandardContextValve"
  @@ -604,7 +616,31 @@
       <operation name="start" description="Start" impact="ACTION" returnType="void" />
       <operation name="stop" description="Stop" impact="ACTION" returnType="void" />
     </mbean>
  -  
  +
  +  <mbean name="StandardWrapper"
  +         description="Wrapper that represents an individual servlet definition"
  +         domain="Catalina"
  +         group="Wrapper"
  +         type="org.apache.catalina.core.StandardWrapper">
  +    
  +    <attribute name="engineName"
  +               description="Fully qualified class name of the managed object"
  +               type="java.lang.String"
  +               writeable="false"/>
  +
  +    <operation name="findMappings"
  +               description="Return the mappings associated with this wrapper"
  +               impact="INFO"
  +               returnType="[Ljava.lang.String;">
  +    </operation>
  +               
  +    <operation name="findMappingObject"
  +               description="Return an object which may be utilized for mapping to this
component"
  +               impact="INFO"
  +               returnType="org.apache.catalina.Wrapper">
  +    </operation>
  +    
  +  </mbean>
     
     <mbean name="StandardWrapperValve"
            description="Valve that implements the default basic behavior for the
  @@ -612,12 +648,12 @@
            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="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"/>
  
  
  
  1.47      +20 -1     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- StandardContext.java	25 Apr 2003 21:05:21 -0000	1.46
  +++ StandardContext.java	28 Apr 2003 05:19:31 -0000	1.47
  @@ -2317,6 +2317,14 @@
   
   
       /**
  +     * FIXME: Fooling introspection ...
  +     */
  +    public Context findMappingObject() {
  +        return (Context) getMappingObject();
  +    }
  +    
  +    
  +    /**
        * Return the message destination with the specified name, if any;
        * otherwise, return <code>null</code>.
        *
  @@ -5105,6 +5113,17 @@
        * Return the naming resources associated with this web application.
        */
       public javax.naming.directory.DirContext getStaticResources() {
  +
  +        return getResources();
  +
  +    }
  +
  +
  +    /**
  +     * Return the naming resources associated with this web application.
  +     * FIXME: Fooling introspection ... 
  +     */
  +    public javax.naming.directory.DirContext findStaticResources() {
   
           return getResources();
   
  
  
  
  1.23      +9 -4      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- StandardWrapper.java	5 Apr 2003 04:03:07 -0000	1.22
  +++ StandardWrapper.java	28 Apr 2003 05:19:31 -0000	1.23
  @@ -341,6 +341,11 @@
       }
   
   
  +    public String getEngineName() {
  +        return ((StandardContext)getParent()).getEngineName();
  +    }
  +
  +
       /**
        * Return descriptive information about this Container implementation and
        * the corresponding version number, in the format
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message