You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/05/15 10:31:58 UTC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java StandardWrapper.java mbeans-descriptors.xml

amyroh      2003/05/15 01:31:58

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java StandardWrapper.java
                        mbeans-descriptors.xml
  Log:
  Add the rest of missing attributes for j2eeType=WebModule and Servlet.
  
  Revision  Changes    Path
  1.51      +36 -3     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.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- StandardContext.java	9 May 2003 11:31:59 -0000	1.50
  +++ StandardContext.java	15 May 2003 08:31:57 -0000	1.51
  @@ -5144,7 +5144,7 @@
       /** Support for "stateManageable" JSR77 
        * 
        */
  -    public boolean getStateManageable() {
  +    public boolean IsStateManageable() {
           return true;
       }
       
  @@ -5166,10 +5166,43 @@
           // 2 - STOPPING
           return 3; // STOPPED
       }
  -
  +    
  +    /**
  +     * The J2EE Server ObjectName this module is deployed on.
  +     */     
  +    private String server = null;
  +    
  +    /**
  +     * The Java virtual machines on which this module is running.
  +     */       
  +    private String[] javaVMs = null;
  +    
  +    public String getServer() {
  +        return server;
  +    }
  +        
  +    public String setServer(String server) {
  +        return this.server=server;
  +    }
  +        
  +    public String[] getJavaVMs() {
  +        return javaVMs;
  +    }
  +        
  +    public String[] setJavaVMs(String[] javaVMs) {
  +        return this.javaVMs = javaVMs;
  +    }
  +    
       public long getStartTime() {
           return startupTime;
       }
       
  +    public boolean IsEventProvider() {
  +        return false;
  +    }
  +    
  +    public boolean IsStatisticsProvider() {
  +        return false;
  +    }
       
   }
  
  
  
  1.26      +22 -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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- StandardWrapper.java	4 May 2003 21:11:06 -0000	1.25
  +++ StandardWrapper.java	15 May 2003 08:31:57 -0000	1.26
  @@ -1578,4 +1578,22 @@
               log.info("Error registering servlet with jmx " + this);
           }
       }
  +    
  +
  +    // ------------------------------------------------------------- Attributes
  +        
  +        
  +    public boolean IsEventProvider() {
  +        return false;
  +    }
  +    
  +    public boolean IsStateManageable() {
  +        return false;
  +    }
  +    
  +    public boolean IsStatisticsProvider() {
  +        return false;
  +    }
  +        
  +        
   }
  
  
  
  1.16      +86 -48    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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mbeans-descriptors.xml	9 May 2003 11:31:59 -0000	1.15
  +++ mbeans-descriptors.xml	15 May 2003 08:31:58 -0000	1.16
  @@ -94,39 +94,31 @@
            group="Context"
            type="org.apache.catalina.core.StandardContext">
       
  +    <attribute name="children"
  +               description="Object names of all children"
  +               type="[Ljavax.management.ObjectName;"/>
  +               
       <attribute   name="cookies"
                  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?"
  -               type="boolean"/>
  -      
  -    <attribute name="defaultWebXml"
  -               description="Location of the default web.xml resource or file"
  -               type="java.lang.String"/>
  -      
  -    <attribute name="engineName"
  -               description="Name of the engine domain, if different from the context domain"
  -               type="java.lang.String"/>
  -
  -    <attribute name="objectName"
  -               description="Name of the object"
  -               type="java.lang.String"/>
  -      
  -    <attribute name="privileged"
  -               description="Access to tomcat internals"
  -               type="boolean"/>
  -      
       <attribute name="compilerClasspath"
                  description="The compiler classpath to use"
                  type="java.lang.String"/>
         
  +    <attribute name="crossContext"
  +               description="Should we allow the ServletContext.getContext() method to access the context of other web applications in this server?"
  +               type="boolean"/>
  +      
       <attribute name="debug"
                  description="The debugging detail level for this component"
                  type="int"/>
                  
  +    <attribute name="defaultWebXml"
  +               description="Location of the default web.xml resource or file"
  +               type="java.lang.String"/>
  +               
       <attribute name="deploymentDescriptor"
                  description="String deployment descriptor "
                  type="java.lang.String"/>
  @@ -134,17 +126,25 @@
       <attribute name="docBase"
                  description="The document root for this web application"
                  type="java.lang.String"/>
  -
  -    <attribute name="valveObjectNames"
  -               description="ObjectNames for the valves associated with this container"
  -               type="[Ljavax.management.ObjectName;"
  -               writeable="false"/>
  +      
  +    <attribute name="engineName"
  +               description="Name of the engine domain, if different from the context domain"
  +               type="java.lang.String"/>
   
       <attribute name="environments"
                  description="MBean Names of the set of defined environment entries for this web application"
                  type="[Ljava.lang.String;"
                  writeable="false"/>
  -      
  +
  +    <attribute name="eventProvider"
  +               description="Event provider support for this managed object"
  +               is="true"
  +               type="boolean"/>
  +                              
  +    <attribute name="javaVMs"
  +               description="The Java virtual machines on which this module is running"
  +               type="[Ljava.lang.String;"/>
  +
       <attribute name="loader"
                  description="Associated loader."
                  type="org.apache.catalina.Loader" />
  @@ -157,6 +157,10 @@
                  description="The object used for mapping"
                  type="java.lang.Object"/>
         
  +    <attribute name="objectName"
  +               description="Name of the object"
  +               type="java.lang.String"/>
  +      
       <attribute name="override"
                  description="The DefaultContext override flag for this web application"
                  type="boolean"/>
  @@ -168,24 +172,11 @@
       <attribute name="path"
                  description="The context path for this Context"
                  type="java.lang.String"/>
  -      
  -    <attribute name="startupTime"
  -               description="Startup time for this context"
  -               type="long"/>
                  
  -    <attribute name="state"
  -               description="Current state of this component"
  -               type="int"/>
  -                     
  -    <attribute name="tldScanTime"
  -               description="Time spend scanning jars for TLDs for this context"
  -               type="long"/>
  +    <attribute name="privileged"
  +               description="Access to tomcat internals"
  +               type="boolean"/>
         
  -    <attribute name="servlets"
  -               description="JSR77 list of servlets"
  -               type="[Ljava.lang.String;"
  -               writeable="false"/>
  -
       <attribute name="reloadable"
                  description="The reloadable flag for this web application"
                  type="boolean"/>
  @@ -194,7 +185,34 @@
                  description="MBean Names of all the defined resource references for this application."
                  type="[Ljava.lang.String;"
                  writeable="false"/>
  -      
  +
  +    <attribute name="server"
  +               description="The J2EE Server this module is deployed on"
  +               type="java.lang.String"/>
  +                              
  +    <attribute name="servlets"
  +               description="JSR77 list of servlets"
  +               type="[Ljava.lang.String;"
  +               writeable="false"/>
  +               
  +    <attribute name="startupTime"
  +               description="Startup time for this context"
  +               type="long"/>
  +               
  +    <attribute name="state"
  +               description="Current state of this component"
  +               type="int"/>
  +                     
  +    <attribute name="stateManageable"
  +               description="State management support for this managed object"
  +               is="true"
  +               type="boolean"/>
  +               
  +    <attribute name="statisticsProvider"
  +               description="Performance statistics support for this managed object"
  +               is="true"
  +               type="boolean"/>
  +               
       <attribute name="staticResources"
                  description="Static resources associated with the context."
                  type="javax.naming.directory.DirContext"
  @@ -203,11 +221,20 @@
       <attribute   name="swallowOutput"
                  description="Flag to set to cause the system.out and system.err to be redirected to the logger when executing a servlet"
                  type="boolean"/>
  +               
  +    <attribute name="tldScanTime"
  +               description="Time spend scanning jars for TLDs for this context"
  +               type="long"/>
   
       <attribute name="useNaming"
                  description="Create a JNDI naming context for this application?"
                  is="true"
                  type="boolean"/>
  +               
  +    <attribute name="valveObjectNames"
  +               description="ObjectNames for the valves associated with this container"
  +               type="[Ljavax.management.ObjectName;"
  +               writeable="false"/>
   
       <attribute name="welcomeFiles"
                  description="The welcome files for this context"
  @@ -218,10 +245,6 @@
                  description="The pathname to the work directory for this context"
                  type="java.lang.String"/>
         
  -    <attribute name="children"
  -               description="Object names of all children"
  -               type="[Ljavax.management.ObjectName;"/>
  -      
       <operation name="addEnvironment"
                  description="Add an environment entry for this web application"
                  impact="ACTION"
  @@ -626,16 +649,31 @@
            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"/>
  +               
  +    <attribute name="eventProvider"
  +               description="Event provider support for this managed object"
  +               is="true"
  +               type="boolean"/>
   
       <attribute name="objectName"
                  description="Name of the object"
                  type="java.lang.String"/>
   
  +    <attribute name="stateManageable"
  +               description="State management support for this managed object"
  +               is="true"
  +               type="boolean"/>
  +
  +    <attribute name="statisticsProvider"
  +               description="Performance statistics support for this managed object"
  +               is="true"
  +               type="boolean"/>
  +                              
       <operation name="findMappings"
                  description="Return the mappings associated with this wrapper"
                  impact="INFO"
  
  
  

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


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java StandardWrapper.java mbeans-descriptors.xml

