tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r370082 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/core/StandardServer.java catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml webapps/docs/changelog.xml
Date Wed, 18 Jan 2006 09:17:42 GMT
Author: pero
Date: Wed Jan 18 01:17:33 2006
New Revision: 370082

URL: http://svn.apache.org/viewcvs?rev=370082&view=rev
Log:
Add jmx serverInfo attribute to Server mbean

Modified:
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java?rev=370082&r1=370081&r2=370082&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
Wed Jan 18 01:17:33 2006
@@ -42,6 +42,7 @@
 import org.apache.catalina.deploy.NamingResources;
 import org.apache.catalina.util.LifecycleSupport;
 import org.apache.catalina.util.StringManager;
+import org.apache.catalina.util.ServerInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.modeler.Registry;
@@ -247,6 +248,14 @@
 
     }
 
+    /**
+     * Report the current Tomcat Server Release number
+     * @return Tomcat release identifier
+     */
+    public String getServerInfo() {
+
+        return ServerInfo.getServerInfo();
+    }
 
     /**
      * Return the port number we listen to for shutdown commands.

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml?rev=370082&r1=370081&r2=370082&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
Wed Jan 18 01:17:33 2006
@@ -528,6 +528,11 @@
     <attribute name="serviceNames"
                description="Object names of all services we know about"
                type="[Ljavax.management.ObjectName;"/>
+
+    <attribute name="serverInfo"
+               description="Tomcat server release identifier"
+               type="java.lang.String"
+               writeable="false"/>
       
     <operation name="await"
                description="Wait for the shutdown message"

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=370082&r1=370081&r2=370082&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jan 18 01:17:33 2006
@@ -40,6 +40,13 @@
         Allow using a custom ContextConfig when using JMX embedding of Tomcat, as
         is doen by the regular deployer. (remm)
       </fix>
+      <add>
+         Add JMX serverInfo attribute to Server MBean, that we can identify
+         the tomcat release remotely. (pero)
+      </add>
+      <fix>
+         Fix the JMX MBeanFactory.createStandardHost signature at mbean-descriptors.xml (pero)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



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


Mime
View raw message