QPID-5474: display clientId and clientVersion attributes from the connection JSON, remove display of unimplemented attributes

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

2 files changed, 10 insertions, 14 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
index b0ad1c661b..2b455a90f1 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
@@ -84,12 +84,11 @@ define(["dojo/_base/xhr",
                }
 
                storeNodes(["name",
-                           "state",
-                           "durable",
+                           "clientVersion",
+                           "clientId",
                            "principal",
                            "port",
                            "transport",
-                           "lifetimePolicy",
                            "msgInRate",
                            "bytesInRate",
                            "bytesInRateUnits",
@@ -125,12 +124,11 @@ define(["dojo/_base/xhr",
            ConnectionUpdater.prototype.updateHeader = function()
            {
               this.name.innerHTML = entities.encode(String(this.connectionData[ "name" ]));
-              this.state.innerHTML = entities.encode(String(this.connectionData[ "state" ]));
-              this.durable.innerHTML = entities.encode(String(this.connectionData[ "durable" ]));
+              this.clientId.innerHTML = entities.encode(String(this.connectionData[ "clientId" ]));
+              this.clientVersion.innerHTML = entities.encode(String(this.connectionData[ "clientVersion" ]));
               this.principal.innerHTML = entities.encode(String(this.connectionData[ "principal" ]));
               this.port.innerHTML = entities.encode(String(this.connectionData[ "port" ]));
               this.transport.innerHTML = entities.encode(String(this.connectionData[ "transport" ]));
-              this.lifetimePolicy.innerHTML = entities.encode(String(this.connectionData[ "lifetimePolicy" ]));
 
            };
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
index 4611b77f6c..1032bdeaef 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
@@ -19,30 +19,28 @@
  -
  -->
 <div class="connection">
-    <span style="">Name:</span><span class="name" style="position:absolute; left:6em"></span>
+    <span style="">Name:</span><span class="name" style="position:absolute; left:8em"></span>
     <br/>
-    <span style="">State:</span><span class="state" style="position:absolute; left:6em"></span>
+    <span style="">User:</span><span class="principal" style="position:absolute; left:8em"></span>
     <span style="position:absolute; left:26em">Pre-fetched:</span>
     <br/>
-    <span style="">Durable:</span><span class="durable" style="position:absolute; left:6em"></span>
+    <span style="">ClientID:</span><span class="clientId" style="position:absolute; left:8em"></span>
     <span style="position:absolute; left:26em">Inbound:</span>
     <span class="msgInRate" style="position:absolute; right:9.5em"></span>
     <span style="position:absolute; right: 5em; width: 4em"> msg/s</span>
     <span class="bytesInRate" style="position:absolute; right: 3.3em"></span>
     <span class="bytesInRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
     <br/>
-    <span style="">Lifespan:</span><span style="position:absolute; left:6em" class="lifetimePolicy"></span>
+    <span style="">Client Version:</span><span style="position:absolute; left:8em" class="clientVersion"></span>
     <span style="position:absolute; left:26em">Outbound:</span>
     <span class="msgOutRate" style="position:absolute; right:9.5em"></span>
     <span style="position:absolute; right: 5em; width: 4em"> msg/s</span>
     <span class="bytesOutRate" style="position:absolute; right: 3.3em"></span>
     <span class="bytesOutRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
     <br/>
-    <span style="">User:</span><span style="position:absolute; left:6em" class="principal"></span>
+    <span style="">Port:</span><span style="position:absolute; left:8em" class="port"></span>
     <br/>
-    <span style="">Port:</span><span style="position:absolute; left:6em" class="port"></span>
-    <br/>
-    <span style="">Transport:</span><span style="position:absolute; left:6em" class="transport"></span>
+    <span style="">Transport:</span><span style="position:absolute; left:8em" class="transport"></span>
     <br/>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Sessions'">