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/05/02 17:57:54 UTC
svn commit: r1741993 [21/29] - 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/groupprovider/cloudfoundrydashboardmanagement/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js Mon May 2 15:57:52 2016
@@ -19,37 +19,36 @@
*
*/
define(["qpid/common/util", "dojo/query", "dojo/_base/lang", "dojox/html/entities", "dojo/domReady!"],
- function (util, query, lang, entities)
- {
- var fieldNames = ["cloudFoundryEndpointURI", "trustStore", "serviceToManagementGroupMapping"];
+ function (util, query, lang, entities)
+ {
+ var fieldNames = ["cloudFoundryEndpointURI", "trustStore", "serviceToManagementGroupMapping"];
- function GroupProvider(params)
- {
- this.containerNode = params.containerNode;
- util.buildUI(params.containerNode,
- params.parent,
- "groupprovider/cloudfoundrydashboardmanagement/show.html",
- fieldNames,
- this);
- }
+ function GroupProvider(params)
+ {
+ this.containerNode = params.containerNode;
+ util.buildUI(params.containerNode,
+ params.parent,
+ "groupprovider/cloudfoundrydashboardmanagement/show.html",
+ fieldNames,
+ this);
+ }
- GroupProvider.prototype.update = function (restData)
- {
- var data = restData || {};
- if (data.serviceToManagementGroupMapping)
- {
- var tableContent = "";
- for (var serviceInstanceId in data.serviceToManagementGroupMapping)
- {
- tableContent += "<tr><td>" + entities.encode(serviceInstanceId) + "</td><td>: "
- + entities.encode(data.serviceToManagementGroupMapping[serviceInstanceId])
- + "</td></tr>\n";
- }
- var table = query(".serviceToManagementGroupMappingTable", this.containerNode)[0];
- table.innerHTML = tableContent;
- }
- util.updateUI(data, fieldNames, this);
- }
+ GroupProvider.prototype.update = function (restData)
+ {
+ var data = restData || {};
+ if (data.serviceToManagementGroupMapping)
+ {
+ var tableContent = "";
+ for (var serviceInstanceId in data.serviceToManagementGroupMapping)
+ {
+ tableContent += "<tr><td>" + entities.encode(serviceInstanceId) + "</td><td>: " + entities.encode(
+ data.serviceToManagementGroupMapping[serviceInstanceId]) + "</td></tr>\n";
+ }
+ var table = query(".serviceToManagementGroupMappingTable", this.containerNode)[0];
+ table.innerHTML = tableContent;
+ }
+ util.updateUI(data, fieldNames, this);
+ }
- return GroupProvider;
- });
+ return GroupProvider;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js Mon May 2 15:57:52 2016
@@ -24,20 +24,20 @@ define(["dojo/dom",
"dijit/registry",
"qpid/common/util",
"dojo/text!groupprovider/groupfile/add.html"], function (dom, query, array, registry, util, template)
- {
+{
- return {
- show: function (data)
- {
- var that = this;
- util.parse(data.containerNode, template, function ()
- {
- if (data.data)
- {
- var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
- pathWidget.set("value", data.data.path);
- }
- });
- }
- };
- });
+ return {
+ show: function (data)
+ {
+ var that = this;
+ util.parse(data.containerNode, template, function ()
+ {
+ if (data.data)
+ {
+ var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
+ pathWidget.set("value", data.data.path);
+ }
+ });
+ }
+ };
+});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js?rev=1741993&r1=1741992&r2=1741993&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/FileBrowser.js Mon May 2 15:57:52 2016
@@ -29,159 +29,157 @@ define(["qpid/common/util",
"qpid/common/UpdatableStore",
"dijit/registry",
"dojo/domReady!"],
- function (util, query, number, lang, connect, entities, template, EnhancedGrid, UpdatableStore, registry)
- {
- function FileBrowser(params)
- {
- var that = this;
- this.management = params.management;
- this.modelObj = params.modelObj;
- util.parse(params.containerNode, template, function ()
- {
- that.postParse(params);
- });
- }
-
- FileBrowser.prototype.postParse = function (params)
- {
- var that = this;
- var gridProperties = {
- height: 400,
- selectionMode: "extended",
- plugins: {
- indirectSelection: true,
- pagination: {
- pageSizes: [10, 25, 50, 100],
- description: true,
- sizeSwitch: true,
- pageStepper: true,
- gotoButton: true,
- maxPageStep: 4,
- position: "bottom"
- }
- }
- };
-
- this.downloadButton = registry.byNode(query(".downloadButton", params.containerNode)[0]);
- this.downloadButton.on("click", function (e)
- {
- that.downloadSelectedFiles()
- });
-
- this.downloadAllButton = registry.byNode(query(".downloadAllButton", params.containerNode)[0]);
- this.downloadAllButton.on("click", function (e)
- {
- that.downloadAllFiles()
- });
-
- this.logFiles = this.addIdToFileObjects(params.data);
- this.logFileGrid = new UpdatableStore(this.logFiles, query(".logFilesGrid", params.containerNode)[0], [{
- name: "Name",
- field: "name",
- width: "40%"
- }, {
- name: "Size",
- field: "size",
- width: "20%",
- formatter: function (val)
- {
- return val > 1024 ? (val > 1048576 ? number.round(val / 1048576) + " MB" : number.round(val
- / 1024)
- + " KB") : val + " B";
- }
- }, {
- name: "Last Modified",
- field: "lastModified",
- width: "40%",
- formatter: function (val)
- {
- return that.management.userPreferences.formatDateTime(val,
- {
- addOffset: true,
- appendTimeZone: true
- });
- }
- }], function (obj)
- {
- obj.grid.on("rowDblClick", function (evt)
- {
- var idx = evt.rowIndex;
- var theItem = this.getItem(idx);
- that.download(theItem);
- });
- }, gridProperties, EnhancedGrid);
- }
-
- FileBrowser.prototype.download = function (item)
- {
- var parentModelObj = this.modelObj;
- var modelObj = {
- type: parentModelObj.type,
- name: "getFile",
- parent: parentModelObj
- }
- this.management.download(modelObj, {fileName: item.name});
- }
-
- FileBrowser.prototype.addIdToFileObjects = function (data)
- {
- var fileItems = [];
- var logFiles = data.logFiles;
- for (var idx in logFiles)
- {
- var item = lang.mixin(logFiles[idx], {id: logFiles[idx].name});
- fileItems.push(item);
- }
- return fileItems;
- }
-
- FileBrowser.prototype.downloadSelectedFiles = function ()
- {
- var data = this.logFileGrid.grid.selection.getSelected();
- this.downloadFiles(data);
- }
-
- FileBrowser.prototype.downloadAllFiles = function ()
- {
- var parentModelObj = this.modelObj;
- var modelObj = {
- type: parentModelObj.type,
- name: "getAllFiles",
- parent: parentModelObj
- }
- this.management.download(modelObj, {});
- }
-
- FileBrowser.prototype.downloadFiles = function (fileItems)
- {
- if (fileItems.length)
- {
- var parentModelObj = this.modelObj;
- var modelObj = {
- type: parentModelObj.type,
- name: "getFiles",
- parent: parentModelObj
- }
- var items = [];
- for (var i = 0; i < fileItems.length; i++)
- {
- items.push(fileItems[i].id);
- }
- this.management.download(modelObj, {fileName: items});
- }
- }
-
- FileBrowser.prototype.update = function (restData)
- {
- if (this.logFileGrid)
- {
- this.logFiles = this.addIdToFileObjects(restData);
- if (this.logFileGrid.update(this.logFiles))
- {
- //this.logFileGrid.grid._refresh();
- }
- }
- }
+ function (util, query, number, lang, connect, entities, template, EnhancedGrid, UpdatableStore, registry)
+ {
+ function FileBrowser(params)
+ {
+ var that = this;
+ this.management = params.management;
+ this.modelObj = params.modelObj;
+ util.parse(params.containerNode, template, function ()
+ {
+ that.postParse(params);
+ });
+ }
+
+ FileBrowser.prototype.postParse = function (params)
+ {
+ var that = this;
+ var gridProperties = {
+ height: 400,
+ selectionMode: "extended",
+ plugins: {
+ indirectSelection: true,
+ pagination: {
+ pageSizes: [10, 25, 50, 100],
+ description: true,
+ sizeSwitch: true,
+ pageStepper: true,
+ gotoButton: true,
+ maxPageStep: 4,
+ position: "bottom"
+ }
+ }
+ };
+
+ this.downloadButton = registry.byNode(query(".downloadButton", params.containerNode)[0]);
+ this.downloadButton.on("click", function (e)
+ {
+ that.downloadSelectedFiles()
+ });
+
+ this.downloadAllButton = registry.byNode(query(".downloadAllButton", params.containerNode)[0]);
+ this.downloadAllButton.on("click", function (e)
+ {
+ that.downloadAllFiles()
+ });
+
+ this.logFiles = this.addIdToFileObjects(params.data);
+ this.logFileGrid = new UpdatableStore(this.logFiles, query(".logFilesGrid", params.containerNode)[0], [{
+ name: "Name",
+ field: "name",
+ width: "40%"
+ }, {
+ name: "Size",
+ field: "size",
+ width: "20%",
+ formatter: function (val)
+ {
+ return val > 1024 ? (val > 1048576 ? number.round(val / 1048576) + " MB" : number.round(val / 1024)
+ + " KB") : val + " B";
+ }
+ }, {
+ name: "Last Modified",
+ field: "lastModified",
+ width: "40%",
+ formatter: function (val)
+ {
+ return that.management.userPreferences.formatDateTime(val, {
+ addOffset: true,
+ appendTimeZone: true
+ });
+ }
+ }], function (obj)
+ {
+ obj.grid.on("rowDblClick", function (evt)
+ {
+ var idx = evt.rowIndex;
+ var theItem = this.getItem(idx);
+ that.download(theItem);
+ });
+ }, gridProperties, EnhancedGrid);
+ }
+
+ FileBrowser.prototype.download = function (item)
+ {
+ var parentModelObj = this.modelObj;
+ var modelObj = {
+ type: parentModelObj.type,
+ name: "getFile",
+ parent: parentModelObj
+ }
+ this.management.download(modelObj, {fileName: item.name});
+ }
+
+ FileBrowser.prototype.addIdToFileObjects = function (data)
+ {
+ var fileItems = [];
+ var logFiles = data.logFiles;
+ for (var idx in logFiles)
+ {
+ var item = lang.mixin(logFiles[idx], {id: logFiles[idx].name});
+ fileItems.push(item);
+ }
+ return fileItems;
+ }
+
+ FileBrowser.prototype.downloadSelectedFiles = function ()
+ {
+ var data = this.logFileGrid.grid.selection.getSelected();
+ this.downloadFiles(data);
+ }
+
+ FileBrowser.prototype.downloadAllFiles = function ()
+ {
+ var parentModelObj = this.modelObj;
+ var modelObj = {
+ type: parentModelObj.type,
+ name: "getAllFiles",
+ parent: parentModelObj
+ }
+ this.management.download(modelObj, {});
+ }
+
+ FileBrowser.prototype.downloadFiles = function (fileItems)
+ {
+ if (fileItems.length)
+ {
+ var parentModelObj = this.modelObj;
+ var modelObj = {
+ type: parentModelObj.type,
+ name: "getFiles",
+ parent: parentModelObj
+ }
+ var items = [];
+ for (var i = 0; i < fileItems.length; i++)
+ {
+ items.push(fileItems[i].id);
+ }
+ this.management.download(modelObj, {fileName: items});
+ }
+ }
+
+ FileBrowser.prototype.update = function (restData)
+ {
+ if (this.logFileGrid)
+ {
+ this.logFiles = this.addIdToFileObjects(restData);
+ if (this.logFileGrid.update(this.logFiles))
+ {
+ //this.logFileGrid.grid._refresh();
+ }
+ }
+ }
- return FileBrowser;
- });
+ return FileBrowser;
+ });
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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -27,224 +27,218 @@ define(["dojo/_base/xhr",
"qpid/common/grid/UpdatableGrid",
"dojo/text!logger/memory/showLogViewer.html",
"dojo/domReady!"], function (xhr, parser, query, locale, registry, GridUpdater, UpdatableGrid, template)
- {
+{
- var defaulGridRowLimit = 4096;
- var currentTimeZone;
+ 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;
- }
-
- function LogViewer(loggerModelObj, management, containerNode)
- {
- var that = this;
- this.management = management;
- 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();
- });
- }
-
- 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 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)
- {
- maxId = item.id
- }
- }
- if (maxId != -1)
- {
- that.lastLogId = maxId
- }
- }
- },
- 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);
- }
- catch (err)
- {
- if (console && console.error)
- {
- console.error(err);
- }
- }
- };
-
- 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();
- }
- };
-
- LogViewer.prototype.close = function (data)
- {
- this.management.userPreferences.removeListener(this);
- }
+ function dataTransformer(data, userPreferences)
+ {
+ for (var i = 0; i < data.length; i++)
+ {
+ data[i].time = userPreferences.addTimeZoneOffsetToUTC(data[i].timestamp);
+ }
+ return data;
+ }
+
+ function LogViewer(loggerModelObj, management, containerNode)
+ {
+ var that = this;
+ this.management = management;
+ 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();
+ });
+ }
+
+ 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 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)
+ {
+ maxId = item.id
+ }
+ }
+ if (maxId != -1)
+ {
+ that.lastLogId = maxId
+ }
+ }
+ },
+ 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);
+ }
+ catch (err)
+ {
+ if (console && console.error)
+ {
+ console.error(err);
+ }
+ }
+ };
+
+ 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();
+ }
+ };
+
+ LogViewer.prototype.close = function (data)
+ {
+ this.management.userPreferences.removeListener(this);
+ }
- return LogViewer;
- });
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -19,15 +19,15 @@
*
*/
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);
- }
- };
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -25,14 +25,14 @@ define(["dojo/dom",
"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);
- }
- };
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -21,24 +21,24 @@ 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);
- }
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -26,23 +26,22 @@ define(["dojo/dom",
"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);
- });
- }
- };
- });
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -24,17 +24,17 @@ define(["qpid/common/util",
"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);
- }
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -26,14 +26,14 @@ define(["dojo/dom",
"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);
- }
- };
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -23,31 +23,31 @@ define(["qpid/common/util",
"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);
- }
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -26,12 +26,12 @@ define(["dojo/dom",
"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);
- }
- };
- });
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -25,20 +25,20 @@ define(["qpid/common/util",
"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);
- }
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -24,32 +24,31 @@ define(["qpid/common/util",
"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);
- }
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -26,14 +26,14 @@ define(["dojo/dom",
"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);
- }
- };
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -19,25 +19,25 @@
*
*/
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);
- }
+ 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/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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -26,14 +26,14 @@ define(["dojo/dom",
"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);
- }
- };
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -23,31 +23,31 @@ define(["qpid/common/util",
"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);
- }
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -24,16 +24,16 @@ define(["qpid/common/util",
"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);
- }
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -26,14 +26,14 @@ define(["dojo/dom",
"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);
- }
- };
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -19,25 +19,25 @@
*
*/
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);
- }
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -26,25 +26,24 @@ define(["dojo/dom",
"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);
- });
- }
- };
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -26,25 +26,24 @@ define(["dojo/dom",
"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);
- });
- }
- };
+{
+ 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=1741993&r1=1741992&r2=1741993&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 Mon May 2 15:57:52 2016
@@ -30,117 +30,131 @@ 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 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 moveMessages = {};
+ moveMessages.dialog.show();
- var node = construct.create("div", null, win.body(), "last");
+ }, util.xhrErrorHandler);
- 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);
+ };
- moveMessages.dialog.show();
-
- }, util.xhrErrorHandler);
-
- };
-
- return moveMessages;
- });
+ return moveMessages;
+ });
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org