Author: lquack
Date: Wed May 4 13:29:06 2016
New Revision: 1742280
URL: http://svn.apache.org/viewvc?rev=1742280&view=rev
Log:
QPID-7211: [Java Broker, WMC] Use new request parameter to not transfer context
variables
applied changes from trunk@1742258 manually due to JavaScript code style
formating changes
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
Wed May 4 13:29:06 2016
@@ -41,7 +41,7 @@ define(["dojo/domReady!"], function () {
},
getHelpUrl: function(callback)
{
- this.management.load({type: "broker"}, {depth: 1}).then(
+ this.management.load({type: "broker"}, {depth: 0}).then(
function(data) {
var broker = data[0];
if ("context" in broker && "qpid.helpURL" in broker["context"] )
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Wed May 4 13:29:06 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",
@@ -51,7 +53,7 @@ define(["dojo/_base/xhr",
"dojox/validate/web",
"dojo/domReady!"
],
- function (xhr, array, event, lang, json, dom, geometry, domStyle, win,
query, parser, Memory, w, on, entities, widgetconfigurer, registry,
WarningPane, updater) {
+ function (xhr, array, event, lang, json, dom, geometry, domStyle,
Deferred, win, query, parser, all, Memory, w, on, entities, widgetconfigurer,
registry, WarningPane, updater) {
var util = {};
if (Array.isArray) {
util.isArray = function (object) {
@@ -727,18 +729,54 @@ define(["dojo/_base/xhr",
on(window, "resize", resize);
}
- util.setContextData = function(contextUI, management, modelObj,
actualData, effectiveData, callback )
+ var _loadData = function (promisesObject, 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);
- }
+ all(promisesObject)
+ .then(function (data)
+ {
+ 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.abortReaderSafely = function(reader)
{
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
Wed May 4 13:29:06 2016
@@ -100,7 +100,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/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
Wed May 4 13:29:06 2016
@@ -187,7 +187,7 @@ define(["dojo/parser",
AuthProviderUpdater.prototype.update = function(callback)
{
var that = this;
- this.management.load(this.modelObj).then(
+ this.management.load(this.modelObj, {depth: 1,
excludeInheritedContext: true}).then(
function(data)
{
that._update(data[0]);
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Wed May 4 13:29:06 2016
@@ -266,7 +266,7 @@ 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];
@@ -683,7 +683,7 @@ define(["dojo/parser",
var that = this;
- this.management.load(this.brokerObj,
{depth:2}).then(function(data)
+ this.management.load(this.brokerObj, {depth:2,
excludeInheritedContext: true}).then(function(data)
{
that.brokerData = data[0];
util.flattenStatistics( that.brokerData );
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
Wed May 4 13:29:06 2016
@@ -35,7 +35,7 @@ define(["dojo/parser",
function Connection(name, parent, controller) {
this.name = name;
this.controller = controller;
- this.management = controller.management
+ this.management = controller.management;
this.modelObj = { type: "connection", name: name, parent:
parent };
}
@@ -76,7 +76,7 @@ define(["dojo/parser",
this.contentPane.onClose();
this.controller.tabContainer.removeChild(this.contentPane);
this.contentPane.destroyRecursive();
- }
+ };
function ConnectionUpdater(connectionTab)
{
@@ -175,7 +175,7 @@ define(["dojo/parser",
var that = this;
- that.management.load(this.modelObj).then(function(data)
+ that.management.load(this.modelObj, {depth: 1,
excludeInheritedContext: true}).then(function(data)
{
that.connectionData = data[0];
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
Wed May 4 13:29:06 2016
@@ -197,7 +197,7 @@ define(["dojo/_base/xhr",
var thisObj = this;
- this.management.load(this.modelObj).then(function(data)
+ this.management.load(this.modelObj, {excludeInheritedContext:
true}).then(function(data)
{
thisObj.exchangeData = data[0];
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
Wed May 4 13:29:06 2016
@@ -134,7 +134,7 @@ define(["dojo/parser",
GroupProvider.prototype.editGroupProvider = function()
{
var management = this.controller.management;
- management.load(this.modelObj,{ actuals: true }).then(
+ management.load(this.modelObj,{ actuals: true, depth: 0,
excludeInheritedContext: true }).then(
function(actualData)
{
addGroupProvider.show(management, that.modelObj,
actualData[0]);
@@ -170,7 +170,7 @@ define(["dojo/parser",
{
var that = this;
var management = this.controller.management;
- management.load(this.modelObj).then(
+ management.load(this.modelObj, {excludeInheritedContext:
true}).then(
function(data)
{
that._update(data[0]);
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
Wed May 4 13:29:06 2016
@@ -65,7 +65,7 @@ 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, depth: 0, excludeInheritedContext: true })
.then(function(data)
{
addStore.setupTypeStore(that.management,
"KeyStore", that.modelObj);
@@ -117,7 +117,7 @@ define(["dojo/dom",
var that = this;
- this.management.load(that.modelObj).then(function(data)
+ this.management.load(that.modelObj, {depth: 0,
excludeInheritedContext: true}).then(function(data)
{
that.keyStoreData = data[0];
that.updateHeader();
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
Wed May 4 13:29:06 2016
@@ -86,7 +86,7 @@ define(["dojo/parser",
this.editLoggerButton.on("click",
function (event)
{
- that.management.load(that.modelObj, {actuals: true, depth: 0}).then(
+ that.management.load(that.modelObj, {actuals: true, depth: 0,
excludeInheritedContext: true}).then(
function(data)
{
addLogger.show(that.management, that.modelObj, that.category,
data[0]);
@@ -153,7 +153,7 @@ define(["dojo/parser",
{
var ruleModelObj = {name: item.name, type:
this.logInclusionRuleCategory.toLowerCase(), parent: this.modelObj};
var that = this;
- this.management.load(ruleModelObj, {actuals: true}).then(
+ this.management.load(ruleModelObj, {actuals: true,
excludeInheritedContext: true}).then(
function(data)
{
addLogInclusionRule.show(that.management,
ruleModelObj, that.logInclusionRuleCategory, data[0]);
@@ -199,7 +199,7 @@ define(["dojo/parser",
Updater.prototype.update = function (callback)
{
var that = this;
- that.tabObject.management.load(this.modelObj).then(
+ that.tabObject.management.load(this.modelObj, {excludeInheritedContext:
true}).then(
function (data)
{
that.loggerData = data[0] || {};
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
Wed May 4 13:29:06 2016
@@ -67,7 +67,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/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
Wed May 4 13:29:06 2016
@@ -92,7 +92,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];
@@ -209,7 +209,7 @@ define(["dojo/dom",
var thisObj = this;
- this.management.load(this.modelObj).then(function(data)
+ this.management.load(this.modelObj, {excludeInheritedContext:
true}).then(function(data)
{
thisObj.portData = data[0];
util.flattenStatistics( thisObj.portData );
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
Wed May 4 13:29:06 2016
@@ -156,7 +156,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];
util.flattenStatistics( preferencesProviderData );
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
Wed May 4 13:29:06 2016
@@ -421,7 +421,7 @@ define(["dojo/_base/declare",
var thisObj = this;
- this.management.load(this.modelObj).then(function(data) {
+ this.management.load(this.modelObj, {excludeInheritedContext:
true}).then(function(data) {
var i,j;
thisObj.queueData = data[0];
util.flattenStatistics( thisObj.queueData );
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
Wed May 4 13:29:06 2016
@@ -66,7 +66,7 @@ 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);
@@ -117,7 +117,7 @@ define(["dojo/dom",
KeyStoreUpdater.prototype.update = function(callback)
{
var that = this;
- this.management.load(this.modelObj).then(function(data)
+ this.management.load(this.modelObj, {excludeInheritedContext:
true}).then(function(data)
{
that.trustStoreData = data[0];
that.updateHeader();
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
Wed May 4 13:29:06 2016
@@ -369,7 +369,7 @@ define(["dojo/parser",
{
var thisObj = this;
- var vhostLoadedPromise = this.management.load(this.modelObj);
+ var vhostLoadedPromise = this.management.load(this.modelObj,
{excludeInheritedContext: true});
var connectionsPromise = this.management.get({url:
this.management.objectToURL(this.modelObj) + "/getConnections"});
all({vhostLoadedPromise: vhostLoadedPromise,
connectionsPromise: connectionsPromise}).then(function(results) {
thisObj.vhostData = results.vhostLoadedPromise[0] || {name:
thisObj.modelObj.name,statistics:{messagesIn:0,bytesIn:0,messagesOut:0,bytesOut:0}};
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
Wed May 4 13:29:06 2016
@@ -169,7 +169,7 @@ define(["dojo/parser",
Updater.prototype.update = function(callback)
{
var that = this;
- that.tabObject.management.load(this.modelObj).then(
+ that.tabObject.management.load(this.modelObj,
{excludeInheritedContext: true}).then(
function(data)
{
that.nodeData = data[0] || {};
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
Wed May 4 13:29:06 2016
@@ -86,7 +86,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/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
Wed May 4 13:29:06 2016
@@ -95,7 +95,7 @@ define(["dojo/dom",
{
// editing
var that = this;
- management.load(modelObj, { actuals: true }).then(
+ management.load(modelObj, { actuals: true,
excludeInheritedContext: true }).then(
function(data)
{
var actualData = data[0];
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
Wed May 4 13:29:06 2016
@@ -354,7 +354,7 @@ define(["dojo/_base/connect",
array.forEach(lang.clone(defaultBindingArguments), function(item)
{grid.store.newItem(item); });
grid.store.save();
- management.load({type: "queue", parent: obj.parent }, {depth:
0}).then(
+ management.load({type: "queue", parent: obj.parent }, {depth: 0,
excludeInheritedContext: true}).then(
function(data) {
var queues = [];
for(var i=0; i < data.length; i++) {
@@ -381,7 +381,7 @@ define(["dojo/_base/connect",
that.queueChooser.set("value", obj.name);
that.queueChooser.set("disabled", true);
}
- management.load({type: "exchange", parent: obj.parent },
{depth: 0}).then(
+ management.load({type: "exchange", parent: obj.parent },
{depth: 0, excludeInheritedContext: true}).then(
function(data) {
var exchanges = [];
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
Wed May 4 13:29:06 2016
@@ -365,7 +365,7 @@ define(["dojo/dom",
{
editWarning.style.display = "block";
- management.load(modelObj, { actuals: true }).then(
+ management.load(modelObj, { actuals: true,
excludeInheritedContext: true }).then(
function(data){
var port = data[0];
nameWidget.set("value", port.name);
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
Wed May 4 13:29:06 2016
@@ -81,7 +81,7 @@ define([
if (modelObj.type == "preferencesprovider")
{
var that = this;
- management.load(modelObj, {actuals: true}).then(
+ management.load(modelObj, {actuals: true,
excludeInheritedContext: true}).then(
function(data)
{
that.preferencesProviderForm.setData(data[0]);
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
Wed May 4 13:29:06 2016
@@ -141,12 +141,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/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
Wed May 4 13:29:06 2016
@@ -141,9 +141,9 @@ define([
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))
{
@@ -162,16 +162,16 @@ define([
}
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/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
Wed May 4 13:29:06 2016
@@ -31,7 +31,7 @@ define(["dojo/query","dijit/registry","q
{
var that = this;
var obj = {type:"truststore", parent: {type: "broker"}};
- data.parent.management.load(obj).then(
+ data.parent.management.load(obj, {excludeInheritedContext:
true}).then(
function(trustStores)
{
that._initTrustStores(trustStores, data.containerNode);
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
Wed May 4 13:29:06 2016
@@ -70,7 +70,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;
@@ -88,11 +87,8 @@ define(["dojox/html/entities",
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()
{
@@ -132,11 +128,11 @@ define(["dojox/html/entities",
alert('Form contains invalid data. Please correct first');
}
},
- _show:function(actualData, effectiveData)
+ _show:function(data)
{
- this.initialData = actualData;
- util.applyToWidgets(dom.byId("editBroker.allFields"), "Broker",
"Broker", actualData, this.management.metadata);
- util.setContextData(this.context, management, {type: "broker"},
actualData, effectiveData );
+ this.initialData = data.actual;
+ util.applyToWidgets(dom.byId("editBroker.allFields"), "Broker",
"Broker", data.actual, this.management.metadata);
+ 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/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
Wed May 4 13:29:06 2016
@@ -78,7 +78,6 @@ define(["dojox/html/entities",
},
show: function(management,modelObj)
{
- var that=this;
this.management = management;
this.modelObj = modelObj;
if (!this.context)
@@ -87,16 +86,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()
{
@@ -135,16 +125,16 @@ 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, this.management.metadata);
+ util.applyToWidgets(that.allFieldsContainer, "Queue",
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/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
Wed May 4 13:29:06 2016
@@ -84,7 +84,6 @@ define(["dojox/html/entities",
{
this.management = management;
this.modelObj = modelObj;
- var that=this;
if (!this.context)
{
this.context = new qpid.common.ContextVariablesEditor({name:
'context', title: 'Context variables'});
@@ -92,17 +91,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()
{
@@ -141,10 +130,10 @@ 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];
@@ -153,15 +142,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++)
@@ -175,16 +164,16 @@ define(["dojox/html/entities",
array.forEach(widgets, function(item) { item.destroyRecursive();});
domConstruct.empty(this.typeFieldsContainer);
- require(["qpid/management/virtualhost/" +
actualData.type.toLowerCase() + "/edit"],
+ require(["qpid/management/virtualhost/" +
data.actual.type.toLowerCase() + "/edit"],
function(TypeUI)
{
try
{
var metadata = that.management.metadata;
- TypeUI.show({containerNode:that.typeFieldsContainer,
parent: that, data: actualData, metadata: metadata});
+ TypeUI.show({containerNode:that.typeFieldsContainer,
parent: that, data: data.actual, metadata: metadata});
that.form.connectChildren();
- util.applyToWidgets(that.allFieldsContainer,
"VirtualHost", actualData.type, actualData, metadata);
+ util.applyToWidgets(that.allFieldsContainer,
"VirtualHost", data.actual.type, data.actual, metadata);
}
catch(e)
{
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
Wed May 4 13:29:06 2016
@@ -71,14 +71,13 @@ define(["dojox/html/entities",
{
this.management = management;
this.modelObj = modelObj;
- var that=this;
if (!this.context)
{
this.context = new qpid.common.ContextVariablesEditor({name:
'context', title: 'Context variables'});
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()
{
@@ -117,29 +116,29 @@ 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) { item.destroyRecursive();});
domConstruct.empty(this.typeFieldsContainer);
- require(["qpid/management/virtualhostnode/" +
actualData.type.toLowerCase() + "/edit"],
+ require(["qpid/management/virtualhostnode/" +
data.actual.type.toLowerCase() + "/edit"],
function(TypeUI)
{
try
{
var metadata = that.management.metadata;
- TypeUI.show({containerNode:that.typeFieldsContainer,
parent: that, data: actualData, effectiveData: effectiveData, metadata:
metadata});
+ TypeUI.show({containerNode:that.typeFieldsContainer,
parent: that, data: data.actual, effectiveData: data.effective, metadata:
metadata});
that.form.connectChildren();
- util.applyToWidgets(that.allFieldsContainer,
"VirtualHostNode", actualData.type, actualData, metadata);
+ util.applyToWidgets(that.allFieldsContainer,
"VirtualHostNode", data.actual.type, data.actual, metadata);
}
catch(e)
{
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
Wed May 4 13:29:06 2016
@@ -167,7 +167,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/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
Wed May 4 13:29:06 2016
@@ -93,7 +93,7 @@ define(["dojo/dom",
moveMessages.submitButton.set("label", label);
moveMessages.dialog.set("title", label);
- management.load({type: "queue", parent: modelObj.parent},
{depth:0}).then(
+ management.load({type: "queue", parent: modelObj.parent},
{depth:0, excludeInheritedContext: true}).then(
function(data) {
var queues = [];
for(var i=0; i < data.length; i++)
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
Wed May 4 13:29:06 2016
@@ -88,7 +88,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];
that.httpBasicAuthenticationEnabled.innerHTML =
showBoolean(that.pluginData.httpBasicAuthenticationEnabled);
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp/edit.js
Wed May 4 13:29:06 2016
@@ -65,7 +65,7 @@ define(["dojo/_base/event",
this.management = management;
this.modelObj = modelObj;
var that=this;
- management.load(modelObj, { actuals: true }).then(
+ management.load(modelObj, { actuals: true, excludeInheritedContext:
true }).then(
function(actualData)
{
that._show(actualData[0]);
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
Wed May 4 13:29:06 2016
@@ -80,7 +80,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];
that.usePlatformMBeanServer.innerHTML =
showBoolean(that.pluginData.usePlatformMBeanServer);
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js?rev=1742280&r1=1742279&r2=1742280&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js
Wed May 4 13:29:06 2016
@@ -65,7 +65,7 @@ define(["dojo/_base/event",
this.management = management;
this.modelObj = modelObj;
var that=this;
- management.load(modelObj, { actuals: true }).then(
+ management.load(modelObj, { actuals: true, excludeInheritedContext:
true }).then(
function(actualData)
{
that._show(actualData[0]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
