QPID-4661: Display java broker store details and platform details in the web management console

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1459308 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 45 insertions, 3 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
index e479deddbc..6c2065fe9d 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
@@ -441,6 +441,7 @@ define(["dojo/_base/xhr",
 
                              util.flattenStatistics( that.brokerData);
 
+                             that.showReadOnlyAttributes();
                              that.updateHeader();
 
                              var gridProperties = {
@@ -618,5 +619,18 @@ define(["dojo/_base/xhr",
 
            };
 
+           BrokerUpdater.prototype.showReadOnlyAttributes = function()
+           {
+               var brokerData = this.brokerData;
+               dojo.byId("brokerAttribute.name").innerHTML = brokerData.name;
+               dojo.byId("brokerAttribute.operatingSystem").innerHTML = brokerData.operatingSystem;
+               dojo.byId("brokerAttribute.platform").innerHTML = brokerData.platform;
+               dojo.byId("brokerAttribute.productVersion").innerHTML = brokerData.productVersion;
+               dojo.byId("brokerAttribute.managementVersion").innerHTML = brokerData.managementVersion;
+               dojo.byId("brokerAttribute.storeType").innerHTML = brokerData.storeType;
+               dojo.byId("brokerAttribute.storeVersion").innerHTML = brokerData.storeVersion;
+               dojo.byId("brokerAttribute.storePath").innerHTML = brokerData.storePath;
+           }
+
            return Broker;
        });
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
index 8faae08e1e..bdcff2b7e9 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
@@ -21,10 +21,38 @@
 <div class="broker">
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Broker Attributes',  open: false">
         <div id="brokerAttributes" style="clear:both">
-             <div id="brokerAttribute.name.container" style="display: none; clear:both">
-                <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker Name:</div>
+             <div id="brokerAttribute.name.container" style="clear:both">
+                <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker name:</div>
                 <div id="brokerAttribute.name" style="float:left;"></div>
             </div>
+            <div id="brokerAttribute.operatingSystem.container" style="clear:both">
+                <div class="formLabel-labelCell" style="float:left; width: 250px;">Operation system:</div>
+                <div id="brokerAttribute.operatingSystem" style="float:left;"></div>
+            </div>
+            <div id="brokerAttribute.platform.container" style="clear:both">
+                <div class="formLabel-labelCell" style="float:left; width: 250px;">Platform:</div>
+                <div id="brokerAttribute.platform" style="float:left;"></div>
+            </div>
+            <div id="brokerAttribute.productVersion.container" style="clear:both">
+                <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker version:</div>
+                <div id="brokerAttribute.productVersion" style="float:left;"></div>
+            </div>
+            <div id="brokerAttribute.managementVersion.container" style="clear:both">
+                <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker management version:</div>
+                <div id="brokerAttribute.managementVersion" style="float:left;"></div>
+            </div>
+            <div id="brokerAttribute.storeType.container" style="clear:both">
+                <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker store type:</div>
+                <div id="brokerAttribute.storeType" style="float:left;"></div>
+            </div>
+            <div id="brokerAttribute.storeVersion.container" style="clear:both">
+                <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker store version:</div>
+                <div id="brokerAttribute.storeVersion" style="float:left;"></div>
+            </div>
+            <div id="brokerAttribute.storePath.container" style="clear:both">
+                <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker store location:</div>
+                <div id="brokerAttribute.storePath" style="float:left;"></div>
+            </div>
             <div id="brokerAttribute.defaultAuthenticationProvider.container" style="display: none; clear:both">
                 <div class="formLabel-labelCell" style="float:left; width: 250px;">Default authentication provider:</div>
                 <div id="brokerAttribute.defaultAuthenticationProvider" style="float:left;"></div>
@@ -79,7 +107,7 @@
                     <div id="brokerAttribute.alertThresholdMessageSize" style="float:left;"></div>
                 </div>
                 <div id="brokerAttribute.alertRepeatGap.container" style="clear:both">
-                    <div class="formLabel-labelCell" style="float:left; width: 250px;">Queue alert alert repeat gap:</div>
+                    <div class="formLabel-labelCell" style="float:left; width: 250px;">Queue alert repeat gap:</div>
                     <div id="brokerAttribute.alertRepeatGap" style="float:left;"></div> ms
                 </div>
                 <div id="brokerAttribute.maximumDeliveryAttempts.container" style="clear:both">