Author: robbie
Date: Mon Jan 13 11:20:10 2014
New Revision: 1557678

URL: http://svn.apache.org/r1557678
Log:
QPID-5474: display clientId and clientVersion attributes from the connection 
JSON, remove display of unimplemented attributes

Modified:
    
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
    
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html

Modified: 
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js?rev=1557678&r1=1557677&r2=1557678&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
 (original)
+++ 
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
 Mon Jan 13 11:20:10 2014
@@ -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" ]));
 
            };
 

Modified: 
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html?rev=1557678&r1=1557677&r2=1557678&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
 (original)
+++ 
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
 Mon Jan 13 11:20:10 2014
@@ -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'">



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to