You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/06/05 17:31:25 UTC
svn commit: r1346423 - in
/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources:
css/common.css js/qpid/management/Broker.js js/qpid/management/Queue.js
js/qpid/management/controller.js management.html
Author: rgodfrey
Date: Tue Jun 5 15:31:24 2012
New Revision: 1346423
URL: http://svn.apache.org/viewvc?rev=1346423&view=rev
Log:
QPID-3999 : add log file and queue message list viewers
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Broker.js
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Queue.js
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/controller.js
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/management.html
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css?rev=1346423&r1=1346422&r2=1346423&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css Tue Jun 5 15:31:24 2012
@@ -84,4 +84,9 @@ h1 {
font-size:11px;
line-height:17px;
+}
+
+div .messages {
+ width: 100%;
+ height: 350px;
}
\ No newline at end of file
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Broker.js?rev=1346423&r1=1346422&r2=1346423&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Broker.js Tue Jun 5 15:31:24 2012
@@ -124,7 +124,13 @@ define(["dojo/_base/xhr",
that.logfileGrid =
new UpdatableStore(that.logData, query(".broker-logfile")[0],
- [ { name: "Timestamp", field: "timestamp", width: "30px"},
+ [ { name: "Timestamp", field: "timestamp", width: "70px",
+ formatter: function(val) {
+ var d = new Date(0);
+ d.setUTCSeconds(val/1000);
+
+ return d.toLocaleString();
+ }},
{ name: "Level", field: "level", width: "60px"},
{ name: "Logger", field: "logger", width: "100px"},
{ name: "Thread", field: "thread", width: "60px"},
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Queue.js
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Queue.js?rev=1346423&r1=1346422&r2=1346423&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Queue.js (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/Queue.js Tue Jun 5 15:31:24 2012
@@ -28,13 +28,19 @@ define(["dojo/_base/xhr",
"qpid/common/util",
"qpid/common/formatter",
"qpid/common/UpdatableStore",
+ "dojo/store/JsonRest",
+ "dojox/grid/EnhancedGrid",
+ "dojo/data/ObjectStore",
+ "dojox/grid/enhanced/plugins/Pagination",
+ "dojox/grid/enhanced/plugins/IndirectSelection",
"dojo/domReady!"],
- function (xhr, parser, query, connect, json, properties, updater, util, formatter, UpdatableStore) {
+ function (xhr, parser, query, connect, json, properties, updater, util, formatter,
+ UpdatableStore, JsonRest, EnhancedGrid, ObjectStore, Pagination) {
function Queue(name, parent, controller) {
this.name = name;
this.controller = controller;
- this.modelObj = { type: "exchange", name: name };
+ this.modelObj = { type: "queue", name: name };
if(parent) {
this.modelObj.parent = {};
this.modelObj.parent[ parent.type] = parent;
@@ -61,7 +67,47 @@ define(["dojo/_base/xhr",
that.queueUpdater.update();
+ var myStore = new JsonRest({target:"/rest/message/"+ encodeURIComponent(that.modelObj.parent.virtualhost.name) +
+ "/" + encodeURIComponent(that.name)});
+ var messageGridDiv = query(".messages",contentPane.containerNode)[0];
+ that.grid = new EnhancedGrid({
+ store: new ObjectStore({objectStore: myStore}),
+ autoHeight: 10,
+ structure: [
+ {name:"Size", field:"size", width: "60px"},
+ {name:"State", field:"state", width: "120px"},
+
+ {name:"Arrival", field:"arrivalTime", width: "100%",
+ formatter: function(val) {
+ var d = new Date(0);
+ d.setUTCSeconds(val/1000);
+
+ return d.toLocaleString();
+ } }
+ ],
+ plugins: {
+ pagination: {
+ pageSizes: ["10", "25", "50", "100"],
+ description: true,
+ sizeSwitch: true,
+ pageStepper: true,
+ gotoButton: true,
+ maxPageStep: 4,
+ position: "bottom"
+ },
+ indirectSelection: true
+ }
+ }, messageGridDiv);
+
+
}});
+
+
+
+ };
+
+ Queue.prototype.startup = function() {
+ this.grid.startup();
};
Queue.prototype.close = function() {
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/controller.js
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/controller.js?rev=1346423&r1=1346422&r2=1346423&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/controller.js (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/controller.js Tue Jun 5 15:31:24 2012
@@ -83,6 +83,9 @@ define(["dojo/dom",
this.tabContainer.addChild( contentPane );
obj.open(contentPane);
contentPane.startup();
+ if(obj.startup) {
+ obj.startup();
+ }
this.tabContainer.selectChild( contentPane );
}
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/management.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/management.html?rev=1346423&r1=1346422&r2=1346423&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/management.html (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/management.html Tue Jun 5 15:31:24 2012
@@ -22,7 +22,8 @@
<link rel="stylesheet" href="/dojo/dojo/resources/dojo.css">
<link rel="stylesheet" href="/dojo/dijit/themes/claro/claro.css">
<link rel="stylesheet" href="/dojo/dojox/grid/resources/claroGrid.css">
-
+ <link rel="stylesheet" href="/dojo/dojox/grid/enhanced/resources/claro/EnhancedGrid.css">
+ <link rel="stylesheet" href="/dojo/dojox/grid/enhanced/resources/EnhancedGrid_rtl.css">
<link rel="stylesheet" href="css/common.css" media="screen">
<script>
var dojoConfig = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org