tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r370306 - in /tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina: core/StandardServer.java mbeans/mbeans-descriptors.xml
Date Wed, 18 Jan 2006 23:52:42 GMT
Author: markt
Date: Wed Jan 18 15:52:38 2006
New Revision: 370306

URL: http://svn.apache.org/viewcvs?rev=370306&view=rev
Log:
Port Peter's patch to add jmx serverInfo attribute to Server mbean

Modified:
    tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
    tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml

Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java?rev=370306&r1=370305&r2=370306&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
(original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
Wed Jan 18 15:52:38 2006
@@ -75,6 +75,7 @@
 import org.apache.catalina.session.PersistentManager;
 import org.apache.catalina.session.StandardManager;
 import org.apache.catalina.util.LifecycleSupport;
+import org.apache.catalina.util.ServerInfo;
 import org.apache.catalina.util.StringManager;
 
 
@@ -387,6 +388,17 @@
     }
 
 
+    /**
+     * Report the current Tomcat Server Release number
+     * @return Tomcat release identifier
+     */
+    public String getServerInfo() {
+
+        return ServerInfo.getServerInfo();
+
+    }
+
+    
     /**
      * Return the shutdown command string we are waiting for.
      */

Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml?rev=370306&r1=370305&r2=370306&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
(original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Wed Jan 18 15:52:38 2006
@@ -2614,6 +2614,11 @@
           description="TCP port for shutdown messages"
                  type="int"/>
 
+    <attribute   name="serverInfo"
+          description="Tomcat server release identifier"
+                 type="java.lang.String"
+            writeable="false"/>
+
     <attribute   name="shutdown"
           description="Shutdown password"
                  type="java.lang.String"/>



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


Mime
View raw message