Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js?rev=1741993&r1=1741992&r2=1741993&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js Mon May 2 15:57:52 2016 @@ -31,159 +31,157 @@ define(["dojo/dom", "qpid/management/addStore", "dojo/text!showStore.html", "dojo/domReady!"], - function (dom, parser, query, connect, registry, entities, properties, updater, util, formatter, addStore, template) - { + function (dom, parser, query, connect, registry, entities, properties, updater, util, formatter, addStore, template) + { - function KeyStore(name, parent, controller) - { - this.keyStoreName = name; - this.controller = controller; - this.management = controller.management; - this.modelObj = { - type: "keystore", - name: name, - parent: parent - }; - } - - KeyStore.prototype.getTitle = function () - { - return "KeyStore: " + this.keyStoreName; - }; - - KeyStore.prototype.open = function (contentPane) - { - var that = this; - this.contentPane = contentPane; - contentPane.containerNode.innerHTML = template; - parser.parse(contentPane.containerNode).then(function (instances) - { - that.keyStoreUpdater = new KeyStoreUpdater(that); - that.keyStoreUpdater.update(function () - { - updater.add(that.keyStoreUpdater); - }); - - var deleteKeyStoreButton = query(".deleteStoreButton", - contentPane.containerNode)[0]; - var node = registry.byNode(deleteKeyStoreButton); - connect.connect(node, "onClick", function (evt) - { - that.deleteKeyStore(); - }); - - var editKeyStoreButton = query(".editStoreButton", - contentPane.containerNode)[0]; - var node = registry.byNode(editKeyStoreButton); - connect.connect(node, "onClick", function (evt) - { - management.load(that.modelObj, {actuals: true}) - .then(function (data) - { - addStore.setupTypeStore(that.management, - "KeyStore", - that.modelObj); - addStore.show(data[0]); - }, util.xhrErrorHandler); - }); - }); - - }; - - KeyStore.prototype.close = function () - { - updater.remove(this.keyStoreUpdater); - }; - - function KeyStoreUpdater(tabObject) - { - var containerNode = tabObject.contentPane.containerNode; - var that = this; - this.keyStoreDetailsContainer = query(".typeFieldsContainer", containerNode)[0]; - this.management = tabObject.controller.management; - this.modelObj = tabObject.modelObj; - this.tabObject = tabObject - function findNode(name) - { - return query("." + name, containerNode)[0]; - } - - function storeNodes(names) - { - for (var i = 0; i < names.length; i++) - { - that[names[i]] = findNode(names[i]); - } - } - - storeNodes(["name", "type", "state"]); - } - - KeyStoreUpdater.prototype.updateHeader = function () - { - this.name.innerHTML = entities.encode(String(this.keyStoreData["name"])); - this.type.innerHTML = entities.encode(String(this.keyStoreData["type"])); - this.state.innerHTML = entities.encode(String(this.keyStoreData["state"])); - }; - - KeyStoreUpdater.prototype.update = function (callback) - { - - var that = this; - - this.management.load(that.modelObj).then(function (data) - { - that.keyStoreData = data[0]; - that.updateHeader(); - - if (callback) - { - callback(); - } - - if (that.details) - { - that.details.update(that.keyStoreData); - } - else - { - require(["qpid/management/store/" + encodeURIComponent( - that.keyStoreData.type.toLowerCase()) + "/show"], - function (DetailsUI) - { - that.details = new DetailsUI({ - containerNode: that.keyStoreDetailsContainer, - parent: that - }); - that.details.update(that.keyStoreData); - }); - } - }, function (error) - { - util.tabErrorHandler(error, { - updater: that, - contentPane: that.tabObject.contentPane, - tabContainer: that.tabObject.controller.tabContainer, - name: that.modelObj.name, - category: "Key Store" - }); - }); - }; - - KeyStore.prototype.deleteKeyStore = function () - { - if (confirm("Are you sure you want to delete key store '" + this.keyStoreName + "'?")) - { - var that = this; - this.management.remove(this.modelObj).then(function (data) - { - that.contentPane.onClose() - that.controller.tabContainer.removeChild(that.contentPane); - that.contentPane.destroyRecursive(); - that.close(); - }, util.xhrErrorHandler); - } - } + function KeyStore(name, parent, controller) + { + this.keyStoreName = name; + this.controller = controller; + this.management = controller.management; + this.modelObj = { + type: "keystore", + name: name, + parent: parent + }; + } + + KeyStore.prototype.getTitle = function () + { + return "KeyStore: " + this.keyStoreName; + }; + + KeyStore.prototype.open = function (contentPane) + { + var that = this; + this.contentPane = contentPane; + contentPane.containerNode.innerHTML = template; + parser.parse(contentPane.containerNode) + .then(function (instances) + { + that.keyStoreUpdater = new KeyStoreUpdater(that); + that.keyStoreUpdater.update(function () + { + updater.add(that.keyStoreUpdater); + }); + + var deleteKeyStoreButton = query(".deleteStoreButton", contentPane.containerNode)[0]; + var node = registry.byNode(deleteKeyStoreButton); + connect.connect(node, "onClick", function (evt) + { + that.deleteKeyStore(); + }); + + var editKeyStoreButton = query(".editStoreButton", contentPane.containerNode)[0]; + var node = registry.byNode(editKeyStoreButton); + connect.connect(node, "onClick", function (evt) + { + management.load(that.modelObj, {actuals: true}) + .then(function (data) + { + addStore.setupTypeStore(that.management, "KeyStore", that.modelObj); + addStore.show(data[0]); + }, util.xhrErrorHandler); + }); + }); + + }; + + KeyStore.prototype.close = function () + { + updater.remove(this.keyStoreUpdater); + }; + + function KeyStoreUpdater(tabObject) + { + var containerNode = tabObject.contentPane.containerNode; + var that = this; + this.keyStoreDetailsContainer = query(".typeFieldsContainer", containerNode)[0]; + this.management = tabObject.controller.management; + this.modelObj = tabObject.modelObj; + this.tabObject = tabObject + function findNode(name) + { + return query("." + name, containerNode)[0]; + } + + function storeNodes(names) + { + for (var i = 0; i < names.length; i++) + { + that[names[i]] = findNode(names[i]); + } + } + + storeNodes(["name", "type", "state"]); + } + + KeyStoreUpdater.prototype.updateHeader = function () + { + this.name.innerHTML = entities.encode(String(this.keyStoreData["name"])); + this.type.innerHTML = entities.encode(String(this.keyStoreData["type"])); + this.state.innerHTML = entities.encode(String(this.keyStoreData["state"])); + }; + + KeyStoreUpdater.prototype.update = function (callback) + { + + var that = this; + + this.management.load(that.modelObj) + .then(function (data) + { + that.keyStoreData = data[0]; + that.updateHeader(); + + if (callback) + { + callback(); + } + + if (that.details) + { + that.details.update(that.keyStoreData); + } + else + { + require(["qpid/management/store/" + encodeURIComponent(that.keyStoreData.type.toLowerCase()) + + "/show"], function (DetailsUI) + { + that.details = new DetailsUI({ + containerNode: that.keyStoreDetailsContainer, + parent: that + }); + that.details.update(that.keyStoreData); + }); + } + }, function (error) + { + util.tabErrorHandler(error, { + updater: that, + contentPane: that.tabObject.contentPane, + tabContainer: that.tabObject.controller.tabContainer, + name: that.modelObj.name, + category: "Key Store" + }); + }); + }; + + KeyStore.prototype.deleteKeyStore = function () + { + if (confirm("Are you sure you want to delete key store '" + this.keyStoreName + "'?")) + { + var that = this; + this.management.remove(this.modelObj) + .then(function (data) + { + that.contentPane.onClose() + that.controller.tabContainer.removeChild(that.contentPane); + that.contentPane.destroyRecursive(); + that.close(); + }, util.xhrErrorHandler); + } + } - return KeyStore; - }); + return KeyStore; + });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js?rev=1741993&r1=1741992&r2=1741993&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js Mon May 2 15:57:52 2016 @@ -33,270 +33,276 @@ define(["dojo/parser", "qpid/management/addLogger", "qpid/management/addLogInclusionRule", "dojo/domReady!"], - function (parser, query, connect, registry, entities, properties, updater, util, formatter, UpdatableStore, EnhancedGrid, template, addLogger, addLogInclusionRule) - { + function (parser, + query, + connect, + registry, + entities, + properties, + updater, + util, + formatter, + UpdatableStore, + EnhancedGrid, + template, + addLogger, + addLogInclusionRule) + { + + function Logger(name, parent, controller) + { + this.name = name; + this.controller = controller; + this.management = controller.management; + var isBrokerParent = parent.type == "broker"; + this.category = isBrokerParent ? "BrokerLogger" : "VirtualHostLogger"; + this.logInclusionRuleCategory = isBrokerParent ? "BrokerLogInclusionRule" : "VirtualHostLogInclusionRule"; + this.modelObj = { + type: this.category.toLowerCase(), + name: name, + parent: parent + }; + this.userFriendlyName = (isBrokerParent ? "Broker Logger" : "Virtual Host Logger"); + } + + Logger.prototype.getTitle = function () + { + return this.userFriendlyName + ": " + this.name; + }; + + Logger.prototype.open = function (contentPane) + { + var that = this; + this.contentPane = contentPane; + contentPane.containerNode.innerHTML = template; + parser.parse(contentPane.containerNode) + .then(function (instances) + { + that.onOpen(contentPane.containerNode) + }); + + }; + + Logger.prototype.onOpen = function (containerNode) + { + var that = this; + this.editLoggerButton = registry.byNode(query(".editLoggerButton", containerNode)[0]); + this.deleteLoggerButton = registry.byNode(query(".deleteLoggerButton", containerNode)[0]); + this.deleteLoggerButton.on("click", function (e) + { + if (confirm("Are you sure you want to delete logger '" + entities.encode(String(that.name)) + "'?")) + { + that.management.remove(that.modelObj) + .then(function (x) + { + that.destroy(); + }, util.xhrErrorHandler); + } + }); + this.editLoggerButton.on("click", function (event) + { + that.management.load(that.modelObj, { + actuals: true, + depth: 0 + }) + .then(function (data) + { + addLogger.show(that.management, that.modelObj, that.category, data[0]); + }); + }); + + var gridProperties = { + selectionMode: "extended", + plugins: { + indirectSelection: true + } + }; + + this.logInclusionRuleGrid = new UpdatableStore([], query(".logInclusionRuleGrid", containerNode)[0], [{ + name: "Rule Name", + field: "name", + width: "20%" + }, { + name: "Type", + field: "type", + width: "20%" + }, { + name: "Logger Name", + field: "loggerName", + width: "30%" + }, { + name: "Level", + field: "level", + width: "20%" + }, { + name: "Durable", + field: "durable", + width: "10%", + formatter: util.buildCheckboxMarkup + }], function (obj) + { + connect.connect(obj.grid, "onRowDblClick", obj.grid, function (evt) + { + var idx = evt.rowIndex; + var theItem = this.getItem(idx); + that.showLogInclusionRule(theItem); + }); + }, gridProperties, EnhancedGrid); + + this.addLogInclusionRuleButton = registry.byNode(query(".addLogInclusionRuleButton", containerNode)[0]); + this.deleteLogInclusionRuleButton = + registry.byNode(query(".deleteLogInclusionRuleButton", containerNode)[0]); + + this.deleteLogInclusionRuleButton.on("click", function (e) + { + util.deleteSelectedObjects(that.logInclusionRuleGrid.grid, + "Are you sure you want to delete log inclusion rule", + that.management, + { + type: that.logInclusionRuleCategory.toLowerCase(), + parent: that.modelObj + }, + that.loggerUpdater); + }); + + this.addLogInclusionRuleButton.on("click", function (e) + { + addLogInclusionRule.show(that.management, that.modelObj, that.logInclusionRuleCategory); + }); + + this.loggerUpdater = new Updater(this); + this.loggerUpdater.update(function (x) + { + updater.add(that.loggerUpdater); + }); + }; + + Logger.prototype.showLogInclusionRule = function (item) + { + var ruleModelObj = { + name: item.name, + type: this.logInclusionRuleCategory.toLowerCase(), + parent: this.modelObj + }; + var that = this; + this.management.load(ruleModelObj, {actuals: true}) + .then(function (data) + { + addLogInclusionRule.show(that.management, ruleModelObj, that.logInclusionRuleCategory, data[0]); + }); + }; + + Logger.prototype.close = function () + { + updater.remove(this.loggerUpdater); + }; + + Logger.prototype.destroy = function () + { + this.close(); + this.contentPane.onClose(); + this.controller.tabContainer.removeChild(this.contentPane); + this.contentPane.destroyRecursive(); + }; + + function Updater(logger) + { + var domNode = logger.contentPane.containerNode; + this.tabObject = logger; + this.modelObj = logger.modelObj; + var that = this; + + function findNode(name) + { + return query("." + name, domNode)[0]; + } + + function storeNodes(names) + { + for (var i = 0; i < names.length; i++) + { + that[names[i]] = findNode(names[i]); + } + } + + storeNodes(["name", + "state", + "type", + "loggerAttributes", + "loggerTypeSpecificDetails", + "logInclusionRuleWarning", + "durable", + "errorCount", + "warnCount"]); + } + + Updater.prototype.update = function (callback) + { + var that = this; + that.tabObject.management.load(this.modelObj) + .then(function (data) + { + that.loggerData = data[0] || {}; + that.updateUI(that.loggerData); + + if (callback) + { + callback(); + } + }, function (error) + { + util.tabErrorHandler(error, { + updater: that, + contentPane: that.tabObject.contentPane, + tabContainer: that.tabObject.controller.tabContainer, + name: that.modelObj.name, + category: that.tabObject.userFriendlyName + }); + }); + }; + + Updater.prototype.updateUI = function (data) + { + this.name.innerHTML = entities.encode(String(data["name"])); + this.state.innerHTML = entities.encode(String(data["state"])); + this.type.innerHTML = entities.encode(String(data["type"])); + this.durable.innerHTML = util.buildCheckboxMarkup(data["durable"]); + this.errorCount.innerHTML = String(data["statistics"]["errorCount"]); + this.warnCount.innerHTML = String(data["statistics"]["warnCount"]); + + if (!this.details) + { + var that = this; + require(["qpid/management/logger/" + this.tabObject.modelObj.type + "/show"], function (Details) + { + that.details = new Details({ + containerNode: that.loggerAttributes, + typeSpecificDetailsNode: that.loggerTypeSpecificDetails, + metadata: that.tabObject.management.metadata, + data: data, + management: that.tabObject.management, + modelObj: that.tabObject.modelObj + }); + }); + } + else + { + this.details.update(data); + } + + var ruleFieldName = this.tabObject.logInclusionRuleCategory.toLowerCase() + "s"; // add plural "s" + if (data[ruleFieldName]) + { + this.tabObject.logInclusionRuleGrid.grid.domNode.style.display = "block"; + this.logInclusionRuleWarning.style.display = "none"; + } + else + { + this.tabObject.logInclusionRuleGrid.grid.domNode.style.display = "none"; + this.logInclusionRuleWarning.style.display = "block"; + } + util.updateUpdatableStore(this.tabObject.logInclusionRuleGrid, data[ruleFieldName]); + }; - function Logger(name, parent, controller) - { - this.name = name; - this.controller = controller; - this.management = controller.management; - var isBrokerParent = parent.type == "broker"; - this.category = isBrokerParent ? "BrokerLogger" : "VirtualHostLogger"; - this.logInclusionRuleCategory = - isBrokerParent ? "BrokerLogInclusionRule" : "VirtualHostLogInclusionRule"; - this.modelObj = { - type: this.category.toLowerCase(), - name: name, - parent: parent - }; - this.userFriendlyName = (isBrokerParent ? "Broker Logger" : "Virtual Host Logger"); - } - - Logger.prototype.getTitle = function () - { - return this.userFriendlyName + ": " + this.name; - }; - - Logger.prototype.open = function (contentPane) - { - var that = this; - this.contentPane = contentPane; - contentPane.containerNode.innerHTML = template; - parser.parse(contentPane.containerNode).then(function (instances) - { - that.onOpen(contentPane.containerNode) - }); - - }; - - Logger.prototype.onOpen = function (containerNode) - { - var that = this; - this.editLoggerButton = registry.byNode(query(".editLoggerButton", containerNode)[0]); - this.deleteLoggerButton = registry.byNode(query(".deleteLoggerButton", containerNode)[0]); - this.deleteLoggerButton.on("click", function (e) - { - if (confirm("Are you sure you want to delete logger '" + entities.encode(String(that.name)) + "'?")) - { - that.management.remove(that.modelObj).then(function (x) - { - that.destroy(); - }, util.xhrErrorHandler); - } - }); - this.editLoggerButton.on("click", function (event) - { - that.management.load(that.modelObj, - { - actuals: true, - depth: 0 - }).then(function (data) - { - addLogger.show(that.management, - that.modelObj, - that.category, - data[0]); - }); - }); - - var gridProperties = { - selectionMode: "extended", - plugins: { - indirectSelection: true - } - }; - - this.logInclusionRuleGrid = new UpdatableStore([], query(".logInclusionRuleGrid", containerNode)[0], [{ - name: "Rule Name", - field: "name", - width: "20%" - }, - { - name: "Type", - field: "type", - width: "20%" - }, - { - name: "Logger Name", - field: "loggerName", - width: "30%" - }, - { - name: "Level", - field: "level", - width: "20%" - }, - { - name: "Durable", - field: "durable", - width: "10%", - formatter: util.buildCheckboxMarkup - }], function (obj) - { - connect.connect(obj.grid, "onRowDblClick", obj.grid, function (evt) - { - var idx = evt.rowIndex; - var theItem = this.getItem(idx); - that.showLogInclusionRule(theItem); - }); - }, gridProperties, EnhancedGrid); - - this.addLogInclusionRuleButton = registry.byNode(query(".addLogInclusionRuleButton", containerNode)[0]); - this.deleteLogInclusionRuleButton = - registry.byNode(query(".deleteLogInclusionRuleButton", containerNode)[0]); - - this.deleteLogInclusionRuleButton.on("click", function (e) - { - util.deleteSelectedObjects(that.logInclusionRuleGrid.grid, - "Are you sure you want to delete log inclusion rule", - that.management, - { - type: that.logInclusionRuleCategory.toLowerCase(), - parent: that.modelObj - }, - that.loggerUpdater); - }); - - this.addLogInclusionRuleButton.on("click", function (e) - { - addLogInclusionRule.show(that.management, that.modelObj, that.logInclusionRuleCategory); - }); - - this.loggerUpdater = new Updater(this); - this.loggerUpdater.update(function (x) - { - updater.add(that.loggerUpdater); - }); - }; - - Logger.prototype.showLogInclusionRule = function (item) - { - var ruleModelObj = { - name: item.name, - type: this.logInclusionRuleCategory.toLowerCase(), - parent: this.modelObj - }; - var that = this; - this.management.load(ruleModelObj, {actuals: true}).then(function (data) - { - addLogInclusionRule.show(that.management, - ruleModelObj, - that.logInclusionRuleCategory, - data[0]); - }); - }; - - Logger.prototype.close = function () - { - updater.remove(this.loggerUpdater); - }; - - Logger.prototype.destroy = function () - { - this.close(); - this.contentPane.onClose(); - this.controller.tabContainer.removeChild(this.contentPane); - this.contentPane.destroyRecursive(); - }; - - function Updater(logger) - { - var domNode = logger.contentPane.containerNode; - this.tabObject = logger; - this.modelObj = logger.modelObj; - var that = this; - - function findNode(name) - { - return query("." + name, domNode)[0]; - } - - function storeNodes(names) - { - for (var i = 0; i < names.length; i++) - { - that[names[i]] = findNode(names[i]); - } - } - - storeNodes(["name", - "state", - "type", - "loggerAttributes", - "loggerTypeSpecificDetails", - "logInclusionRuleWarning", - "durable", - "errorCount", - "warnCount"]); - } - - Updater.prototype.update = function (callback) - { - var that = this; - that.tabObject.management.load(this.modelObj).then(function (data) - { - that.loggerData = data[0] || {}; - that.updateUI(that.loggerData); - - if (callback) - { - callback(); - } - }, function (error) - { - util.tabErrorHandler(error, { - updater: that, - contentPane: that.tabObject.contentPane, - tabContainer: that.tabObject.controller.tabContainer, - name: that.modelObj.name, - category: that.tabObject.userFriendlyName - }); - }); - }; - - Updater.prototype.updateUI = function (data) - { - this.name.innerHTML = entities.encode(String(data["name"])); - this.state.innerHTML = entities.encode(String(data["state"])); - this.type.innerHTML = entities.encode(String(data["type"])); - this.durable.innerHTML = util.buildCheckboxMarkup(data["durable"]); - this.errorCount.innerHTML = String(data["statistics"]["errorCount"]); - this.warnCount.innerHTML = String(data["statistics"]["warnCount"]); - - if (!this.details) - { - var that = this; - require(["qpid/management/logger/" + this.tabObject.modelObj.type + "/show"], function (Details) - { - that.details = new Details({ - containerNode: that.loggerAttributes, - typeSpecificDetailsNode: that.loggerTypeSpecificDetails, - metadata: that.tabObject.management.metadata, - data: data, - management: that.tabObject.management, - modelObj: that.tabObject.modelObj - }); - }); - } - else - { - this.details.update(data); - } - - var ruleFieldName = this.tabObject.logInclusionRuleCategory.toLowerCase() + "s"; // add plural "s" - if (data[ruleFieldName]) - { - this.tabObject.logInclusionRuleGrid.grid.domNode.style.display = "block"; - this.logInclusionRuleWarning.style.display = "none"; - } - else - { - this.tabObject.logInclusionRuleGrid.grid.domNode.style.display = "none"; - this.logInclusionRuleWarning.style.display = "block"; - } - util.updateUpdatableStore(this.tabObject.logInclusionRuleGrid, data[ruleFieldName]); - }; - - return Logger; - }); + return Logger; + }); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
