You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/04/29 13:04:44 UTC
svn commit: r1741609 [22/31] - in /qpid/java/trunk:
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/
bdbstore/src/main/java/resources/js/qpid/management/virtual...
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js Fri Apr 29 11:04:40 2016
@@ -26,168 +26,224 @@ define(["dojo/_base/xhr",
"qpid/common/grid/GridUpdater",
"qpid/common/grid/UpdatableGrid",
"dojo/text!logger/memory/showLogViewer.html",
- "dojo/domReady!"],
- function (xhr, parser, query, locale, registry, GridUpdater, UpdatableGrid, template) {
+ "dojo/domReady!"], function (xhr, parser, query, locale, registry, GridUpdater, UpdatableGrid, template)
+ {
var defaulGridRowLimit = 4096;
var currentTimeZone;
function dataTransformer(data, userPreferences)
{
- for(var i=0; i < data.length; i++)
- {
- data[i].time = userPreferences.addTimeZoneOffsetToUTC(data[i].timestamp);
- }
- return data;
+ for (var i = 0; i < data.length; i++)
+ {
+ data[i].time = userPreferences.addTimeZoneOffsetToUTC(data[i].timestamp);
+ }
+ return data;
}
- function LogViewer(loggerModelObj, management, containerNode) {
+ function LogViewer(loggerModelObj, management, containerNode)
+ {
var that = this;
this.management = management;
- this.modelObj = {type: loggerModelObj.type, name: "getLogEntries", parent: loggerModelObj};
+ this.modelObj = {
+ type: loggerModelObj.type,
+ name: "getLogEntries",
+ parent: loggerModelObj
+ };
this.lastLogId = 0;
this.containerNode = containerNode;
containerNode.innerHTML = template;
- parser.parse(containerNode).then(function(instances){that._buildGrid();});
+ parser.parse(containerNode).then(function (instances)
+ {
+ that._buildGrid();
+ });
}
-
- LogViewer.prototype._buildGrid = function() {
+ LogViewer.prototype._buildGrid = function ()
+ {
var that = this;
var userPreferences = this.management.userPreferences;
currentTimeZone = userPreferences.getTimeZoneDescription();
- var gridStructure = [
- {
- hidden: false,
- name: "ID",
- field: "id",
- width: "50px",
- datatype: "number",
- filterable: true
- },
- {
- name: "Date", field: "time", width: "100px", datatype: "date",
- formatter: function(val) {
- return userPreferences.formatDateTime(val, {selector:"date"});
- }
- },
- { name: "Time ", field: "time", width: "100px", datatype: "time",
- formatter: function(val) {
- return userPreferences.formatDateTime(val, {selector:"time"});
- }
- },
- {
- name: "Time zone",
- field: "time",
- width: "80px",
- datatype: "string",
- hidden: true,
- filterable: false,
- formatter: function(val) {
- return currentTimeZone;
- }
- },
- { name: "Level", field: "level", width: "50px", datatype: "string", autoComplete: true, hidden: true},
- { name: "Logger", field: "logger", width: "150px", datatype: "string", autoComplete: false, hidden: true},
- { name: "Thread", field: "threadName", width: "100px", datatype: "string", hidden: true},
- { name: "Log Message", field: "message", width: "auto", datatype: "string"}
- ];
+ var gridStructure = [{
+ hidden: false,
+ name: "ID",
+ field: "id",
+ width: "50px",
+ datatype: "number",
+ filterable: true
+ },
+ {
+ name: "Date",
+ field: "time",
+ width: "100px",
+ datatype: "date",
+ formatter: function (val)
+ {
+ return userPreferences.formatDateTime(val, {selector: "date"});
+ }
+ },
+ {
+ name: "Time ",
+ field: "time",
+ width: "100px",
+ datatype: "time",
+ formatter: function (val)
+ {
+ return userPreferences.formatDateTime(val, {selector: "time"});
+ }
+ },
+ {
+ name: "Time zone",
+ field: "time",
+ width: "80px",
+ datatype: "string",
+ hidden: true,
+ filterable: false,
+ formatter: function (val)
+ {
+ return currentTimeZone;
+ }
+ },
+ {
+ name: "Level",
+ field: "level",
+ width: "50px",
+ datatype: "string",
+ autoComplete: true,
+ hidden: true
+ },
+ {
+ name: "Logger",
+ field: "logger",
+ width: "150px",
+ datatype: "string",
+ autoComplete: false,
+ hidden: true
+ },
+ {
+ name: "Thread",
+ field: "threadName",
+ width: "100px",
+ datatype: "string",
+ hidden: true
+ },
+ {
+ name: "Log Message",
+ field: "message",
+ width: "auto",
+ datatype: "string"
+ }];
var gridNode = query(".logEntries", this.containerNode)[0];
try
{
- var updater = new GridUpdater({
- userPreferences: userPreferences,
- updatable: false,
- serviceUrl: function()
- {
- return that.management.buildObjectURL(that.modelObj, {lastLogId: that.lastLogId});
- },
- onUpdate: function(items)
- {
- if (items)
- {
- var maxId = -1;
- for(var i in items)
- {
- var item = items[i];
- if (item.id > maxId)
+ var updater = new GridUpdater({
+ userPreferences: userPreferences,
+ updatable: false,
+ serviceUrl: function ()
+ {
+ return that.management.buildObjectURL(that.modelObj, {lastLogId: that.lastLogId});
+ },
+ onUpdate: function (items)
+ {
+ if (items)
{
- maxId = item.id
+ var maxId = -1;
+ for (var i in items)
+ {
+ var item = items[i];
+ if (item.id > maxId)
+ {
+ maxId = item.id
+ }
+ }
+ if (maxId != -1)
+ {
+ that.lastLogId = maxId
+ }
}
- }
- if (maxId != -1)
- {
- that.lastLogId = maxId
- }
+ },
+ append: true,
+ appendLimit: defaulGridRowLimit,
+ dataTransformer: function (data)
+ {
+ return dataTransformer(data, userPreferences);
}
- },
- append: true,
- appendLimit: defaulGridRowLimit,
- dataTransformer: function(data){ return dataTransformer(data, userPreferences);}
- });
- this.grid = new UpdatableGrid(updater.buildUpdatableGridArguments({
- structure: gridStructure,
- selectable: true,
- selectionMode: "none",
- sortInfo: -1,
- sortFields: [{attribute: 'id', descending: true}],
- plugins:{
- nestedSorting:true,
- enhancedFilter:{defaulGridRowLimit: defaulGridRowLimit,displayLastUpdateTime:true},
- indirectSelection: false,
- pagination: {defaultPageSize: 10}
- }
- }), gridNode);
- var onStyleRow = function(row)
- {
- var item = that.grid.getItem(row.index);
- if(item){
- var level = that.grid.store.getValue(item, "level", null);
- var changed = false;
- if(level == "ERROR"){
- row.customClasses += " redBackground";
- changed = true;
- } else if(level == "WARN"){
- row.customClasses += " yellowBackground";
- changed = true;
- } else if(level == "DEBUG"){
- row.customClasses += " grayBackground";
- changed = true;
- }
- if (changed)
- {
- that.grid.focus.styleRow(row);
- }
- }
- };
- this.grid.on("styleRow", onStyleRow);
- this.grid.startup();
- userPreferences.addListener(this);
+ });
+ this.grid = new UpdatableGrid(updater.buildUpdatableGridArguments({
+ structure: gridStructure,
+ selectable: true,
+ selectionMode: "none",
+ sortInfo: -1,
+ sortFields: [{
+ attribute: 'id',
+ descending: true
+ }],
+ plugins: {
+ nestedSorting: true,
+ enhancedFilter: {
+ defaulGridRowLimit: defaulGridRowLimit,
+ displayLastUpdateTime: true
+ },
+ indirectSelection: false,
+ pagination: {defaultPageSize: 10}
+ }
+ }), gridNode);
+ var onStyleRow = function (row)
+ {
+ var item = that.grid.getItem(row.index);
+ if (item)
+ {
+ var level = that.grid.store.getValue(item, "level", null);
+ var changed = false;
+ if (level == "ERROR")
+ {
+ row.customClasses += " redBackground";
+ changed = true;
+ }
+ else if (level == "WARN")
+ {
+ row.customClasses += " yellowBackground";
+ changed = true;
+ }
+ else if (level == "DEBUG")
+ {
+ row.customClasses += " grayBackground";
+ changed = true;
+ }
+ if (changed)
+ {
+ that.grid.focus.styleRow(row);
+ }
+ }
+ };
+ this.grid.on("styleRow", onStyleRow);
+ this.grid.startup();
+ userPreferences.addListener(this);
}
- catch(err)
+ catch (err)
{
- if (console && console.error)
- {
- console.error(err);
- }
+ if (console && console.error)
+ {
+ console.error(err);
+ }
}
};
- LogViewer.prototype.onPreferencesChange = function(data)
+ LogViewer.prototype.onPreferencesChange = function (data)
{
- var userPreferences = this.management.userPreferences;
- currentTimeZone = userPreferences.getTimeZoneDescription();
- if (this.grid.updater.memoryStore)
- {
- dataTransformer(this.grid.updater.memoryStore.data, userPreferences);
- this.grid._refresh();
- }
+ var userPreferences = this.management.userPreferences;
+ currentTimeZone = userPreferences.getTimeZoneDescription();
+ if (this.grid.updater.memoryStore)
+ {
+ dataTransformer(this.grid.updater.memoryStore.data, userPreferences);
+ this.grid._refresh();
+ }
};
- LogViewer.prototype.close = function(data)
+ LogViewer.prototype.close = function (data)
{
- this.management.userPreferences.removeListener(this);
+ this.management.userPreferences.removeListener(this);
}
return LogViewer;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/add.js Fri Apr 29 11:04:40 2016
@@ -18,22 +18,16 @@
* under the License.
*
*/
-define(["dojo/dom",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!logger/brokerlogger/add.html",
- "dojo/domReady!"],
- function (dom, util, parser, template)
- {
- var addBrokerLogger =
- {
- show: function(data)
- {
- data.containerNode.innerHTML = template;
- return parser.parse(data.containerNode);
- }
- };
+define(["dojo/dom", "qpid/common/util", "dojo/parser", "dojo/text!logger/brokerlogger/add.html", "dojo/domReady!"],
+ function (dom, util, parser, template)
+ {
+ var addBrokerLogger = {
+ show: function (data)
+ {
+ data.containerNode.innerHTML = template;
+ return parser.parse(data.containerNode);
+ }
+ };
- return addBrokerLogger;
- }
-);
+ return addBrokerLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/add.js Fri Apr 29 11:04:40 2016
@@ -18,24 +18,21 @@
*
*/
define(["dojo/dom",
- "dojo/query",
- "dojo/_base/array",
- "dijit/registry",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!logger/brokerlogbacksocket/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addLogbackLogger =
- {
- show: function(data)
- {
- data.containerNode.innerHTML = template;
- return parser.parse(data.containerNode);
- }
- };
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "dojo/parser",
+ "dojo/text!logger/brokerlogbacksocket/add.html",
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addLogbackLogger = {
+ show: function (data)
+ {
+ data.containerNode.innerHTML = template;
+ return parser.parse(data.containerNode);
+ }
+ };
- return addLogbackLogger;
- }
-);
+ return addLogbackLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/show.js Fri Apr 29 11:04:40 2016
@@ -18,23 +18,27 @@
*
*/
define(["qpid/common/util",
- "dojo/text!logger/brokerlogbacksocket/show.html",
- "qpid/common/TypeTabExtension",
- "dojo/domReady!"],
- function (util, template, TypeTabExtension)
- {
- function BrokerLogbackLogger(params)
- {
- TypeTabExtension.call(this, params.containerNode, template, "BrokerLogger", "BrokerLogbackSocket", params.metadata, params.data);
- }
+ "dojo/text!logger/brokerlogbacksocket/show.html",
+ "qpid/common/TypeTabExtension",
+ "dojo/domReady!"], function (util, template, TypeTabExtension)
+ {
+ function BrokerLogbackLogger(params)
+ {
+ TypeTabExtension.call(this,
+ params.containerNode,
+ template,
+ "BrokerLogger",
+ "BrokerLogbackSocket",
+ params.metadata,
+ params.data);
+ }
- util.extend(BrokerLogbackLogger, TypeTabExtension);
+ util.extend(BrokerLogbackLogger, TypeTabExtension);
- BrokerLogbackLogger.prototype.update = function (restData)
- {
- TypeTabExtension.prototype.update.call(this, restData);
- }
+ BrokerLogbackLogger.prototype.update = function (restData)
+ {
+ TypeTabExtension.prototype.update.call(this, restData);
+ }
- return BrokerLogbackLogger;
- }
-);
+ return BrokerLogbackLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/add.js Fri Apr 29 11:04:40 2016
@@ -19,29 +19,30 @@
*
*/
define(["dojo/dom",
- "dojo/query",
- "dojo/_base/array",
- "dijit/registry",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!logger/console/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- return {
- show: function(data)
- {
- var that = this;
- this.metadata = data.metadata;
- data.containerNode.innerHTML = template;
- return parser.parse(data.containerNode).then(function(instances)
- {
- var consoleStreamTargetWidget = registry.byId("addLogger.console.consoleStreamTarget");
- var validValues = that.metadata.getMetaData(data.category, data.type).attributes.consoleStreamTarget.validValues;
- var validValueStore = util.makeTypeStore(validValues);
- consoleStreamTargetWidget.set("store", validValueStore);
- });
- }
- };
- }
-);
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "dojo/parser",
+ "dojo/text!logger/console/add.html",
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ return {
+ show: function (data)
+ {
+ var that = this;
+ this.metadata = data.metadata;
+ data.containerNode.innerHTML = template;
+ return parser.parse(data.containerNode).then(function (instances)
+ {
+ var consoleStreamTargetWidget = registry.byId(
+ "addLogger.console.consoleStreamTarget");
+ var validValues = that.metadata.getMetaData(data.category,
+ data.type).attributes.consoleStreamTarget.validValues;
+ var validValueStore = util.makeTypeStore(validValues);
+ consoleStreamTargetWidget.set("store",
+ validValueStore);
+ });
+ }
+ };
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/show.js Fri Apr 29 11:04:40 2016
@@ -19,18 +19,22 @@
*
*/
define(["qpid/common/util",
- "dojo/query",
- "dojox/html/entities",
- "dojo/text!logger/console/show.html",
- "qpid/common/TypeTabExtension",
- "dojo/domReady!"],
- function (util, query, entities, template, TypeTabExtension)
- {
- function BrokerConsoleLogger(params)
- {
- TypeTabExtension.call(this, params.containerNode, template, "BrokerLogger", "Console", params.metadata, params.data);
- }
+ "dojo/query",
+ "dojox/html/entities",
+ "dojo/text!logger/console/show.html",
+ "qpid/common/TypeTabExtension",
+ "dojo/domReady!"], function (util, query, entities, template, TypeTabExtension)
+ {
+ function BrokerConsoleLogger(params)
+ {
+ TypeTabExtension.call(this,
+ params.containerNode,
+ template,
+ "BrokerLogger",
+ "Console",
+ params.metadata,
+ params.data);
+ }
- return util.extend(BrokerConsoleLogger, TypeTabExtension);
- }
-);
+ return util.extend(BrokerConsoleLogger, TypeTabExtension);
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/add.js Fri Apr 29 11:04:40 2016
@@ -19,24 +19,21 @@
*
*/
define(["dojo/dom",
- "dojo/query",
- "dojo/_base/array",
- "dijit/registry",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!logger/file/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addFileLogger =
- {
- show: function(data)
- {
- data.containerNode.innerHTML = template;
- return parser.parse(data.containerNode);
- }
- };
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "dojo/parser",
+ "dojo/text!logger/file/add.html",
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addFileLogger = {
+ show: function (data)
+ {
+ data.containerNode.innerHTML = template;
+ return parser.parse(data.containerNode);
+ }
+ };
- return addFileLogger;
- }
-);
+ return addFileLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js Fri Apr 29 11:04:40 2016
@@ -19,29 +19,35 @@
*
*/
define(["qpid/common/util",
- "dojo/text!logger/file/show.html",
- "qpid/common/TypeTabExtension",
- "qpid/management/logger/FileBrowser",
- "dojo/domReady!"],
- function (util, template, TypeTabExtension, FileBrowser)
- {
- function BrokerFileLogger(params)
- {
- this.fileBrowser = new FileBrowser({containerNode: params.typeSpecificDetailsNode,
- management: params.management,
- data: params.data,
- modelObj: params.modelObj});
- TypeTabExtension.call(this, params.containerNode, template, "BrokerLogger", "File", params.metadata, params.data);
- }
+ "dojo/text!logger/file/show.html",
+ "qpid/common/TypeTabExtension",
+ "qpid/management/logger/FileBrowser",
+ "dojo/domReady!"], function (util, template, TypeTabExtension, FileBrowser)
+ {
+ function BrokerFileLogger(params)
+ {
+ this.fileBrowser = new FileBrowser({
+ containerNode: params.typeSpecificDetailsNode,
+ management: params.management,
+ data: params.data,
+ modelObj: params.modelObj
+ });
+ TypeTabExtension.call(this,
+ params.containerNode,
+ template,
+ "BrokerLogger",
+ "File",
+ params.metadata,
+ params.data);
+ }
- util.extend(BrokerFileLogger, TypeTabExtension);
+ util.extend(BrokerFileLogger, TypeTabExtension);
- BrokerFileLogger.prototype.update = function (restData)
- {
- TypeTabExtension.prototype.update.call(this, restData);
- this.fileBrowser.update(restData);
- }
+ BrokerFileLogger.prototype.update = function (restData)
+ {
+ TypeTabExtension.prototype.update.call(this, restData);
+ this.fileBrowser.update(restData);
+ }
- return BrokerFileLogger;
- }
-);
+ return BrokerFileLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/add.js Fri Apr 29 11:04:40 2016
@@ -19,21 +19,19 @@
*
*/
define(["dojo/dom",
- "dojo/query",
- "dojo/_base/array",
- "dijit/registry",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!logger/memory/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- return {
- show: function(data)
- {
- data.containerNode.innerHTML = template;
- return parser.parse(data.containerNode);
- }
- };
- }
-);
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "dojo/parser",
+ "dojo/text!logger/memory/add.html",
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ return {
+ show: function (data)
+ {
+ data.containerNode.innerHTML = template;
+ return parser.parse(data.containerNode);
+ }
+ };
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js Fri Apr 29 11:04:40 2016
@@ -19,22 +19,26 @@
*
*/
define(["qpid/common/util",
- "dojo/query",
- "dojox/html/entities",
- "dojo/text!logger/memory/show.html",
- "qpid/common/TypeTabExtension",
- "qpid/management/logger/LogViewer",
- "dojo/domReady!"],
- function (util, query, entities, template, TypeTabExtension, LogViewer)
- {
- function BrokerMemoryLogger(params)
- {
- this.logViewer = new LogViewer(params.modelObj, params.management, params.typeSpecificDetailsNode);
- TypeTabExtension.call(this, params.containerNode, template, "BrokerLogger", "Memory", params.metadata, params.data);
- }
+ "dojo/query",
+ "dojox/html/entities",
+ "dojo/text!logger/memory/show.html",
+ "qpid/common/TypeTabExtension",
+ "qpid/management/logger/LogViewer",
+ "dojo/domReady!"], function (util, query, entities, template, TypeTabExtension, LogViewer)
+ {
+ function BrokerMemoryLogger(params)
+ {
+ this.logViewer = new LogViewer(params.modelObj, params.management, params.typeSpecificDetailsNode);
+ TypeTabExtension.call(this,
+ params.containerNode,
+ template,
+ "BrokerLogger",
+ "Memory",
+ params.metadata,
+ params.data);
+ }
- util.extend(BrokerMemoryLogger, TypeTabExtension);
+ util.extend(BrokerMemoryLogger, TypeTabExtension);
- return BrokerMemoryLogger;
- }
-);
+ return BrokerMemoryLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js Fri Apr 29 11:04:40 2016
@@ -18,38 +18,38 @@
* under the License.
*
*/
- define(["qpid/common/util",
- "dojo/query",
- "dojo/_base/lang",
- "dojo/text!logger/brokerlogger/show.html",
- "qpid/common/CategoryTabExtension",
- "dojo/domReady!"],
- function (util, query, lang, template, CategoryTabExtension)
- {
- function BrokerLogger(params)
- {
- var categoryExtensionParams = lang.mixin(params, {
- template: template,
- typeSpecificAttributesClassName: "typeSpecificAttributes",
- baseUrl: "qpid/management/logger/brokerlogger/"
- });
- CategoryTabExtension.call(this, categoryExtensionParams);
- }
+define(["qpid/common/util",
+ "dojo/query",
+ "dojo/_base/lang",
+ "dojo/text!logger/brokerlogger/show.html",
+ "qpid/common/CategoryTabExtension",
+ "dojo/domReady!"], function (util, query, lang, template, CategoryTabExtension)
+ {
+ function BrokerLogger(params)
+ {
+ var categoryExtensionParams = lang.mixin(params, {
+ template: template,
+ typeSpecificAttributesClassName: "typeSpecificAttributes",
+ baseUrl: "qpid/management/logger/brokerlogger/"
+ });
+ CategoryTabExtension.call(this, categoryExtensionParams);
+ }
- util.extend(BrokerLogger, CategoryTabExtension);
+ util.extend(BrokerLogger, CategoryTabExtension);
- BrokerLogger.prototype.postParse = function(containerNode)
- {
- this.virtualHostLogEventExcludedCheckboxContainer = query(".virtualHostLogEventExcluded", containerNode)[0];
- }
+ BrokerLogger.prototype.postParse = function (containerNode)
+ {
+ this.virtualHostLogEventExcludedCheckboxContainer =
+ query(".virtualHostLogEventExcluded", containerNode)[0];
+ }
- BrokerLogger.prototype.update = function(restData)
- {
- var data = restData || {};
- this.virtualHostLogEventExcludedCheckboxContainer.innerHTML = util.buildCheckboxMarkup(data.virtualHostLogEventExcluded);
- CategoryTabExtension.prototype.update.call(this, restData);
- }
+ BrokerLogger.prototype.update = function (restData)
+ {
+ var data = restData || {};
+ this.virtualHostLogEventExcludedCheckboxContainer.innerHTML =
+ util.buildCheckboxMarkup(data.virtualHostLogEventExcluded);
+ CategoryTabExtension.prototype.update.call(this, restData);
+ }
- return BrokerLogger;
- }
- );
+ return BrokerLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/add.js Fri Apr 29 11:04:40 2016
@@ -19,24 +19,21 @@
*
*/
define(["dojo/dom",
- "dojo/query",
- "dojo/_base/array",
- "dijit/registry",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!logger/syslog/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addSyslogLogger =
- {
- show: function(data)
- {
- data.containerNode.innerHTML = template;
- return parser.parse(data.containerNode);
- }
- };
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "dojo/parser",
+ "dojo/text!logger/syslog/add.html",
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addSyslogLogger = {
+ show: function (data)
+ {
+ data.containerNode.innerHTML = template;
+ return parser.parse(data.containerNode);
+ }
+ };
- return addSyslogLogger;
- }
-);
+ return addSyslogLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/show.js Fri Apr 29 11:04:40 2016
@@ -18,24 +18,26 @@
* under the License.
*
*/
-define(["qpid/common/util",
- "dojo/text!logger/syslog/show.html",
- "qpid/common/TypeTabExtension",
- "dojo/domReady!"],
- function (util, template, TypeTabExtension)
- {
- function BrokerSyslogLogger(params)
- {
- TypeTabExtension.call(this, params.containerNode, template, "BrokerLogger", "Syslog", params.metadata, params.data);
- }
+define(["qpid/common/util", "dojo/text!logger/syslog/show.html", "qpid/common/TypeTabExtension", "dojo/domReady!"],
+ function (util, template, TypeTabExtension)
+ {
+ function BrokerSyslogLogger(params)
+ {
+ TypeTabExtension.call(this,
+ params.containerNode,
+ template,
+ "BrokerLogger",
+ "Syslog",
+ params.metadata,
+ params.data);
+ }
- util.extend(BrokerSyslogLogger, TypeTabExtension);
+ util.extend(BrokerSyslogLogger, TypeTabExtension);
- BrokerSyslogLogger.prototype.update = function (restData)
- {
- TypeTabExtension.prototype.update.call(this, restData);
- }
+ BrokerSyslogLogger.prototype.update = function (restData)
+ {
+ TypeTabExtension.prototype.update.call(this, restData);
+ }
- return BrokerSyslogLogger;
- }
-);
+ return BrokerSyslogLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/add.js Fri Apr 29 11:04:40 2016
@@ -18,20 +18,16 @@
* under the License.
*
*/
-define(["dojo/Deferred",
- "dojo/domReady!"],
- function (Deferred)
- {
- var addVirtualHostLogger =
- {
- show: function(data)
- {
- var deferred = new Deferred();
- deferred.resolve("noop");
- return deferred;
- }
+define(["dojo/Deferred", "dojo/domReady!"], function (Deferred)
+{
+ var addVirtualHostLogger = {
+ show: function (data)
+ {
+ var deferred = new Deferred();
+ deferred.resolve("noop");
+ return deferred;
+ }
};
return addVirtualHostLogger;
- }
-);
+});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js Fri Apr 29 11:04:40 2016
@@ -19,24 +19,21 @@
*
*/
define(["dojo/dom",
- "dojo/query",
- "dojo/_base/array",
- "dijit/registry",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!logger/file/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addFileLogger =
- {
- show: function(data)
- {
- data.containerNode.innerHTML = template;
- return parser.parse(data.containerNode);
- }
- };
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "dojo/parser",
+ "dojo/text!logger/file/add.html",
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addFileLogger = {
+ show: function (data)
+ {
+ data.containerNode.innerHTML = template;
+ return parser.parse(data.containerNode);
+ }
+ };
- return addFileLogger;
- }
-);
+ return addFileLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js Fri Apr 29 11:04:40 2016
@@ -19,29 +19,35 @@
*
*/
define(["qpid/common/util",
- "dojo/text!logger/file/show.html",
- "qpid/common/TypeTabExtension",
- "qpid/management/logger/FileBrowser",
- "dojo/domReady!"],
- function (util, template, TypeTabExtension, FileBrowser)
- {
- function VirtualHostFileLogger(params)
- {
- this.fileBrowser = new FileBrowser({containerNode: params.typeSpecificDetailsNode,
- management: params.management,
- data: params.data,
- modelObj: params.modelObj});
- TypeTabExtension.call(this, params.containerNode, template, "VirtualHostLogger", "File", params.metadata, params.data);
- }
+ "dojo/text!logger/file/show.html",
+ "qpid/common/TypeTabExtension",
+ "qpid/management/logger/FileBrowser",
+ "dojo/domReady!"], function (util, template, TypeTabExtension, FileBrowser)
+ {
+ function VirtualHostFileLogger(params)
+ {
+ this.fileBrowser = new FileBrowser({
+ containerNode: params.typeSpecificDetailsNode,
+ management: params.management,
+ data: params.data,
+ modelObj: params.modelObj
+ });
+ TypeTabExtension.call(this,
+ params.containerNode,
+ template,
+ "VirtualHostLogger",
+ "File",
+ params.metadata,
+ params.data);
+ }
- util.extend(VirtualHostFileLogger, TypeTabExtension);
+ util.extend(VirtualHostFileLogger, TypeTabExtension);
- VirtualHostFileLogger.prototype.update = function (restData)
- {
- TypeTabExtension.prototype.update.call(this, restData);
- this.fileBrowser.update(restData);
- }
+ VirtualHostFileLogger.prototype.update = function (restData)
+ {
+ TypeTabExtension.prototype.update.call(this, restData);
+ this.fileBrowser.update(restData);
+ }
- return VirtualHostFileLogger;
- }
-);
+ return VirtualHostFileLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js Fri Apr 29 11:04:40 2016
@@ -19,23 +19,21 @@
*
*/
define(["qpid/common/util",
- "dojo/query",
- "dojo/_base/lang",
- "dojo/text!logger/virtualhostlogger/show.html",
- "qpid/common/CategoryTabExtension",
- "dojo/domReady!"],
- function (util, query, lang, template, CategoryTabExtension)
- {
- function VirtualHostLogger(params)
- {
- var categoryExtensionParams = lang.mixin(params, {
- template: template,
- typeSpecificAttributesClassName: "typeSpecificAttributes",
- baseUrl: "qpid/management/logger/virtualhostlogger/"
- });
- CategoryTabExtension.call(this, categoryExtensionParams);
- }
+ "dojo/query",
+ "dojo/_base/lang",
+ "dojo/text!logger/virtualhostlogger/show.html",
+ "qpid/common/CategoryTabExtension",
+ "dojo/domReady!"], function (util, query, lang, template, CategoryTabExtension)
+ {
+ function VirtualHostLogger(params)
+ {
+ var categoryExtensionParams = lang.mixin(params, {
+ template: template,
+ typeSpecificAttributesClassName: "typeSpecificAttributes",
+ baseUrl: "qpid/management/logger/virtualhostlogger/"
+ });
+ CategoryTabExtension.call(this, categoryExtensionParams);
+ }
- return util.extend(VirtualHostLogger, CategoryTabExtension);
- }
-);
+ return util.extend(VirtualHostLogger, CategoryTabExtension);
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/add.js Fri Apr 29 11:04:40 2016
@@ -19,24 +19,21 @@
*
*/
define(["dojo/dom",
- "dojo/query",
- "dojo/_base/array",
- "dijit/registry",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!logger/syslog/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addSyslogLogger =
- {
- show: function(data)
- {
- data.containerNode.innerHTML = template;
- return parser.parse(data.containerNode);
- }
- };
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "dojo/parser",
+ "dojo/text!logger/syslog/add.html",
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addSyslogLogger = {
+ show: function (data)
+ {
+ data.containerNode.innerHTML = template;
+ return parser.parse(data.containerNode);
+ }
+ };
- return addSyslogLogger;
- }
-);
+ return addSyslogLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/show.js Fri Apr 29 11:04:40 2016
@@ -18,24 +18,26 @@
* under the License.
*
*/
-define(["qpid/common/util",
- "dojo/text!logger/syslog/show.html",
- "qpid/common/TypeTabExtension",
- "dojo/domReady!"],
- function (util, template, TypeTabExtension)
- {
- function VirtualHostSyslogLogger(params)
- {
- TypeTabExtension.call(this, params.containerNode, template, "VirtualHostLogger", "Syslog", params.metadata, params.data);
- }
+define(["qpid/common/util", "dojo/text!logger/syslog/show.html", "qpid/common/TypeTabExtension", "dojo/domReady!"],
+ function (util, template, TypeTabExtension)
+ {
+ function VirtualHostSyslogLogger(params)
+ {
+ TypeTabExtension.call(this,
+ params.containerNode,
+ template,
+ "VirtualHostLogger",
+ "Syslog",
+ params.metadata,
+ params.data);
+ }
- util.extend(VirtualHostSyslogLogger, TypeTabExtension);
+ util.extend(VirtualHostSyslogLogger, TypeTabExtension);
- VirtualHostSyslogLogger.prototype.update = function (restData)
- {
- TypeTabExtension.prototype.update.call(this, restData);
- }
+ VirtualHostSyslogLogger.prototype.update = function (restData)
+ {
+ TypeTabExtension.prototype.update.call(this, restData);
+ }
- return VirtualHostSyslogLogger;
- }
-);
+ return VirtualHostSyslogLogger;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js Fri Apr 29 11:04:40 2016
@@ -19,33 +19,32 @@
*
*/
define(["dojo/dom",
- "dojo/query",
- "dojo/_base/array",
- "dijit/registry",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!loginclusionrule/nameandlevel/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addLogInclusionRule =
- {
- show: function(data)
- {
- var that = this;
- this.metadata = data.metadata;
- this.containerNode = data.containerNode;
- data.containerNode.innerHTML = template;
- return parser.parse(this.containerNode).then(function(instances)
- {
- var logLevelWidget = registry.byId("addLogInclusionRule.level");
- var validValues = that.metadata.getMetaData(data.category, data.type).attributes.level.validValues;
- var validValueStore = util.makeTypeStore(validValues);
- logLevelWidget.set("store", validValueStore);
- });
- }
- };
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "dojo/parser",
+ "dojo/text!loginclusionrule/nameandlevel/add.html",
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addLogInclusionRule = {
+ show: function (data)
+ {
+ var that = this;
+ this.metadata = data.metadata;
+ this.containerNode = data.containerNode;
+ data.containerNode.innerHTML = template;
+ return parser.parse(this.containerNode).then(function (instances)
+ {
+ var logLevelWidget = registry.byId(
+ "addLogInclusionRule.level");
+ var validValues = that.metadata.getMetaData(data.category,
+ data.type).attributes.level.validValues;
+ var validValueStore = util.makeTypeStore(validValues);
+ logLevelWidget.set("store", validValueStore);
+ });
+ }
+ };
- return addLogInclusionRule;
- }
-);
+ return addLogInclusionRule;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js Fri Apr 29 11:04:40 2016
@@ -19,33 +19,32 @@
*
*/
define(["dojo/dom",
- "dojo/query",
- "dojo/_base/array",
- "dijit/registry",
- "qpid/common/util",
- "dojo/parser",
- "dojo/text!loginclusionrule/nameandlevel/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addLogInclusionRule =
- {
- show: function(data)
- {
- var that = this;
- this.metadata = data.metadata;
- this.containerNode = data.containerNode;
- data.containerNode.innerHTML = template;
- return parser.parse(this.containerNode).then(function(instances)
- {
- var logLevelWidget = registry.byId("addLogInclusionRule.level");
- var validValues = that.metadata.getMetaData(data.category, data.type).attributes.level.validValues;
- var validValueStore = util.makeTypeStore(validValues);
- logLevelWidget.set("store", validValueStore);
- });
- }
- };
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "dojo/parser",
+ "dojo/text!loginclusionrule/nameandlevel/add.html",
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addLogInclusionRule = {
+ show: function (data)
+ {
+ var that = this;
+ this.metadata = data.metadata;
+ this.containerNode = data.containerNode;
+ data.containerNode.innerHTML = template;
+ return parser.parse(this.containerNode).then(function (instances)
+ {
+ var logLevelWidget = registry.byId(
+ "addLogInclusionRule.level");
+ var validValues = that.metadata.getMetaData(data.category,
+ data.type).attributes.level.validValues;
+ var validValueStore = util.makeTypeStore(validValues);
+ logLevelWidget.set("store", validValueStore);
+ });
+ }
+ };
- return addLogInclusionRule;
- }
-);
+ return addLogInclusionRule;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js Fri Apr 29 11:04:40 2016
@@ -30,102 +30,117 @@ define(["dojo/dom",
"qpid/common/util",
"dojo/text!moveCopyMessages.html",
"dojo/domReady!"],
- function (dom, construct, win, registry, parser, array, event, json, Memory, FilteringSelect, query, connect, util, template) {
+ function (dom, construct, win, registry, parser, array, event, json, Memory, FilteringSelect, query, connect, util, template)
+ {
- var moveMessages = {};
+ var moveMessages = {};
- var node = construct.create("div", null, win.body(), "last");
+ var node = construct.create("div", null, win.body(), "last");
+ var theForm;
+ node.innerHTML = template;
+ moveMessages.dialogNode = dom.byId("moveMessages");
+ parser.instantiate([moveMessages.dialogNode]);
+ moveMessages.dialog = registry.byId("moveMessages");
+ moveMessages.submitButton = registry.byId("moveMessageSubmit");
+
+ theForm = registry.byId("formMoveMessages");
+
+ var cancelButton = registry.byId("moveMessageCancel");
+
+ connect.connect(cancelButton, "onClick", function (evt)
+ {
+ event.stop(evt);
+ moveMessages.dialog.hide();
+ });
+
+ theForm.on("submit", function (e)
+ {
+
+ event.stop(e);
+ if (theForm.validate())
+ {
+ var destination = theForm.getValues()["queue"]
+ var messageIds = moveMessages.data.messages
+ var modelObj = {
+ type: "queue",
+ name: moveMessages.data.move ? "moveMessages" : "copyMessages",
+ parent: moveMessages.modelObj
+ };
+ var parameters = {
+ destination: destination,
+ messageIds: messageIds
+ };
+ moveMessages.management.update(modelObj, parameters).then(function (result)
+ {
+ moveMessages.dialog.hide();
+ if (moveMessages.next)
+ {
+ moveMessages.next();
+ }
+ });
+ return false;
+ }
+ else
+ {
+ alert('Form contains invalid data. Please correct first');
+ return false;
+ }
+
+ });
+
+ moveMessages.show = function (management, modelObj, data, next)
+ {
+ var that = this;
+ moveMessages.modelObj = modelObj;
+ moveMessages.management = management;
+ moveMessages.data = data;
+ moveMessages.next = next;
+ registry.byId("formMoveMessages").reset();
+
+ var label = data.move ? "Move messages" : "Copy messages";
+ moveMessages.submitButton.set("label", label);
+ moveMessages.dialog.set("title", label);
+
+ management.load({
+ type: "queue",
+ parent: modelObj.parent
+ }, {depth: 0}).then(function (data)
+ {
+ var queues = [];
+ for (var i = 0; i < data.length; i++)
+ {
+ if (data[i].name != modelObj.name)
+ {
+ queues.push({
+ id: data[i].name,
+ name: data[i].name
+ });
+ }
+ }
+ var queueStore = new Memory({data: queues});
+
+ if (that.queueChooser)
+ {
+ that.queueChooser.destroy(false);
+ }
+ var queueDiv = dom.byId("moveMessages.selectQueueDiv");
+ var input = construct.create("input",
+ {id: "moveMessagesSelectQueue"},
+ queueDiv);
+
+ that.queueChooser = new FilteringSelect({
+ id: "moveMessagesSelectQueue",
+ name: "queue",
+ store: queueStore,
+ searchAttr: "name"
+ }, input);
- var theForm;
- node.innerHTML = template;
- moveMessages.dialogNode = dom.byId("moveMessages");
- parser.instantiate([moveMessages.dialogNode]);
- moveMessages.dialog = registry.byId("moveMessages");
- moveMessages.submitButton = registry.byId("moveMessageSubmit");
+ moveMessages.dialog.show();
- theForm = registry.byId("formMoveMessages");
+ }, util.xhrErrorHandler);
- var cancelButton = registry.byId("moveMessageCancel");
+ };
- connect.connect(cancelButton, "onClick",
- function(evt){
- event.stop(evt);
- moveMessages.dialog.hide();
- });
-
-
- theForm.on("submit", function(e) {
-
- event.stop(e);
- if(theForm.validate())
- {
- var destination = theForm.getValues()["queue"]
- var messageIds = moveMessages.data.messages
- var modelObj = { type: "queue", name: moveMessages.data.move ? "moveMessages" : "copyMessages", parent: moveMessages.modelObj };
- var parameters = {destination: destination, messageIds: messageIds};
- moveMessages.management.update(modelObj, parameters).then(
- function(result)
- {
- moveMessages.dialog.hide();
- if(moveMessages.next)
- {
- moveMessages.next();
- }
- });
- return false;
- }else{
- alert('Form contains invalid data. Please correct first');
- return false;
- }
-
- });
-
- moveMessages.show = function(management, modelObj, data, next) {
- var that = this;
- moveMessages.modelObj = modelObj;
- moveMessages.management = management;
- moveMessages.data = data;
- moveMessages.next = next;
- registry.byId("formMoveMessages").reset();
-
- var label = data.move ? "Move messages" : "Copy messages";
- moveMessages.submitButton.set("label", label);
- moveMessages.dialog.set("title", label);
-
- management.load({type: "queue", parent: modelObj.parent}, {depth:0}).then(
- function(data) {
- var queues = [];
- for(var i=0; i < data.length; i++)
- {
- if (data[i].name != modelObj.name)
- {
- queues.push({id: data[i].name, name: data[i].name});
- }
- }
- var queueStore = new Memory({ data: queues });
-
-
- if(that.queueChooser) {
- that.queueChooser.destroy( false );
- }
- var queueDiv = dom.byId("moveMessages.selectQueueDiv");
- var input = construct.create("input", {id: "moveMessagesSelectQueue"}, queueDiv);
-
- that.queueChooser = new FilteringSelect({ id: "moveMessagesSelectQueue",
- name: "queue",
- store: queueStore,
- searchAttr: "name"}, input);
-
-
-
- moveMessages.dialog.show();
-
-
- }, util.xhrErrorHandler);
-
-
- };
-
- return moveMessages;
- });
+ return moveMessages;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js Fri Apr 29 11:04:40 2016
@@ -37,81 +37,98 @@ define(["dojo/dom",
"dijit/form/CheckBox",
"dijit/form/NumberSpinner",
"dojo/domReady!"],
- function (dom, parser, query, construct, connect, win, event, json, registry, util, properties, updater, template, editor) {
+ function (dom, parser, query, construct, connect, win, event, json, registry, util, properties, updater, template, editor)
+ {
- function ManagementHttp(containerNode, pluginObject, controller, contentPane) {
- var node = construct.create("div", null, containerNode, "last");
- var that = this;
- this.name = pluginObject.name;
- this.modelObj = pluginObject;
- this.management = controller.management;
- node.innerHTML = template;
- parser.parse(node).then(function(instances)
- {
- that.managementHttpUpdater= new ManagementHttpUpdater(node, pluginObject, controller, contentPane);
- that.managementHttpUpdater.update(function(){updater.add( that.managementHttpUpdater)});
-
- var editButton = query(".editPluginButton", node)[0];
- connect.connect(registry.byNode(editButton), "onClick", function(evt){ that.edit(); });
- });
- }
-
- ManagementHttp.prototype.close = function() {
- updater.remove( this.managementHttpUpdater );
- };
-
- ManagementHttp.prototype.edit = function() {
- editor.show(this.management, this.modelObj, this.managementHttpUpdater.pluginData);
- };
-
- function ManagementHttpUpdater(node, pluginObject, controller, contentPane)
- {
- this.contentPane = contentPane;
- this.controller = controller;
- this.modelObj = pluginObject;
- this.name = pluginObject.name;
- this.httpBasicAuthenticationEnabled = query(".httpBasicAuthenticationEnabled", node)[0];
- this.httpsBasicAuthenticationEnabled = query(".httpsBasicAuthenticationEnabled", node)[0];
- this.sessionTimeout = query(".sessionTimeout", node)[0];
- this.httpsSaslAuthenticationEnabled = query(".httpsSaslAuthenticationEnabled", node)[0];
- this.httpSaslAuthenticationEnabled = query(".httpSaslAuthenticationEnabled", node)[0];
- this.compressResponses = query(".compressResponses", node)[0];
- this.management = controller.management;
- }
-
- ManagementHttpUpdater.prototype.update = function(callback)
- {
- var that = this;
-
- function showBoolean(val)
- {
- return "<input type='checkbox' disabled='disabled' "+(val ? "checked='checked'": "")+" />" ;
- }
-
- this.management.load(this.modelObj)
- .then(function(data) {
- that.pluginData = data[0];
- that.httpBasicAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpBasicAuthenticationEnabled);
- that.httpsBasicAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpsBasicAuthenticationEnabled);
- that.httpsSaslAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpsSaslAuthenticationEnabled);
- that.httpSaslAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpSaslAuthenticationEnabled);
- that.compressResponses.innerHTML = showBoolean(that.pluginData.compressResponses);
- that.sessionTimeout.innerHTML = that.pluginData.sessionTimeout;
- if (callback)
- {
- callback();
- }
- },
- function(error)
- {
- util.tabErrorHandler(error, {updater:that,
- contentPane: that.contentPane,
- tabContainer: that.controller.tabContainer,
- name: that.modelObj.name,
- category: "Plugin HTTP Management"});
- });
+ function ManagementHttp(containerNode, pluginObject, controller, contentPane)
+ {
+ var node = construct.create("div", null, containerNode, "last");
+ var that = this;
+ this.name = pluginObject.name;
+ this.modelObj = pluginObject;
+ this.management = controller.management;
+ node.innerHTML = template;
+ parser.parse(node).then(function (instances)
+ {
+ that.managementHttpUpdater =
+ new ManagementHttpUpdater(node, pluginObject, controller, contentPane);
+ that.managementHttpUpdater.update(function ()
+ {
+ updater.add(that.managementHttpUpdater)
+ });
+
+ var editButton = query(".editPluginButton", node)[0];
+ connect.connect(registry.byNode(editButton), "onClick", function (evt)
+ {
+ that.edit();
+ });
+ });
+ }
+
+ ManagementHttp.prototype.close = function ()
+ {
+ updater.remove(this.managementHttpUpdater);
+ };
+
+ ManagementHttp.prototype.edit = function ()
+ {
+ editor.show(this.management, this.modelObj, this.managementHttpUpdater.pluginData);
+ };
+
+ function ManagementHttpUpdater(node, pluginObject, controller, contentPane)
+ {
+ this.contentPane = contentPane;
+ this.controller = controller;
+ this.modelObj = pluginObject;
+ this.name = pluginObject.name;
+ this.httpBasicAuthenticationEnabled = query(".httpBasicAuthenticationEnabled", node)[0];
+ this.httpsBasicAuthenticationEnabled = query(".httpsBasicAuthenticationEnabled", node)[0];
+ this.sessionTimeout = query(".sessionTimeout", node)[0];
+ this.httpsSaslAuthenticationEnabled = query(".httpsSaslAuthenticationEnabled", node)[0];
+ this.httpSaslAuthenticationEnabled = query(".httpSaslAuthenticationEnabled", node)[0];
+ this.compressResponses = query(".compressResponses", node)[0];
+ this.management = controller.management;
+ }
+
+ ManagementHttpUpdater.prototype.update = function (callback)
+ {
+ var that = this;
+
+ function showBoolean(val)
+ {
+ return "<input type='checkbox' disabled='disabled' " + (val ? "checked='checked'" : "") + " />";
+ }
+
+ this.management.load(this.modelObj)
+ .then(function (data)
+ {
+ that.pluginData = data[0];
+ that.httpBasicAuthenticationEnabled.innerHTML =
+ showBoolean(that.pluginData.httpBasicAuthenticationEnabled);
+ that.httpsBasicAuthenticationEnabled.innerHTML =
+ showBoolean(that.pluginData.httpsBasicAuthenticationEnabled);
+ that.httpsSaslAuthenticationEnabled.innerHTML =
+ showBoolean(that.pluginData.httpsSaslAuthenticationEnabled);
+ that.httpSaslAuthenticationEnabled.innerHTML =
+ showBoolean(that.pluginData.httpSaslAuthenticationEnabled);
+ that.compressResponses.innerHTML = showBoolean(that.pluginData.compressResponses);
+ that.sessionTimeout.innerHTML = that.pluginData.sessionTimeout;
+ if (callback)
+ {
+ callback();
+ }
+ }, function (error)
+ {
+ util.tabErrorHandler(error, {
+ updater: that,
+ contentPane: that.contentPane,
+ tabContainer: that.controller.tabContainer,
+ name: that.modelObj.name,
+ category: "Plugin HTTP Management"
+ });
+ });
- };
+ };
- return ManagementHttp;
- });
+ return ManagementHttp;
+ });
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org