QPID-6408: [Java Broker] Expose the AMQP connection limits through the web management UI

Merged with command:

svn merge -c 1661741  https://svn.apache.org/repos/asf/qpid/trunk



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

1 files changed, 12 insertions, 1 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
index 320de8a876..91407c0e83 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
@@ -138,12 +138,15 @@ define(["dojo/dom",
                            "needClientAuthValue",
                            "wantClientAuthValue",
                            "trustStoresValue",
+                           "connectionCountValue",
+                           "maxOpenConnectionsValue",
                            "authenticationProvider",
                            "bindingAddress",
                            "keyStore",
                            "needClientAuth",
                            "wantClientAuth",
-                           "trustStores"
+                           "trustStores",
+                           "maxOpenConnections"
                            ]);
 
                this.query = url;
@@ -151,6 +154,7 @@ define(["dojo/dom",
                xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data)
                                {
                                   that.portData = data[0];
+                                  util.flattenStatistics( that.portData );
                                   that.updateHeader();
                                });
 
@@ -178,6 +182,9 @@ define(["dojo/dom",
               this.protocolsValue.innerHTML = printArray( "protocols", this.portData);
               this.transportsValue.innerHTML = printArray( "transports", this.portData);
               this.bindingAddressValue.innerHTML = this.portData[ "bindingAddress" ] ? entities.encode(String(this.portData[ "bindingAddress" ])) : "" ;
+              this.connectionCountValue.innerHTML = this.portData[ "connectionCount" ] ? entities.encode(String(this.portData[ "connectionCount" ])) : "0" ;
+              this.maxOpenConnectionsValue.innerHTML = (this.portData[ "maxOpenConnections" ] && this.portData[ "maxOpenConnections" ] >= 0) ? entities.encode(String(this.portData[ "maxOpenConnections" ])) : "(no limit)" ;
+
               this.keyStoreValue.innerHTML = this.portData[ "keyStore" ] ? entities.encode(String(this.portData[ "keyStore" ])) : "";
               this.needClientAuthValue.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.portData[ "needClientAuth" ] ? "checked='checked'": "")+" />" ;
               this.wantClientAuthValue.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.portData[ "wantClientAuth" ] ? "checked='checked'": "")+" />" ;
@@ -191,6 +198,9 @@ define(["dojo/dom",
               this.needClientAuth.style.display = "needClientAuth" in typeMetaData.attributes ? "block" : "none";
               this.wantClientAuth.style.display = "wantClientAuth" in typeMetaData.attributes ? "block" : "none";
               this.trustStores.style.display = "trustStores" in typeMetaData.attributes ? "block" : "none";
+
+              this.maxOpenConnections.style.display = "maxOpenConnections" in typeMetaData.attributes ? "block" : "none";
+
            };
 
            PortUpdater.prototype.update = function()
@@ -201,6 +211,7 @@ define(["dojo/dom",
               xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data)
                    {
                       thisObj.portData = data[0];
+                      util.flattenStatistics( thisObj.portData );
                       thisObj.updateHeader();
                    });
            };