Author: orudyy
Date: Wed May 27 16:00:53 2015
New Revision: 1682068
URL: http://svn.apache.org/r1682068
Log:
QPID-6527: Change web console management facade to have only promised based
methods and change management method invocations to use promise
Invoke default error handler if error callback is not specified in
call to promise.then()
Modified:
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.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/Management.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.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/addAccessControlProvider.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/addExchange.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/addStore.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/PrincipalDatabaseAuthenticationManager.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/addGroupMember.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.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/plugin/managementjmx/edit.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
Modified:
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
Wed May 27 16:00:53 2015
@@ -108,8 +108,8 @@ define(["dojo/_base/connect",
var data = that.membersGrid.grid.selection.getSelected();
if (data.length == 1 && confirm("Are you sure you would like to
transfer mastership to node '" + data[0].name + "'?"))
{
- that.management.update(getModelObj(that.data.name,
data[0].name, modelObj), {role: "MASTER"},
-
function(data){that.membersGrid.grid.selection.clear();}, util.xhrErrorHandler);
+ that.management.update(getModelObj(that.data.name,
data[0].name, modelObj), {role: "MASTER"}).then(
+
function(data){that.membersGrid.grid.selection.clear();});
}
}
);
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -392,8 +392,7 @@ define(["dojo/parser",
{
var item = data[0];
that.management.update({type:"virtualhostnode", name:item.name, parent:
that.modelObj},
- {desiredState: "ACTIVE"},
-
function(data){that.vhostsGrid.grid.selection.clear();});
+ {desiredState:
"ACTIVE"}).then(function(data){that.vhostsGrid.grid.selection.clear();});
}
});
@@ -409,8 +408,7 @@ define(["dojo/parser",
+
entities.encode(String(item.name)) +"'?"))
{
that.management.update({type:"virtualhostnode", name:item.name, parent:
that.modelObj},
- {desiredState: "STOPPED"},
-
function(data){that.vhostsGrid.grid.selection.clear();});
+ {desiredState:
"STOPPED"}).then(function(data){that.vhostsGrid.grid.selection.clear();});
}
}
});
@@ -423,8 +421,7 @@ define(["dojo/parser",
var item = data[0];
var host = item.virtualhosts[0];
that.management.update({type:"virtualhost",
name:item.name, parent: {type:"virtualhostnode", name: host.name, parent:
that.modelObj}},
- {desiredState: "ACTIVE"},
-
function(data){that.vhostsGrid.grid.selection.clear();});
+ {desiredState:
"ACTIVE"}).then(function(data){that.vhostsGrid.grid.selection.clear();});
}
});
@@ -439,8 +436,7 @@ define(["dojo/parser",
+
entities.encode(String(host.name)) +"'?"))
{
that.management.update({type:"virtualhost", name:item.name, parent:
{type:"virtualhostnode", name: host.name, parent: that.modelObj}},
- {desiredState: "STOPPED"},
-
function(data){that.vhostsGrid.grid.selection.clear();});
+ {desiredState:
"STOPPED"}).then(function(data){that.vhostsGrid.grid.selection.clear();});
}
}
});
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -60,7 +60,7 @@ define(["dojo/parser",
{
if (confirm("Are you sure you want to
close the connection?"))
{
- that.management.remove(that.modelObj,
{}, function(result){ that.destroy(); } );
+
that.management.remove(that.modelObj).then(function(result){ that.destroy(); }
);
}
});
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -114,7 +114,7 @@ define(["dojo/_base/xhr",
this.exchangeUpdater.bindingsGrid.grid,
"Are you sure you want to delete binding",
this.management,
- {type: "binding", parent:that.modelObj},
+ {type: "binding", parent:this.modelObj},
this.exchangeUpdater);
}
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
Wed May 27 16:00:53 2015
@@ -58,9 +58,8 @@ define(["dojo/_base/lang",
}
// summary:
- // This is a proxy for sending management requests to broker at given host
and port specified in brokerURL argument.
- // Optional errorHandler method can be set and invoked on error responses
when methods are invoked as non promise.
-
+ // This is a facade for sending management requests to broker at given
brokerURL specifying schema, host and port.
+ // Optional errorHandler method can be set and invoked on error responses.
function Management(brokerURL, errorHandler)
{
this.brokerURL = brokerURL;
@@ -82,21 +81,15 @@ define(["dojo/_base/lang",
// withCredentials: Boolean?
// For cross-site requests, whether to send credentials or
not.
// query: Object?
- // the object send defining request query parameters
+ // the query parameters to add to the request url
// handleAs: String
// Indicates how the response will be handled.
// url: String?
// relative URL to broker REST API
- // successAction: function
- // Optional callback function to execute on successful response.
- // It can be specified if function does not need to return promise
- // failureAction: function
- // Optional callback function to execute on erroneous response.
- // It can be specified if function does not need to return promise
- //
- // returns: promise
- // Promise returned by dojo.request.xhr.
- Management.prototype.submit = function(request, successAction,
failureAction)
+ //
+ // returns: promise of type dojo.promise.Promise
+ // Promise returned by dojo.request.xhr with modified then method
allowing to use default error handler if none is specified.
+ Management.prototype.submit = function(request)
{
var requestOptions = {
sync: false,
@@ -123,56 +116,48 @@ define(["dojo/_base/lang",
var url = this.getFullUrl(request.url);
var promise = xhr(url, requestOptions);
- if (successAction || failureAction)
- {
- var that = this;
- promise.then(
- function(data)
- {
- if (successAction)
- {
- successAction(data);
- }
- },
- function(error)
- {
- if (failureAction)
- {
- failureAction(error);
- }
- else
- {
- that.errorHandler(error);
- }
- }
- );
- }
- return promise;
+ var errorHandler = this.errorHandler;
+
+ // decorate promise in order to use a default error handler when
'then' method is invoked without providing error handler
+ return {
+ then: function(callback, errback, progback) {
return promise.then(callback, errback||errorHandler, progback ); },
+ cancel: function(reason, strict) { return
promise.cancel(reason, strict); },
+ isResolved: function(){return promise.isResolved();},
+ isRejected: function(){return promise.isRejected();},
+ isFulfilled: function(){return promise.isFulfilled();},
+ isCanceled: function(){return promise.isCanceled();},
+ always: function(callbackOrErrback){return
promise.always(callbackOrErrback);},
+ otherwise: function(errback){return
promise.otherwise(errback);},
+ trace: function(){ return promise.trace();},
+ traceRejected: function(){return promise.traceRejected();},
+ toString: function(){return promise.toString();}
+ };
+
};
- Management.prototype.get = function(request, successAction, failureAction)
+ Management.prototype.get = function(request)
{
var requestOptions = merge(request, {method: "GET"});
- return this.submit(requestOptions, successAction, failureAction);
+ return this.submit(requestOptions);
};
- Management.prototype.post = function(request, data, successAction,
failureAction)
+ Management.prototype.post = function(request, data)
{
var requestOptions = merge(request, {method: "POST", data: data});
- return this.submit(requestOptions, successAction, failureAction);
+ return this.submit(requestOptions);
};
- Management.prototype.del = function(request, successAction, failureAction)
+ Management.prototype.del = function(request)
{
var requestOptions = merge(request, {method: "DELETE"});
- return this.submit(requestOptions, successAction, failureAction);
+ return this.submit(requestOptions);
};
// summary:
// Loads object data specified as modelObj argument
// modelObj: Object?
// is a JSON object specifying the hierarchy
- // It has the following fields:
+ // It can have the following fields:
// name: String?
// name of the object
// type: String?
@@ -181,17 +166,11 @@ define(["dojo/_base/lang",
// parent of the object in the same format, having
fields name, type, parent
//
// parameters: Object?
- // is optional JSON to pass additional request parameters
- // successAction: function
- // Optional callback function to execute on successful response.
- // It can be specified if function does not need to return promise
- // failureAction: function
- // Optional callback function to execute on erroneous response.
- // It can be specified if function does not need to return promise
- //
- // returns: promise
- // Promise returned by dojo.request.xhr.
- Management.prototype.load = function(modelObj, parameters, successAction,
failureAction)
+ // is optional JSON to pass additional request parameters
which will be added into query of REST url
+ //
+ // returns: promise of type dojo.promise.Promise
+ // Promise returned by dojo.request.xhr with modified then method
allowing to use default error handler if none is specified.
+ Management.prototype.load = function(modelObj, parameters)
{
var url = this.objectToURL(modelObj);
var request = {url: url};
@@ -199,7 +178,7 @@ define(["dojo/_base/lang",
{
request.query = parameters;
}
- return this.get(request, successAction, failureAction);
+ return this.get(request);
};
// summary:
@@ -209,23 +188,24 @@ define(["dojo/_base/lang",
//
// parentModelObject: Object?
// Parent object hierarchy
+ // It can have the following fields:
+ // name: String?
+ // name of the object
+ // type: String?
+ // category of the object
+ // parent: Object?
+ // parent of the object in the same format, having
fields name, type, parent
// data; Object?
// Object structure
- // successAction: function
- // Optional callback function to execute on successful response.
- // It can be specified if function does not need to return promise
- // failureAction: function
- // Optional callback function to execute on erroneous response.
- // It can be specified if function does not need to return promise
- //
- // returns: promise
- // Promise returned by dojo.request.xhr.
- Management.prototype.create = function(category, parentModelObject, data,
successAction, failureAction)
+ //
+ // returns: promise of type dojo.promise.Promise
+ // Promise returned by dojo.request.xhr with modified then method
allowing to use default error handler if none is specified.
+ Management.prototype.create = function(category, parentModelObject, data)
{
var newObjectModel ={type: category.toLowerCase(), parent:
parentModelObject};
var url = this.objectToURL(newObjectModel);
var request = {url: url};
- this.post(request, data, successAction, failureAction);
+ return this.post(request, data);
};
// summary:
@@ -233,40 +213,42 @@ define(["dojo/_base/lang",
//
// modelObj: Object?
// Object specifying hierarchy
+ // It can have the following fields:
+ // name: String?
+ // name of the object
+ // type: String?
+ // category of the object
+ // parent: Object?
+ // parent of the object in the same format, having
fields name, type, parent
// data; Object?
// New attributes
- // successAction: function
- // Optional callback function to execute on successful response.
- // It can be specified if function does not need to return promise
- // failureAction: function
- // Optional callback function to execute on erroneous response.
- // It can be specified if function does not need to return promise
- //
- // returns: promise
- // Promise returned by dojo.request.xhr.
- Management.prototype.update = function(modelObj, data, successAction,
failureAction)
+ //
+ // returns: promise of type dojo.promise.Promise
+ // Promise returned by dojo.request.xhr with modified then method
allowing to use default error handler if none is specified.
+ Management.prototype.update = function(modelObj, data)
{
var url = this.objectToURL(modelObj);
var request = {url: url};
- return this.post(request, data, successAction, failureAction);
+ return this.post(request, data);
};
// summary:
// Removes object specified as modelObj argument
// modelObj: Object?
// hierarchy object
+ // It can have the following fields:
+ // name: String?
+ // name of the object
+ // type: String?
+ // category of the object
+ // parent: Object?
+ // parent of the object in the same format, having
fields name, type, parent
// parameters: Object?
- // is optional JSON object to pass additional request
parameters
- // successAction: function
- // Optional callback function to execute on successful response.
- // It can be specified if function does not need to return promise
- // failureAction: function
- // Optional callback function to execute on erroneous response.
- // It can be specified if function does not need to return promise
- //
- // returns: promise
- // Promise returned by dojo.request.xhr.
- Management.prototype.remove = function(modelObj, parameters,
successAction, failureAction)
+ // is optional JSON object to pass additional request
parameters which will be added into query of REST url
+ //
+ // returns: promise of type dojo.promise.Promise
+ // Promise returned by dojo.request.xhr with modified then method
allowing to use default error handler if none is specified.
+ Management.prototype.remove = function(modelObj, parameters)
{
var url = this.objectToURL(modelObj);
var request = {url: url};
@@ -274,21 +256,32 @@ define(["dojo/_base/lang",
{
request.query = parameters;
}
- return this.del(request, successAction, failureAction);
+ return this.del(request);
};
// summary:
// Downloads current JSON for object specified as modelObj argument
+ //
// modelObj: Object?
// hierarchy object
+ // It can have the following fields:
+ // name: String?
+ // name of the object
+ // type: String?
+ // category of the object
+ // parent: Object?
+ // parent of the object in the same format, having
fields name, type, parent
// parameters: Object?
- // is optional JSON object to pass additional request
parameters
+ // is optional JSON object to pass additional request
parameters which will be added into query of REST url
+ //
Management.prototype.download = function(modelObj, parameters)
{
var url = this.buildObjectURL(modelObj, parameters);
setTimeout(function() {window.location = url;}, 100);
}
+ // summary:
+ // Downloads current JSON for object specified as modelObj argument into
iframe
Management.prototype.downloadIntoFrame = function(modelObj, parameters)
{
var url = this.buildObjectURL(modelObj, parameters);
@@ -299,6 +292,22 @@ define(["dojo/_base/lang",
// It seems there is no way to remove this iframe in a manner that is
cross browser compatible.
}
+ // summary:
+ // Builds relative REST url (excluding schema, host and port) for the
object representing CO hierarchy
+ // modelObj: Object?
+ // hierarchy object
+ // It can have the following fields:
+ // name: String?
+ // name of the object
+ // type: String?
+ // category of the object
+ // parent: Object?
+ // parent of the object in the same format, having
fields name, type, parent
+ // parameters: Object?
+ // is optional JSON object to pass additional request
parameters which will be added into query of REST url
+ //
+ // returns: relative REST url for the hierarchy object
+ //
Management.prototype.objectToURL = function(modelObj)
{
var url = null;
@@ -328,6 +337,22 @@ define(["dojo/_base/lang",
return "api/latest/" + url;
};
+ // summary:
+ // Builds a servlet path of REST url for the object representing CO
hierarchy
+ // modelObj: Object?
+ // hierarchy object
+ // It can have the following fields:
+ // name: String?
+ // name of the object
+ // type: String?
+ // category of the object
+ // parent: Object?
+ // parent of the object in the same format, having
fields name, type, parent
+ // parameters: Object?
+ // is optional JSON object to pass additional request
parameters which will be added into query of REST url
+ //
+ // returns: relative REST servlet path for the hierarchy object
+ //
Management.prototype.objectToPath = function(modelObj)
{
var path = "";
@@ -347,6 +372,22 @@ define(["dojo/_base/lang",
return path;
};
+ // summary:
+ // Builds full REST url for the object representing CO hierarchy
+ // modelObj: Object?
+ // hierarchy object
+ // It can have the following fields:
+ // name: String?
+ // name of the object
+ // type: String?
+ // category of the object
+ // parent: Object?
+ // parent of the object in the same format, having
fields name, type, parent
+ // parameters: Object?
+ // is optional JSON object to pass additional request
parameters which will be added into query of REST url
+ //
+ // returns: full REST url for the hierarchy object
+ //
Management.prototype.buildObjectURL = function(modelObj, parameters)
{
var url = this.objectToURL(modelObj);
@@ -357,6 +398,11 @@ define(["dojo/_base/lang",
return this.getFullUrl(url);
}
+ // summary:
+ // Returns full REST url for the relative REST url
+ //
+ // returns: full urk for the given relative URL
+ //
Management.prototype.getFullUrl = function(url)
{
var baseUrl = this.brokerURL || "";
@@ -367,6 +413,9 @@ define(["dojo/_base/lang",
return baseUrl + url;
}
+ // summary:
+ // Loads meta data, time zones, user preferences and invokes callback
functions after loading user preferences
+ //
Management.prototype.init = function(callback)
{
var that = this;
@@ -379,10 +428,14 @@ define(["dojo/_base/lang",
});
};
+ // summary:
+ // Loads meta data and store it under 'metadata' field as object of type
qpid.common.metadata object.
+ // When meta data are loaded successfully a callback function is
executed, otherwise default error handler is invoked
+ //
Management.prototype.loadMetadata = function(callback)
{
var that = this;
- this.get({url: "service/metadata"},
+ this.get({url: "service/metadata"}).then(
function(data)
{
that.metadata = new Metadata(data);
@@ -390,14 +443,17 @@ define(["dojo/_base/lang",
{
callback();
}
- },
- this.errorHandler);
+ });
};
+ // summary:
+ // Loads timezones and store them under 'timezone' field as object of
type qpid.common.timezone object
+ // When timezones are loaded successfully a callback function is
executed, otherwise default error handler is invoked
+ //
Management.prototype.loadTimezones = function(callback)
{
var that = this;
- that.get({url: "service/timezones"},
+ that.get({url: "service/timezones"}).then(
function(timezones)
{
that.timezone = new Timezone(timezones);
@@ -405,10 +461,13 @@ define(["dojo/_base/lang",
{
callback();
}
- },
- this.errorHandler);
+ });
};
+ // summary:
+ // Loads user preferences and store them under 'userPreferences' field as
object of type qpid.management.UserPreferences
+ // Callback is invoked on both successful and unsuccessful preferences
request
+ //
Management.prototype.loadUserPreferences = function(callback)
{
this.userPreferences = new UserPreferences(this);
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
Wed May 27 16:00:53 2015
@@ -235,7 +235,7 @@ function (declare, event, connect, dom,
_loadUserPreferences : function(callback)
{
var that = this;
- this.management.get({url: "service/userpreferences"},
+ this.management.get({url: "service/userpreferences"}).then(
function(users)
{
for(var i=0; i<users.length; i++)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
Wed May 27 16:00:53 2015
@@ -29,12 +29,13 @@ define(["dojo/date",
this.timeZone = "UTC";
this.tabs = [];
this.management = management;
+ this.preferences = {};
}
UserPreferences.prototype.load = function(successCallback, failureCallback)
{
var that = this;
- this.management.get({url: "service/preferences"},
+ this.management.get({url: "service/preferences"}).then(
function(preferences)
{
that.preferences = preferences;
@@ -61,7 +62,7 @@ define(["dojo/date",
{
var that = this;
this.management.post({url: "service/preferences"},
- preferences,
+ preferences).then(
function(x)
{
that.preferences = preferences;
@@ -99,7 +100,6 @@ define(["dojo/date",
}
}
this.timeZone = "UTC";
- this.preferences ="UTC";
this.preferences = preferences;
this._notifyListeners(preferences);
};
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -120,7 +120,7 @@ define(["dojo/parser",
function(event)
{
that.startButton.set("disabled", true);
- that.management.update(that.modelObj,
{desiredState: "ACTIVE"}, null, util.xhrErrorHandler);
+ that.management.update(that.modelObj,
{desiredState: "ACTIVE"}).then();
});
that.stopButton.on("click",
@@ -131,7 +131,7 @@ define(["dojo/parser",
+ entities.encode(String(that.name))
+"'?"))
{
that.stopButton.set("disabled", true);
- that.management.update(that.modelObj,
{desiredState: "STOPPED"}, null, util.xhrErrorHandler);
+ that.management.update(that.modelObj,
{desiredState: "STOPPED"}).then();
}
});
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -84,7 +84,7 @@ define(["dojo/parser",
function(event)
{
that.startNodeButton.set("disabled", true);
- that.management.update(that.modelObj, {desiredState:
"ACTIVE"}, null, util.xhrErrorHandler);
+ that.management.update(that.modelObj, {desiredState:
"ACTIVE"}).then();
});
this.stopNodeButton.on("click",
@@ -95,7 +95,7 @@ define(["dojo/parser",
+ entities.encode(String(that.name)) +"'?"))
{
that.stopNodeButton.set("disabled", true);
- that.management.update(that.modelObj, {desiredState:
"STOPPED"}, null, util.xhrErrorHandler);
+ that.management.update(that.modelObj, {desiredState:
"STOPPED"}).then();
}
});
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
Wed May 27 16:00:53 2015
@@ -101,7 +101,7 @@ define(["dojo/_base/lang",
{
var accessControlProviderData =
util.getFormWidgetValues(this.accessControlProviderForm, this.initialData);
var that = this;
- this.management.create("accesscontrolprovider",
this.modelObj, accessControlProviderData, function(x){that.dialog.hide();},
util.xhrErrorHandler);
+ this.management.create("accesscontrolprovider",
this.modelObj,
accessControlProviderData).then(function(x){that.dialog.hide();});
}
else
{
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -93,7 +93,7 @@ define(["dojo/dom",
{
// editing
var that = this;
- management.load(modelObj, { actuals: true },
+ management.load(modelObj, { actuals: true }).then(
function(data)
{
var actualData = data[0];
@@ -114,7 +114,7 @@ define(["dojo/dom",
}
that.authenticationProviderName.set("value", actualData.name);
that._show();
- }, util.xhrErrorHandler );
+ });
}
else
{
@@ -169,7 +169,7 @@ define(["dojo/dom",
var name =
that.preferencesProviderForm.getPreferencesProviderName();
var modelObj = {name: name, type:
"preferencesprovider", parent: that.modelObj};
- that.management.update(modelObj,
preferencesProviderData, hideDialog, util.xhrErrorHandler);
+ that.management.update(modelObj,
preferencesProviderData).then(hideDialog);
}
else
{
@@ -178,7 +178,7 @@ define(["dojo/dom",
{
authProviderModelObj = { name:
authenticationProviderData.name, type: "authenticationprovider", parent:
that.modelObj};
}
-
that.management.create("preferencesprovider", authProviderModelObj,
preferencesProviderData, hideDialog, util.xhrErrorHandler);
+
that.management.create("preferencesprovider", authProviderModelObj,
preferencesProviderData).then(hideDialog);
}
},
hideDialog
@@ -188,11 +188,11 @@ define(["dojo/dom",
if (this.initialData && this.initialData.id)
{
// update request
- this.management.update(that.modelObj,
authenticationProviderData, savePreferences);
+ this.management.update(that.modelObj,
authenticationProviderData).then(savePreferences);
}
else
{
- this.management.create("authenticationprovider",
that.modelObj, authenticationProviderData, savePreferences);
+ this.management.create("authenticationprovider",
that.modelObj, authenticationProviderData).then(savePreferences);
}
}
else
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -320,7 +320,7 @@ define(["dojo/_base/connect",
}
};
}
- addBinding.management.create("binding",
model, newBinding, function(x){registry.byId("addBinding").hide();});
+ addBinding.management.create("binding",
model, newBinding).then(function(x){registry.byId("addBinding").hide();});
return false;
}else{
alert('Form contains invalid data. Please
correct first');
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
Wed May 27 16:00:53 2015
@@ -82,7 +82,7 @@ define(["dojo/dom",
var newExchange = util.getFormWidgetValues(theForm, null);
var that = this;
addExchange.management.create("exchange", addExchange.modelObj,
- newExchange, function(x){
registry.byId("addExchange").hide(); });
+ newExchange).then(function(x){
registry.byId("addExchange").hide(); });
return false;
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -126,11 +126,11 @@ define([
if (this.initialData)
{
// update request
- this.management.update(this.modelObj,
groupProviderData, function(x){that.dialog.hide();});
+ this.management.update(this.modelObj,
groupProviderData).then(function(x){that.dialog.hide();});
}
else
{
- this.management.create("groupprovider",
this.modelObj,groupProviderData, function(x){that.dialog.hide();});
+ this.management.create("groupprovider",
this.modelObj,groupProviderData).then( function(x){that.dialog.hide();});
}
}
else
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -265,11 +265,11 @@ define(["dojo/dom",
if (registry.byId("formAddPort.name").get("disabled"))
{
// update request
- addPort.management.update(addPort.modelObj,newPort,
function(x){registry.byId("addPort").hide()}, util.xhrErrorHandler);
+
addPort.management.update(addPort.modelObj,newPort).then(function(x){registry.byId("addPort").hide()});
}
else
{
- addPort.management.create("port", addPort.modelObj ,newPort,
function(x){registry.byId("addPort").hide()}, util.xhrErrorHandler);
+ addPort.management.create("port", addPort.modelObj,
newPort).then(function(x){registry.byId("addPort").hide()});
}
return false;
} else
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -59,11 +59,11 @@ define([
if
(that.preferencesProviderForm.data)
{
// update request
-
that.management.update(that.modelObj, preferencesProviderData,
function(){that.dialog.hide();}, util.xhrErrorHandler);
+
that.management.update(that.modelObj,
preferencesProviderData).then(function(){that.dialog.hide();});
}
else
{
-
that.management.create("preferencesprovider",that.modelObj,
preferencesProviderData, function(){that.dialog.hide();}, util.xhrErrorHandler);
+
that.management.create("preferencesprovider",that.modelObj,
preferencesProviderData).then(function(){that.dialog.hide();});
}
});
});
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -108,8 +108,8 @@ define(["dojo/dom",
newQueue["context"] = context;
}
- addQueue.management.create("queue", addQueue.modelObj,
- newQueue,
function(x){registry.byId("addQueue").hide();});
+ addQueue.management.create("queue", addQueue.modelObj,
+
newQueue).then(function(x){registry.byId("addQueue").hide();});
return false;
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
Wed May 27 16:00:53 2015
@@ -137,11 +137,11 @@ define(["dojo/_base/lang",
if (this.effectiveData)
{
// update request
- this.management.update(this.modelObj, storeData,
function(x){that.dialog.hide();});
+ this.management.update(this.modelObj,
storeData).then(function(x){that.dialog.hide();});
}
else
{
- this.management.create(this.category, this.modelObj,
storeData, function(x){that.dialog.hide();});
+ this.management.create(this.category, this.modelObj,
storeData).then(function(x){that.dialog.hide();});
}
}
else
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -351,7 +351,7 @@ define([
}
var that = this;
- that.management.create("virtualhostnode", {type: "broker"},
virtualHostNodeData, function(x){that.dialog.hide();});
+ that.management.create("virtualhostnode", {type: "broker"},
virtualHostNodeData).then(function(x){that.dialog.hide();});
},
_getValues: function (form)
{
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
Wed May 27 16:00:53 2015
@@ -185,7 +185,7 @@ define(["dojo/dom",
var newUser =
convertToUser(theForm.getValues());
- addUser.management.create("user",
addUser.authProvider, newUser, function(x){registry.byId("addUser").hide();},
util.xhrErrorHandler);
+ addUser.management.create("user",
addUser.authProvider,
newUser).then(function(x){registry.byId("addUser").hide();});
return false;
@@ -225,8 +225,7 @@ define(["dojo/dom",
newUser.id = setPassword.id;
var model = {type: "user", name: setPassword.name,
parent: setPassword.authProvider};
- setPassword.management.update(model, newUser,
-
function(x){registry.byId("setPassword").hide();}, util.xhrErrorHandler);
+ setPassword.management.update(model,
newUser).then(function(x){registry.byId("setPassword").hide();});
return false;
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -83,7 +83,7 @@ define(["dojox/html/entities",
this.management = management;
var that=this;
this.dialog.set("title", "Edit Broker - " +
entities.encode(String(brokerData.name)));
- management.load( {type:"broker"}, { actuals: true },
+ management.load( {type:"broker"}, { actuals: true }).then(
function(data)
{
that._show(data[0], brokerData);
@@ -120,7 +120,7 @@ define(["dojox/html/entities",
}
var that = this;
- this.management.update({type: "broker"}, data,
function(x){that.dialog.hide();}, util.xhrErrorHandler);
+ this.management.update({type: "broker"},
data).then(function(x){that.dialog.hide();});
}
else
{
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -87,7 +87,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 },
+ management.load(modelObj, { actuals: true }).then(
function(actualData)
{
management.load(modelObj).then(
@@ -96,8 +96,7 @@ define(["dojox/html/entities",
that._show(actualData[0], effectiveData[0]);
},
util.xhrErrorHandler);
- },
- util.xhrErrorHandler);
+ });
},
destroy: function()
{
@@ -129,7 +128,7 @@ define(["dojox/html/entities",
data["context"] = context;
}
var that = this;
- this.management.update(that.modelObj, data,
function(x){that.dialog.hide()});
+ this.management.update(that.modelObj,
data).then(function(x){that.dialog.hide()});
}
else
{
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -87,7 +87,7 @@ define(["dojox/html/entities",
}
this.dialog.set("title", "Edit Virtual Host - " +
entities.encode(String(modelObj.name)));
- management.load(modelObj, { actuals: true },
+ management.load(modelObj, { actuals: true }).then(
function(actualData)
{
management.load(modelObj).then(
@@ -96,8 +96,7 @@ define(["dojox/html/entities",
that._show(actualData[0], effectiveData[0]);
},
util.xhrErrorHandler);
- },
- util.xhrErrorHandler);
+ });
},
destroy: function()
@@ -130,7 +129,7 @@ define(["dojox/html/entities",
data["context"] = context;
}
var that=this;
- this.management.update(that.modelObj, data, function(x){
that.dialog.hide();} );
+ this.management.update(that.modelObj, data).then( function(x){
that.dialog.hide();} );
}
else
{
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -78,7 +78,7 @@ 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 },
function(data){that._show(data[0], effectiveData);});
+ management.load( modelObj, { actuals: true }).then(
function(data){that._show(data[0], effectiveData);});
},
destroy: function()
{
@@ -110,7 +110,7 @@ define(["dojox/html/entities",
data["context"] = context;
}
var that = this;
- this.management.update(that,modelObj, data, function(x){
that.dialog.hide();}, util.xhrErrorHandler );
+ this.management.update(that.modelObj, data).then( function(x){
that.dialog.hide();} );
}
else
{
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js
Wed May 27 16:00:53 2015
@@ -69,7 +69,7 @@ define(["dojo/dom",
var newGroupMember =
convertToGroupMember(theForm.getValues());
var that = this;
-
addGroupMember.management.create("groupmember", addGroupMember.group,
newGroupMember, function(x){registry.byId("addGroupMember").hide();});
+
addGroupMember.management.create("groupmember", addGroupMember.group,
newGroupMember).then(function(x){registry.byId("addGroupMember").hide();});
return false;
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
Wed May 27 16:00:53 2015
@@ -161,7 +161,7 @@ define(["dojo/dom",
if(theForm.validate()){
var newGroup =
convertToGroup(theForm.getValues());
- addGroup.management.create("group",
addGroup.groupProvider, newGroup,
function(x){registry.byId("addGroup").hide();});
+ addGroup.management.create("group",
addGroup.groupProvider,
newGroup).then(function(x){registry.byId("addGroup").hide();});
return false;
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
Wed May 27 16:00:53 2015
@@ -221,8 +221,11 @@ define(["dojo/_base/xhr",
{
var userPreferences = this.management.userPreferences;
currentTimeZone = userPreferences.getTimeZoneDescription();
- dataTransformer(this.grid.updater.memoryStore.data,
userPreferences);
- this.grid._refresh();
+ if (this.grid.updater.memoryStore)
+ {
+ dataTransformer(this.grid.updater.memoryStore.data,
userPreferences);
+ this.grid._refresh();
+ }
};
return LogViewer;
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=1682068&r1=1682067&r2=1682068&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 27 16:00:53 2015
@@ -65,7 +65,7 @@ define(["dojo/_base/event",
this.management = management;
this.modelObj = modelObj;
var that=this;
- management.load(modelObj, { actuals: true },
+ management.load(modelObj, { actuals: true }).then(
function(actualData)
{
that._show(actualData[0]);
@@ -96,7 +96,7 @@ define(["dojo/_base/event",
{
var data = util.getFormWidgetValues(this.form, this.initialData);
var that=this;
- this.management.update(this.modelObj, data, function(x){
that.dialog.hide();} );
+ this.management.update(this.modelObj, data).then( function(x){
that.dialog.hide();} );
}
else
{
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js
Wed May 27 16:00:53 2015
@@ -65,7 +65,7 @@ define(["dojo/_base/event",
this.management = management;
this.modelObj = modelObj;
var that=this;
- management.load(modelObj, { actuals: true },
+ management.load(modelObj, { actuals: true }).then(
function(actualData)
{
that._show(actualData[0]);
@@ -96,7 +96,7 @@ define(["dojo/_base/event",
{
var data = util.getFormWidgetValues(this.form, this.initialData);
var that=this;
- this.management.update(this.modelObj, data, function(x){
that.dialog.hide();} );
+ this.management.update(this.modelObj, data).then(function(x){
that.dialog.hide();} );
}
else
{
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js?rev=1682068&r1=1682067&r2=1682068&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
Wed May 27 16:00:53 2015
@@ -126,9 +126,7 @@ define(["dojo/dom",
showMessage.management.get({url: "service/message/" +
encodeURIComponent(encodeURIComponent(obj.virtualhost))
+ "/" +
encodeURIComponent(encodeURIComponent(obj.queue))
- + "/" +
encodeURIComponent(encodeURIComponent(obj.messageNumber))},
- showMessage.populateShowMessage, util.xhrErrorHandler
- );
+ + "/" +
encodeURIComponent(encodeURIComponent(obj.messageNumber))}).then(showMessage.populateShowMessage);
};
var node = construct.create("div", null, win.body(), "last");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