Posted by Amy Roh <am...@apache.org>.
Remy Maucherat wrote:
> Amy Roh wrote:
> 
>> Hi Remy,
>>
>>>>   +    public boolean IsStateManageable() {
>>>
>>>
>>>
>>>
>>> Is the case right ?
>>
>>
>>
>> I'm not sure what you mean?
> 
> 
> Usually, method names start with a lower case. So the method name would 
> be isStateManageable(). Strange that spec would introduce that kind of 
> oddity.

my bet.  will commit the change soon.  thanks for catching it!  :-)

amy

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




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


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java StandardWrapper.java mbeans-descriptors.xml

Posted by Remy Maucherat <re...@apache.org>.
Amy Roh wrote:
> Hi Remy,
>>>   +    public boolean IsStateManageable() {
>>
>>
>>
>> Is the case right ?
> 
> 
> I'm not sure what you mean?

Usually, method names start with a lower case. So the method name would 
be isStateManageable(). Strange that spec would introduce that kind of 
oddity.

Remy


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


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java StandardWrapper.java mbeans-descriptors.xml

Posted by Amy Roh <am...@apache.org>.
Hi Remy,

Remy Maucherat wrote:
> amyroh@apache.org wrote:
> 
>> amyroh      2003/05/15 01:31:58
>>
>>   Modified:    catalina/src/share/org/apache/catalina/core
>>                         StandardContext.java StandardWrapper.java
>>                         mbeans-descriptors.xml
>>   Log:
>>   Add the rest of missing attributes for j2eeType=WebModule and Servlet.
> 
> 
> Two questions:
> 
>>   +    public boolean IsStateManageable() {
> 
> 
> Is the case right ?

I'm not sure what you mean?

> 
>>   +    public boolean IsEventProvider() {
>>   +        return false;
>>   +    }
>>   +      +    public boolean IsStatisticsProvider() {
>>   +        return false;
>>   +    }
> 
> 
> Well, I would assume that both servlet and context provide statistics. 
> Why isn't the return value true ?

We do provide statistics.  However, servlet and context don't support 
the generation of performance statistics nor implement the 
StatisticsProvider model in JSR77, therefore it should return false 
(refer to JSR77.6)

Thanks,
Amy

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




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


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java StandardWrapper.java mbeans-descriptors.xml

Posted by Remy Maucherat <re...@apache.org>.
amyroh@apache.org wrote:
> amyroh      2003/05/15 01:31:58
> 
>   Modified:    catalina/src/share/org/apache/catalina/core
>                         StandardContext.java StandardWrapper.java
>                         mbeans-descriptors.xml
>   Log:
>   Add the rest of missing attributes for j2eeType=WebModule and Servlet.

Two questions:

>   +    public boolean IsStateManageable() {

Is the case right ?

>   +    public boolean IsEventProvider() {
>   +        return false;
>   +    }
>   +    
>   +    public boolean IsStatisticsProvider() {
>   +        return false;
>   +    }

Well, I would assume that both servlet and context provide statistics. 
Why isn't the return value true ?

Remy


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