From 50ef5c1742d607847dc0e5080278bcdd7e84b69a Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Sun, 3 Aug 2014 18:06:09 +0000
Subject: QPID-5958: [Java Broker] Wire up the Connection#remoteProcessPid
 attribute to the client's process identifier made available as connection
 properties during connection negotiation.

* Make information available via the Connection tab during the Web Management UI.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1615425 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/js/qpid/management/Connection.js     |  7 +-
 .../src/main/java/resources/showConnection.html    | 89 ++++++++++++++++------
 2 files changed, 72 insertions(+), 24 deletions(-)

(limited to 'qpid/java/broker-plugins/management-http')

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 8836f6a40c..6c20f85dc0 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
@@ -86,6 +86,9 @@ define(["dojo/_base/xhr",
                            "principal",
                            "port",
                            "transport",
+                           "remoteProcessPid",
+                           "createdTime",
+                           "lastIoTime",
                            "msgInRate",
                            "bytesInRate",
                            "bytesInRateUnits",
@@ -150,7 +153,9 @@ define(["dojo/_base/xhr",
               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.remoteProcessPid.innerHTML = entities.encode(String(this.connectionData[ "remoteProcessPid" ]));
+              this.createdTime.innerHTML = UserPreferences.formatDateTime(this.connectionData[ "createdTime" ], {addOffset: true, appendTimeZone: true});
+              this.lastIoTime.innerHTML = UserPreferences.formatDateTime(this.connectionData[ "lastIoTime" ], {addOffset: true, appendTimeZone: true});
            };
 
            ConnectionUpdater.prototype.update = function()
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 1032bdeaef..7b76b42473 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,73 @@
  -
  -->
 <div class="connection">
-    <span style="">Name:</span><span class="name" style="position:absolute; left:8em"></span>
-    <br/>
-    <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="">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="">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="">Port:</span><span style="position:absolute; left:8em" class="port"></span>
-    <br/>
-    <span style="">Transport:</span><span style="position:absolute; left:8em" class="transport"></span>
-    <br/>
+    <div class="alignLeft">
+        <div style="clear:both">
+            <div class="formLabel-labelCell">Name:</div>
+            <div class="name" style="float:left;"></div>
+        </div>
+        <div style="clear:both">
+            <div class="formLabel-labelCell">User:</div>
+            <div class="principal" style="float:left;"></div>
+        </div>
+        <div style="clear:both">
+            <div class="formLabel-labelCell">Client ID:</div>
+            <div class="clientId" style="float:left;"></div>
+        </div>
+        <div style="clear:both">
+            <div class="formLabel-labelCell">Client Version:</div>
+            <div class="clientVersion" style="float:left;"></div>
+        </div>
+    </div>
+    <div class="alignRight">
+        <div>
+            <div class="formLabel-labelCell">Inbound:</div>
+            <div class="alignRight">
+                <span class="msgInRate"></span>
+                <span> msg/s</span>
+                <span class="bytesInRate"></span>
+                <span class="bytesInRateUnits"></span>
+            </div>
+        </div>
+        <div>
+            <div class="formLabel-labelCell">Outbound:</div>
+            <div class="alignRight">
+                <span class="msgOutRate"></span>
+                <span> msg/s</span>
+                <span class="bytesOutRate"></span>
+                <span class="bytesOutRateUnits"></span>
+            </div>
+        </div>
+        <div>
+            <div class="formLabel-labelCell">Connect Time:</div>
+            <div class="alignRight">
+                <div class="createdTime"></div>
+            </div>
+        </div>
+        <div>
+            <div class="formLabel-labelCell">Last I/O Time:</div>
+            <div class="alignRight">
+                <div class="lastIoTime"></div>
+            </div>
+        </div>
+    </div>
+    <div style="clear:both"></div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell">Remote Process (PID):</div>
+        <div class="remoteProcessPid" style="float:left;"></div>
+    </div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell">Port:</div>
+        <div class="port" style="float:left;"></div>
+    </div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell">Transport:</div>
+        <div class="transport" style="float:left;"></div>
+    </div>
+    <div style="clear:both"/>
+
     <br/>
+
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Sessions'">
         <div class="sessions"></div>
     </div>
-- 
cgit v1.2.1