summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2013-04-07 20:43:45 +0000
committerRobert Godfrey <rgodfrey@apache.org>2013-04-07 20:43:45 +0000
commitdf1b673e8bd3c97f39515ce32fcacac0ee6b7d22 (patch)
tree7eedcffbdb2b8762cc44b7102a949ef7edf24c40
parent5ace6d93cb5246df25df4696d102d6a8a9527076 (diff)
downloadqpid-python-df1b673e8bd3c97f39515ce32fcacac0ee6b7d22.tar.gz
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
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js2
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js1
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html2
3 files changed, 5 insertions, 0 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 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>