From df1b673e8bd3c97f39515ce32fcacac0ee6b7d22 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Sun, 7 Apr 2013 20:43:45 +0000
Subject: QPID-4725 : [Java Broker] HTTP Management GUI Connection and
 VirtualHost tabs do not show user associated with connection

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1465457 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/resources/js/qpid/management/Connection.js            | 2 ++
 .../src/main/java/resources/js/qpid/management/VirtualHost.js           | 1 +
 .../management-http/src/main/java/resources/showConnection.html         | 2 ++
 3 files changed, 5 insertions(+)

(limited to 'qpid/java')

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 01f9a325c5..91dc52d6cf 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
@@ -85,6 +85,7 @@ define(["dojo/_base/xhr",
                storeNodes(["name",
                            "state",
                            "durable",
+                           "principal",
                            "lifetimePolicy",
                            "msgInRate",
                            "bytesInRate",
@@ -123,6 +124,7 @@ define(["dojo/_base/xhr",
               this.name.innerHTML = this.connectionData[ "name" ];
               this.state.innerHTML = this.connectionData[ "state" ];
               this.durable.innerHTML = this.connectionData[ "durable" ];
+              this.principal.innerHTML = this.connectionData[ "principal" ];
               this.lifetimePolicy.innerHTML = this.connectionData[ "lifetimePolicy" ];
 
            };
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
index db24951921..23c164f052 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
@@ -209,6 +209,7 @@ define(["dojo/_base/xhr",
                                                              findNode("connections"),
                                                              [ { name: "Name",    field: "name",      width: "150px"},
                                                                  { name: "Sessions", field: "sessionCount", width: "70px"},
+                                                                 { name: "User", field: "principal", width: "120px"},
                                                                  { name: "Msgs In", field: "msgInRate",
                                                                      width: "80px"},
                                                                  { name: "Bytes In", field: "bytesInRate",
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 84854daf47..82869004a8 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
@@ -38,6 +38,8 @@
     <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>
+    <br/>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Sessions'">
         <div class="sessions"></div>
-- 
cgit v1.2.1