activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1428626 - in /activemq/activemq-apollo/trunk: apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
Date Thu, 03 Jan 2013 21:59:09 GMT
Author: chirino
Date: Thu Jan  3 21:59:09 2013
New Revision: 1428626

URL: http://svn.apache.org/viewvc?rev=1428626&view=rev
Log:
Expose install location details in the broker status.

Modified:
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java?rev=1428626&r1=1428625&r2=1428626&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
Thu Jan  3 21:59:09 2013
@@ -40,6 +40,18 @@ public class BrokerStatusDTO extends Ser
 	public String version;
 
     /**
+     * Where the Apache Apollo distribution is located.
+     */
+	@XmlElement(name="home_location")
+    public String home_location;
+
+    /**
+     * Where the broker instance is located.
+     */
+	@XmlElement(name="base_location")
+    public String base_location;
+
+    /**
      * Metrics about the JVM
      */
 	@XmlElement(name="jvm_metrics")

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala?rev=1428626&r1=1428625&r2=1428626&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
Thu Jan  3 21:59:09 2013
@@ -117,6 +117,9 @@ class BrokerResource() extends Resource 
         result.state = broker.service_state.toString
         result.state_since = broker.service_state.since
         result.version = Broker.version
+        result.home_location = Option(System.getProperty("apollo.home")).getOrElse(null)
+        result.base_location = Option(System.getProperty("apollo.base")).getOrElse(null)
+        result.version = Broker.version
         result.connection_counter = broker.connection_id_counter.get()
         result.connected = broker.connections.size
         broker.virtual_hosts.values.foreach{ host=>



Mime
View raw message