[prev in list] [next in list] [prev in thread] [next in thread] 

List:       activemq-commits
Subject:    svn commit: r937334 - in /activemq/trunk:
From:       dejanb () apache ! org
Date:       2010-04-23 15:27:36
Message-ID: 20100423152736.732EE23889B8 () eris ! apache ! org
[Download RAW message or body]

Author: dejanb
Date: Fri Apr 23 15:27:36 2010
New Revision: 937334

URL: http://svn.apache.org/viewvc?rev=937334&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2705 - broker version in jmx and web \
console

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
  activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
  activemq/trunk/activemq-web-console/src/main/webapp/index.jsp

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
                
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java?rev=937334&r1=937333&r2=937334&view=diff
 ==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java \
                (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java \
Fri Apr 23 15:27:36 2010 @@ -24,6 +24,8 @@ import java.net.URI;
 import java.net.URL;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.management.ObjectName;
+
+import org.apache.activemq.ActiveMQConnectionMetaData;
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.ConnectionContext;
@@ -66,6 +68,10 @@ public class BrokerView implements Broke
     public String getBrokerName() {
         return broker.getBrokerName();
     }    
+    
+    public String getBrokerVersion() {
+    	return ActiveMQConnectionMetaData.PROVIDER_VERSION;
+    }
 
     public void gc() throws Exception {
         brokerService.getBroker().gc();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
                
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apach \
e/activemq/broker/jmx/BrokerViewMBean.java?rev=937334&r1=937333&r2=937334&view=diff \
                ==============================================================================
                
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java \
                (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java \
Fri Apr 23 15:27:36 2010 @@ -39,6 +39,12 @@ public interface BrokerViewMBean extends
     String getBrokerName();    
 
     /**
+     * @return The name of the broker.
+     */
+    @MBeanInfo("The version of the broker.")
+    String getBrokerVersion();        
+    
+    /**
      * The Broker will fush it's caches so that the garbage collector can
      * recalaim more memory.
      * 

Modified: activemq/trunk/activemq-web-console/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/index.jsp?rev=937334&r1=937333&r2=937334&view=diff
 ==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/index.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/index.jsp Fri Apr 23 15:27:36 \
2010 @@ -39,6 +39,10 @@ You can find more information about Acti
         <td><b>${requestContext.brokerQuery.brokerAdmin.brokerName}</b></td>
     </tr>
     <tr>
+        <td>Version</td>
+        <td><b>${requestContext.brokerQuery.brokerAdmin.brokerVersion}</b></td>
+    </tr>
+    <tr>
         <td>ID</td>
         <td><b>${requestContext.brokerQuery.brokerAdmin.brokerId}</b></td>
     </tr>


[prev in list] [next in list] [prev in thread] [next in thread]