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/04 12:20:49 UTC
svn commit: r1742258 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid:
common/ management/ management/accesscontrolprovider/
management/authenticationprovider/simpleldap/ management/group/
management/plugin/ manageme...
Author: lquack
Date: Wed May 4 12:20:48 2016
New Revision: 1742258
URL: http://svn.apache.org/viewvc?rev=1742258&view=rev
Log:
QPID-7211: [Java Broker, WMC] Use new request parameter to not transfer context variables
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/port/amqp/show.js
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js Wed May 4 12:20:48 2016
@@ -45,7 +45,7 @@ define(["dojo/domReady!"], function ()
},
getHelpUrl: function (callback)
{
- this.management.load({type: "broker"}, {depth: 1})
+ this.management.load({type: "broker"}, {depth: 0})
.then(function (data)
{
var broker = data[0];
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js Wed May 4 12:20:48 2016
@@ -26,9 +26,11 @@ define(["dojo/_base/xhr",
"dojo/dom-construct",
"dojo/dom-geometry",
"dojo/dom-style",
+ "dojo/Deferred",
"dojo/_base/window",
"dojo/query",
"dojo/parser",
+ "dojo/promise/all",
"dojo/store/Memory",
"dojo/window",
"dojo/on",
@@ -58,9 +60,11 @@ define(["dojo/_base/xhr",
dom,
geometry,
domStyle,
+ Deferred,
win,
query,
parser,
+ all,
Memory,
w,
on,
@@ -709,7 +713,7 @@ define(["dojo/_base/xhr",
type: category.toLowerCase(),
parent: {type: parentCategory.toLowerCase()}
};
- management.load(obj)
+ management.load(obj, {excludeInheritedContext: true})
.then(function (data)
{
var items = [];
@@ -821,39 +825,56 @@ define(["dojo/_base/xhr",
};
resize();
on(window, "resize", resize);
- }
-
- util.setContextData = function (contextUI, management, modelObj, actualData, effectiveData, callback)
- {
- management.load(modelObj, {
- actuals: true,
- inheritedActuals: true
- })
- .then(function (inheritedActuals)
- {
- contextUI.setData(actualData.context, effectiveData.context, inheritedActuals[0].context);
- if (callback)
- {
- callback();
- }
- }, util.xhrErrorHandler);
- }
+ };
- util.setToBrokerEffectiveContext = function (contextUI, management, callback)
+ var _loadData = function (promisesObject, callback)
{
- var brokerModelObj = {type: "broker"};
- management.load(brokerModelObj, {depth: 0})
- .then(function (effectiveData)
+ all(promisesObject)
+ .then(function (data)
{
- util.setContextData(contextUI, management, brokerModelObj, {}, effectiveData[0], function ()
- {
- if (callback)
- {
- callback();
- }
+ callback({
+ actual: data.actual[0],
+ inheritedActual: data.inheritedActual[0],
+ effective: data.effective[0]
});
});
- }
+ };
+
+ util.loadData = function (management, modelObj, callback, requestOptions)
+ {
+ var request = lang.mixin({depth: 0}, requestOptions);
+
+ var effectiveResponsePromise = management.load(modelObj, request);
+ var actualResponsePromise = management.load(modelObj, lang.mixin(lang.clone(request), {actuals: true}));
+ var inheritedActualResponsePromise = management.load(modelObj, lang.mixin(lang.clone(request), {
+ actuals: true,
+ excludeInheritedContext: false
+ }));
+ _loadData({
+ actual: actualResponsePromise,
+ inheritedActual: inheritedActualResponsePromise,
+ effective: effectiveResponsePromise
+ }, callback);
+ };
+
+ util.loadEffectiveAndInheritedActualData = function (management, modelObj, callback, requestOptions)
+ {
+ var request = lang.mixin({depth: 0}, requestOptions);
+
+ var effectiveResponsePromise = management.load(modelObj, request);
+ var inheritedActualResponsePromise = management.load(modelObj, lang.mixin(lang.clone(request), {
+ actuals: true,
+ excludeInheritedContext: false
+ }));
+ var deferred = new Deferred();
+ deferred.resolve([{}]);
+ var actualResponsePromise = deferred.promise;
+ _loadData({
+ actual: actualResponsePromise,
+ inheritedActual: inheritedActualResponsePromise,
+ effective: effectiveResponsePromise
+ }, callback);
+ };
util.initialiseFields = function (data, containerNode, metadata, category, type)
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js Wed May 4 12:20:48 2016
@@ -123,7 +123,7 @@ define(["dojo/parser",
var that = this;
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj, {excludeInheritedContext: true})
.then(function (data)
{
that.accessControlProviderData = data[0];
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js Wed May 4 12:20:48 2016
@@ -221,7 +221,11 @@ define(["dojo/parser",
AuthProviderUpdater.prototype.update = function (callback)
{
var that = this;
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj,
+ {
+ excludeInheritedContext: true,
+ depth: 1
+ })
.then(function (data)
{
that._update(data[0]);
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Wed May 4 12:20:48 2016
@@ -317,7 +317,11 @@ define(["dojo/parser",
this.brokerObj = brokerObj;
var that = this;
- this.management.load(brokerObj, {depth: 2})
+ this.management.load(brokerObj,
+ {
+ depth: 2,
+ excludeInheritedContext: true
+ })
.then(function (data)
{
that.brokerData = data[0];
@@ -901,7 +905,11 @@ define(["dojo/parser",
var that = this;
- this.management.load(this.brokerObj, {depth: 2})
+ this.management.load(this.brokerObj,
+ {
+ depth: 2,
+ excludeInheritedContext: true
+ })
.then(function (data)
{
that.brokerData = data[0];
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js Wed May 4 12:20:48 2016
@@ -47,7 +47,7 @@ define(["dojo/parser",
{
this.name = name;
this.controller = controller;
- this.management = controller.management
+ this.management = controller.management;
this.modelObj = {
type: "connection",
name: name,
@@ -101,7 +101,7 @@ define(["dojo/parser",
this.contentPane.onClose();
this.controller.tabContainer.removeChild(this.contentPane);
this.contentPane.destroyRecursive();
- }
+ };
function ConnectionUpdater(connectionTab)
{
@@ -225,7 +225,11 @@ define(["dojo/parser",
var that = this;
- that.management.load(this.modelObj)
+ that.management.load(this.modelObj,
+ {
+ excludeInheritedContext: true,
+ depth: 1
+ })
.then(function (data)
{
that.connectionData = data[0];
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js Wed May 4 12:20:48 2016
@@ -233,7 +233,7 @@ define(["dojo/_base/xhr",
var thisObj = this;
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj, {excludeInheritedContext: true})
.then(function (data)
{
thisObj.exchangeData = data[0];
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js Wed May 4 12:20:48 2016
@@ -204,7 +204,7 @@ define(["dojo/parser",
{
var that = this;
var management = this.controller.management;
- management.load(this.modelObj)
+ management.load(this.modelObj, {excludeInheritedContext: true})
.then(function (data)
{
that._update(data[0]);
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=1742258&r1=1742257&r2=1742258&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 Wed May 4 12:20:48 2016
@@ -76,7 +76,12 @@ define(["dojo/dom",
var node = registry.byNode(editKeyStoreButton);
connect.connect(node, "onClick", function (evt)
{
- management.load(that.modelObj, {actuals: true})
+ management.load(that.modelObj,
+ {
+ actuals: true,
+ excludeInheritedContext: true,
+ depth: 0
+ })
.then(function (data)
{
addStore.setupTypeStore(that.management, "KeyStore", that.modelObj);
@@ -128,7 +133,11 @@ define(["dojo/dom",
var that = this;
- this.management.load(that.modelObj)
+ this.management.load(that.modelObj,
+ {
+ excludeInheritedContext: true,
+ depth: 0
+ })
.then(function (data)
{
that.keyStoreData = data[0];
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=1742258&r1=1742257&r2=1742258&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 Wed May 4 12:20:48 2016
@@ -103,6 +103,7 @@ define(["dojo/parser",
{
that.management.load(that.modelObj, {
actuals: true,
+ excludeInheritedContext: true,
depth: 0
})
.then(function (data)
@@ -185,7 +186,11 @@ define(["dojo/parser",
parent: this.modelObj
};
var that = this;
- this.management.load(ruleModelObj, {actuals: true})
+ this.management.load(ruleModelObj,
+ {
+ actuals: true,
+ excludeInheritedContext: true
+ })
.then(function (data)
{
addLogInclusionRule.show(that.management, ruleModelObj, that.logInclusionRuleCategory, data[0]);
@@ -239,7 +244,11 @@ define(["dojo/parser",
Updater.prototype.update = function (callback)
{
var that = this;
- that.tabObject.management.load(this.modelObj)
+ that.tabObject.management.load(this.modelObj,
+ {
+ excludeInheritedContext: true,
+ depth: 1
+ })
.then(function (data)
{
that.loggerData = data[0] || {};
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js Wed May 4 12:20:48 2016
@@ -77,7 +77,7 @@ define(["dojo/parser",
var that = this;
- this.management.load(that.modelObj)
+ this.management.load(that.modelObj, {excludeInheritedContext: true})
.then(function (data)
{
that.pluginData = data[0];
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js Wed May 4 12:20:48 2016
@@ -107,7 +107,7 @@ define(["dojo/dom",
Port.prototype.showEditDialog = function ()
{
var that = this;
- this.management.load(that.modelObj.parent)
+ this.management.load(that.modelObj.parent, {excludeInheritedContext: true})
.then(function (data)
{
var brokerData = data[0];
@@ -249,7 +249,11 @@ define(["dojo/dom",
var thisObj = this;
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj,
+ {
+ excludeInheritedContext: true,
+ depth: 1
+ })
.then(function (data)
{
thisObj.portData = data[0] || {};
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js Wed May 4 12:20:48 2016
@@ -198,7 +198,7 @@ define(["dojo/parser",
PreferencesProvider.prototype.reload = function ()
{
var that = this;
- that.management.load(that.modelObj)
+ that.management.load(that.modelObj, {excludeInheritedContext: true})
.then(function (data)
{
var preferencesProviderData = data[0];
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js Wed May 4 12:20:48 2016
@@ -504,7 +504,10 @@ define(["dojo/_base/declare",
var thisObj = this;
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj, {
+ excludeInheritedContext: true,
+ depth: 1
+ })
.then(function (data)
{
var i, j;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js Wed May 4 12:20:48 2016
@@ -78,7 +78,11 @@ define(["dojo/dom",
var node = registry.byNode(editTrustStoreButton);
connect.connect(node, "onClick", function (evt)
{
- that.management.load(that.modelObj, {actuals: true})
+ that.management.load(that.modelObj,
+ {
+ actuals: true,
+ excludeInheritedContext: true
+ })
.then(function (data)
{
addStore.setupTypeStore(that.management, "TrustStore", that.modelObj);
@@ -131,7 +135,7 @@ define(["dojo/dom",
KeyStoreUpdater.prototype.update = function (callback)
{
var that = this;
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj, {excludeInheritedContext: true})
.then(function (data)
{
that.trustStoreData = data[0];
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js Wed May 4 12:20:48 2016
@@ -458,7 +458,11 @@ define(["dojo/parser",
{
var thisObj = this;
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj,
+ {
+ excludeInheritedContext: true,
+ depth: 1
+ })
.then(function (data)
{
thisObj.vhostData = data[0] || {
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js Wed May 4 12:20:48 2016
@@ -205,7 +205,11 @@ define(["dojo/parser",
Updater.prototype.update = function (callback)
{
var that = this;
- that.tabObject.management.load(this.modelObj)
+ that.tabObject.management.load(this.modelObj,
+ {
+ excludeInheritedContext: true,
+ depth: 1
+ })
.then(function (data)
{
that.nodeData = data[0] || {};
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js Wed May 4 12:20:48 2016
@@ -114,7 +114,7 @@ define(["dojo/_base/xhr",
{
var that = this;
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj, {excludeInheritedContext: true})
.then(function (data)
{
if (data[0])
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js Wed May 4 12:20:48 2016
@@ -126,37 +126,30 @@ define(["dojo/dom",
var that = this;
if (effectiveData)
{
- // editing
- management.load(modelObj, {actuals: true})
- .then(function (data)
- {
- var actualData = data[0];
- that.initialData = actualData;
- that.effectiveData = effectiveData;
- that.authenticationProviderType.set("value", actualData.type);
+ var contextCallback = function (data)
+ {
+ var actualData = data.actual;
+ var effectiveData = data.effective;
+ that.initialData = actualData;
+ that.effectiveData = effectiveData;
+ that.authenticationProviderType.set("value", actualData.type);
- that.authenticationProviderType.set("disabled", true);
- that.authenticationProviderName.set("disabled", true);
- if (actualData.preferencesproviders && actualData.preferencesproviders[0])
- {
- that.preferencesProviderForm.setData(actualData.preferencesproviders[0]);
- }
- else
- {
- that.preferencesProviderForm.reset();
- that.preferencesProviderForm.setPreferencesProviderName(actualData.name);
- }
- that.authenticationProviderName.set("value", actualData.name);
- util.setContextData(that.context,
- management,
- modelObj,
- actualData,
- effectiveData,
- function ()
- {
- that._show();
- });
- });
+ that.authenticationProviderType.set("disabled", true);
+ that.authenticationProviderName.set("disabled", true);
+ if (actualData.preferencesproviders && actualData.preferencesproviders[0])
+ {
+ that.preferencesProviderForm.setData(actualData.preferencesproviders[0]);
+ }
+ else
+ {
+ that.preferencesProviderForm.reset();
+ that.preferencesProviderForm.setPreferencesProviderName(actualData.name);
+ }
+ that.authenticationProviderName.set("value", actualData.name);
+ that.context.setData(actualData.context, effectiveData.context, data.inheritedActual.context);
+ that._show();
+ };
+ util.loadData(management, modelObj, contextCallback, {depth: 1});
}
else
{
@@ -165,10 +158,11 @@ define(["dojo/dom",
this.authenticationProviderName.set("disabled", false);
this.initialData = {};
this.effectiveData = {};
- util.setToBrokerEffectiveContext(this.context, management, function ()
+ util.loadEffectiveAndInheritedActualData(management, modelObj, function (data)
{
+ that.context.setData(data.actual.context, data.effective.context, data.inheritedActual.context);
that._show();
- });
+ }, {depth: 1});
}
},
_show: function ()
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js Wed May 4 12:20:48 2016
@@ -433,7 +433,11 @@ define(["dojo/_base/connect",
management.load({
type: "queue",
parent: obj.parent
- }, {depth: 0})
+ },
+ {
+ depth: 0,
+ excludeInheritedContext: true
+ })
.then(function (data)
{
var queues = [];
@@ -470,7 +474,11 @@ define(["dojo/_base/connect",
management.load({
type: "exchange",
parent: obj.parent
- }, {depth: 0})
+ },
+ {
+ depth: 0,
+ excludeInheritedContext: true
+ })
.then(function (data)
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js Wed May 4 12:20:48 2016
@@ -98,25 +98,20 @@ define(["dojo/dom",
{
this._destroyTypeFields(this.containerNode);
var that = this;
- management.load(modelObj, {
- actuals: true,
- depth: 0
- })
- .then(function (data)
- {
- var actualData = data[0];
- that.initialData = lang.clone(actualData);
- that._initFields(actualData);
-
- that.groupProviderName.set("disabled", true);
- that.groupProviderType.set("disabled", true);
- that.dialog.set("title", "Edit Group Provider - " + effectiveData.name);
+ util.loadData(management, modelObj, function (data)
+ {
+ var actualData = data.actual;
+ var effectiveData = data.effective;
+ var inheritedActualData = data.inheritedActual;
+ that.initialData = lang.clone(actualData);
+ that._initFields(actualData);
- util.setContextData(that.context, management, modelObj, actualData, effectiveData, function ()
- {
- that.dialog.show();
- });
- });
+ that.groupProviderName.set("disabled", true);
+ that.groupProviderType.set("disabled", true);
+ that.dialog.set("title", "Edit Group Provider - " + effectiveData.name);
+ that.context.setData(actualData.context, effectiveData.context, inheritedActualData.context);
+ that.dialog.show();
+ });
}
else
{
@@ -124,7 +119,13 @@ define(["dojo/dom",
this.groupProviderName.set("disabled", false);
this.groupProviderType.set("disabled", false);
this.dialog.set("title", "Add Group Provider");
- util.setToBrokerEffectiveContext(this.context, management, lang.hitch(this.dialog, this.dialog.show));
+ util.loadEffectiveAndInheritedActualData(management,
+ modelObj,
+ lang.hitch(this, function (data)
+ {
+ this.context.setData(data.actual.context, data.effective.context, data.inheritedActual.context);
+ this.dialog.show();
+ }));
}
},
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js Wed May 4 12:20:48 2016
@@ -454,10 +454,10 @@ define(["dojo/dom",
{
editWarning.style.display = "block";
- management.load(modelObj, {actuals: true})
- .then(function (data)
+ util.loadData(management, modelObj,
+ function (data)
{
- var port = data[0];
+ var port = data.actual;
nameWidget.set("value", port.name);
nameWidget.set("disabled", true);
@@ -573,7 +573,7 @@ define(["dojo/dom",
portType,
management.metadata);
- addPort._initContextEditorAndShowDialog(port);
+ addPort._initContextEditorAndShowDialog(data);
}, util.xhrErrorHandler);
}
@@ -599,35 +599,17 @@ define(["dojo/dom",
managedCertificateStoreWidget.set("value", undefined);
managedCertificateStoreWidget.initialValue = undefined;
- this._initContextEditorAndShowDialog();
- }
- };
-
- addPort._initContextEditorAndShowDialog = function (actualData)
- {
- this.initialData = actualData;
- if (actualData)
- {
- var modelObj = this.modelObj;
- this.management.load(modelObj)
- .then(function (effectiveData)
- {
- util.setContextData(addPort.context,
- addPort.management,
- modelObj,
- actualData,
- effectiveData[0],
- addPort._showDialog);
- });
- }
- else
- {
- util.setToBrokerEffectiveContext(addPort.context, addPort.management, addPort._showDialog);
+ util.loadEffectiveAndInheritedActualData(management, modelObj, function (data)
+ {
+ addPort._initContextEditorAndShowDialog(data)
+ });
}
};
- addPort._showDialog = function ()
+ addPort._initContextEditorAndShowDialog = function (data)
{
+ this.initialData = data.actual;
+ this.context.setData(data.actual.context, data.effective.context, data.inheritedActual.context);
var dialog = registry.byId("addPort");
dialog.show();
};
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js Wed May 4 12:20:48 2016
@@ -97,7 +97,11 @@ define(["dojo/_base/event",
if (modelObj.type == "preferencesprovider")
{
var that = this;
- management.load(modelObj, {actuals: true})
+ management.load(modelObj,
+ {
+ actuals: true,
+ excludeInheritedContext: true
+ })
.then(function (data)
{
that.preferencesProviderForm.setData(data[0]);
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js Wed May 4 12:20:48 2016
@@ -161,11 +161,10 @@ define(["dojo/dom",
this.context.placeAt(dom.byId("formAddQueue.context"));
}
- management.load(modelObj)
- .then(function (effectiveData)
- {
- util.setContextData(addQueue.context, management, modelObj, {}, effectiveData[0]);
- }, util.xhrErrorHandler);
+ util.loadEffectiveAndInheritedActualData(management, modelObj, function (data)
+ {
+ addQueue.context.setData(data.actual.context, data.effective.context, data.inheritedActual.context);
+ });
};
return addQueue;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js Wed May 4 12:20:48 2016
@@ -190,9 +190,9 @@ define(["dojo/_base/event",
var actuals = that.virtualHostContext.value;
for (var key in value)
{
- var val = value[key];
- if (!(key in actuals))
+ if (!actuals || !(key in actuals))
{
+ var val = value[key];
inherited[key] = val;
if (!(key in effective))
{
@@ -214,21 +214,15 @@ define(["dojo/_base/event",
}
var that = this;
- management.load({type: "broker"})
- .then(function (effectiveData)
- {
- util.setContextData(that.virtualHostNodeContext,
- management,
- {type: "broker"},
- {},
- effectiveData[0],
- function ()
- {
- that.virtualHostContext.setData({},
- that.virtualHostNodeContext.effectiveValues,
- that.virtualHostNodeContext.inheritedActualValues);
- });
- }, util.xhrErrorHandler);
+ util.loadEffectiveAndInheritedActualData(management, {type: "broker"}, function(data)
+ {
+ that.virtualHostNodeContext.setData({},
+ data.effective.context,
+ data.inheritedActual.context);
+ that.virtualHostContext.setData({},
+ data.effective.context,
+ data.inheritedActual.context);
+ });
this.dialog.show();
if (!this.resizeEventRegistered)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js Wed May 4 12:20:48 2016
@@ -42,7 +42,7 @@ define(["dojo/query",
type: "truststore",
parent: {type: "broker"}
};
- data.parent.management.load(obj)
+ data.parent.management.load(obj, {excludeInheritedContext: true})
.then(function (trustStores)
{
that._initTrustStores(trustStores, data.containerNode);
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js Wed May 4 12:20:48 2016
@@ -32,6 +32,7 @@ define(["dojox/html/entities",
"dojo/store/Memory",
"dojo/data/ObjectStore",
"qpid/common/util",
+ "dojo/promise/all",
"dojo/text!editBroker.html",
"qpid/common/ContextVariablesEditor",
"dijit/Dialog",
@@ -57,6 +58,7 @@ define(["dojox/html/entities",
Memory,
ObjectStore,
util,
+ all,
template)
{
var numericFieldNames = ["statisticsReportingPeriod",
@@ -98,7 +100,6 @@ define(["dojox/html/entities",
show: function (management, brokerData)
{
this.management = management;
- var that = this;
this.dialog.set("title", "Edit Broker - " + entities.encode(String(brokerData.name)));
var typeMetaData = management.metadata.getMetaData("Broker", "Broker");
var encrypters = typeMetaData.attributes.confidentialConfigurationEncryptionProvider.validValues;
@@ -119,12 +120,8 @@ define(["dojox/html/entities",
var encrypterControl = registry.byId("editBroker.confidentialConfigurationEncryptionProvider");
encrypterControl.set("store", encrytperTypesStore);
encrypterControl.set("value", undefined);
-
- management.load({type: "broker"}, {actuals: true})
- .then(function (data)
- {
- that._show(data[0], brokerData);
- });
+ var brokerModelObj = {type: "broker"};
+ util.loadData(management, brokerModelObj, lang.hitch(this, this._show));
},
destroy: function ()
{
@@ -168,15 +165,15 @@ define(["dojox/html/entities",
alert('Form contains invalid data. Please correct first');
}
},
- _show: function (actualData, effectiveData)
+ _show: function (data)
{
- this.initialData = actualData;
+ this.initialData = data.actual;
util.applyToWidgets(dom.byId("editBroker.allFields"),
"Broker",
"Broker",
- actualData,
+ data.actual,
this.management.metadata);
- util.setContextData(this.context, management, {type: "broker"}, actualData, effectiveData);
+ this.context.setData(data.actual.context, data.effective.context, data.inheritedActual.context);
// Add regexp to the numeric fields
for (var i = 0; i < numericFieldNames.length; i++)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js Wed May 4 12:20:48 2016
@@ -90,7 +90,6 @@ define(["dojox/html/entities",
},
show: function (management, modelObj)
{
- var that = this;
this.management = management;
this.modelObj = modelObj;
if (!this.context)
@@ -102,15 +101,7 @@ define(["dojox/html/entities",
this.context.placeAt(dom.byId("formEditQueue.context"));
}
this.dialog.set("title", "Edit Queue - " + entities.encode(String(modelObj.name)));
- management.load(modelObj, {actuals: true})
- .then(function (actualData)
- {
- management.load(modelObj)
- .then(function (effectiveData)
- {
- that._show(actualData[0], effectiveData[0]);
- }, util.xhrErrorHandler);
- });
+ util.loadData(management, modelObj, lang.hitch(this, this._show));
},
destroy: function ()
{
@@ -153,20 +144,19 @@ define(["dojox/html/entities",
alert('Form contains invalid data. Please correct first');
}
},
- _show: function (actualData, effectiveData)
+ _show: function (data)
{
-
- this.initialData = actualData;
+ this.initialData = data.actual;
this.form.reset();
var that = this;
util.applyToWidgets(that.allFieldsContainer,
"Queue",
- actualData.type,
- actualData,
+ data.actual.type,
+ data.actual,
this.management.metadata);
- util.setContextData(this.context, this.management, this.modelObj, actualData, effectiveData);
+ this.context.setData(data.actual.context, data.effective.context, data.inheritedActual.context);
// Add regexp to the numeric fields
for (var i = 0; i < numericFieldNames.length; i++)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js Wed May 4 12:20:48 2016
@@ -118,7 +118,6 @@ define(["dojox/html/entities",
{
this.management = management;
this.modelObj = modelObj;
- var that = this;
if (!this.context)
{
this.context = new qpid.common.ContextVariablesEditor({
@@ -129,16 +128,7 @@ define(["dojox/html/entities",
}
this.dialog.set("title", "Edit Virtual Host - " + entities.encode(String(modelObj.name)));
- management.load(modelObj, {actuals: true})
- .then(function (actualData)
- {
- management.load(modelObj)
- .then(function (effectiveData)
- {
- that._show(actualData[0], effectiveData[0]);
- }, util.xhrErrorHandler);
- });
-
+ util.loadData(management, modelObj, lang.hitch(this, this._show));
},
destroy: function ()
{
@@ -181,10 +171,9 @@ define(["dojox/html/entities",
alert('Form contains invalid data. Please correct first');
}
},
- _show: function (actualData, effectiveData)
+ _show: function (data)
{
-
- this.initialData = actualData;
+ this.initialData = data.actual;
for (var i = 0; i < fields.length; i++)
{
var fieldName = fields[i];
@@ -193,15 +182,15 @@ define(["dojox/html/entities",
if (widget instanceof dijit.form.CheckBox)
{
- widget.set("checked", actualData[fieldName]);
+ widget.set("checked", data.actual[fieldName]);
}
else
{
- widget.set("value", actualData[fieldName]);
+ widget.set("value", data.actual[fieldName]);
}
}
- util.setContextData(this.context, this.management, this.modelObj, actualData, effectiveData);
+ this.context.setData(data.actual.context, data.effective.context, data.inheritedActual.context);
// Add regexp to the numeric fields
for (var i = 0; i < numericFieldNames.length; i++)
@@ -218,7 +207,7 @@ define(["dojox/html/entities",
});
domConstruct.empty(this.typeFieldsContainer);
- require(["qpid/management/virtualhost/" + actualData.type.toLowerCase() + "/edit"], function (TypeUI)
+ require(["qpid/management/virtualhost/" + data.actual.type.toLowerCase() + "/edit"], function (TypeUI)
{
try
{
@@ -226,15 +215,15 @@ define(["dojox/html/entities",
TypeUI.show({
containerNode: that.typeFieldsContainer,
parent: that,
- data: actualData,
+ data: data.actual,
metadata: metadata
});
that.form.connectChildren();
util.applyToWidgets(that.allFieldsContainer,
"VirtualHost",
- actualData.type,
- actualData,
+ data.actual.type,
+ data.actual,
metadata);
}
catch (e)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js Wed May 4 12:20:48 2016
@@ -1,23 +1,3 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
define(["dojox/html/entities",
"dojo/_base/array",
"dojo/_base/event",
@@ -28,6 +8,7 @@ define(["dojox/html/entities",
"dijit/registry",
"dojo/parser",
'dojo/json',
+ "dojo/promise/all",
"dojo/query",
"dojo/store/Memory",
"dojo/data/ObjectStore",
@@ -53,6 +34,7 @@ define(["dojox/html/entities",
registry,
parser,
json,
+ all,
query,
Memory,
ObjectStore,
@@ -97,7 +79,6 @@ define(["dojox/html/entities",
{
this.management = management;
this.modelObj = modelObj;
- var that = this;
if (!this.context)
{
this.context = new qpid.common.ContextVariablesEditor({
@@ -107,11 +88,8 @@ define(["dojox/html/entities",
this.context.placeAt(dom.byId("editVirtualHostNode.context"));
}
this.dialog.set("title", "Edit Virtual Host Node - " + entities.encode(String(effectiveData.name)));
- management.load(modelObj, {actuals: true})
- .then(function (data)
- {
- that._show(data[0], effectiveData);
- });
+
+ util.loadData(management, modelObj, lang.hitch(this, this._show));
},
destroy: function ()
{
@@ -154,14 +132,14 @@ define(["dojox/html/entities",
alert('Form contains invalid data. Please correct first');
}
},
- _show: function (actualData, effectiveData)
+ _show: function (data)
{
- this.initialData = actualData;
- this.name.set("value", actualData.name);
+ this.initialData = data.actual;
+ this.name.set("value", data.actual.name);
var that = this;
- util.setContextData(this.context, this.management, this.modelObj, actualData, effectiveData);
+ this.context.setData(data.actual.context, data.effective.context, data.inheritedActual.context);
var widgets = registry.findWidgets(this.typeFieldsContainer);
array.forEach(widgets, function (item)
@@ -170,7 +148,7 @@ define(["dojox/html/entities",
});
domConstruct.empty(this.typeFieldsContainer);
- require(["qpid/management/virtualhostnode/" + actualData.type.toLowerCase() + "/edit"],
+ require(["qpid/management/virtualhostnode/" + data.actual.type.toLowerCase() + "/edit"],
function (TypeUI)
{
try
@@ -179,16 +157,16 @@ define(["dojox/html/entities",
TypeUI.show({
containerNode: that.typeFieldsContainer,
parent: that,
- data: actualData,
- effectiveData: effectiveData,
+ data: data.actual,
+ effectiveData: data.effective,
metadata: metadata
});
that.form.connectChildren();
util.applyToWidgets(that.allFieldsContainer,
"VirtualHostNode",
- actualData.type,
- actualData,
+ data.actual.type,
+ data.actual,
metadata);
}
catch (e)
@@ -214,3 +192,23 @@ define(["dojox/html/entities",
return virtualHostNodeEditor;
});
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js Wed May 4 12:20:48 2016
@@ -195,7 +195,7 @@ define(["dojo/parser",
var that = this;
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj, {excludeInheritedContext: true})
.then(function (data)
{
that.groupMemberData = data;
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=1742258&r1=1742257&r2=1742258&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 Wed May 4 12:20:48 2016
@@ -120,7 +120,11 @@ define(["dojo/dom",
management.load({
type: "queue",
parent: modelObj.parent
- }, {depth: 0})
+ },
+ {
+ depth: 0,
+ excludeInheritedContext: true
+ })
.then(function (data)
{
var queues = [];
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=1742258&r1=1742257&r2=1742258&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 Wed May 4 12:20:48 2016
@@ -112,7 +112,7 @@ define(["dojo/dom",
return "<input type='checkbox' disabled='disabled' " + (val ? "checked='checked'" : "") + " />";
}
- this.management.load(this.modelObj)
+ this.management.load(this.modelObj, {excludeInheritedContext: true})
.then(function (data)
{
that.pluginData = data[0];
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js Wed May 4 12:20:48 2016
@@ -76,7 +76,11 @@ define(["dojo/_base/event",
this.management = management;
this.modelObj = modelObj;
var that = this;
- management.load(modelObj, {actuals: true})
+ management.load(modelObj,
+ {
+ actuals: true,
+ excludeInheritedContext: true
+ })
.then(function (actualData)
{
that._show(actualData[0]);
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/port/amqp/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/port/amqp/show.js?rev=1742258&r1=1742257&r2=1742258&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/port/amqp/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/port/amqp/show.js Wed May 4 12:20:48 2016
@@ -106,6 +106,7 @@ define(["dojo/query",
};
that.management.load(aliasModelObj, {
actuals: true,
+ excludeInheritedContext: true,
depth: 0
})
.then(function (data)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org