Author: orudyy
Date: Fri Feb 20 17:16:04 2015
New Revision: 1661166
URL: http://svn.apache.org/r1661166
Log:
QPID-6398: [Java Broker] Update web management console UI to invoke dojo
parser.parse as a promise
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
Fri Feb 20 17:16:04 2015
@@ -34,10 +34,11 @@ define(["dojo/_base/xhr",
show: function (data)
{
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
-
-
registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
- registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ parser.parse(this.containerNode).then(function(instances)
+ {
+
registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+
registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
Fri Feb 20 17:16:04 2015
@@ -22,10 +22,12 @@ define(["dijit/registry", "qpid/common/u
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null);
-
-
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
-
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ util.buildEditUI(data.containerNode,
"virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null,
+ function()
+ {
+
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
Fri Feb 20 17:16:04 2015
@@ -22,10 +22,12 @@ define(["qpid/common/util", "qpid/common
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhost/bdb_ha/edit.html", "editVirtualHost.", null, null);
-
-
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
-
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ util.buildEditUI(data.containerNode,
"virtualhost/bdb_ha/edit.html", "editVirtualHost.", null, null,
+ function()
+ {
+
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
Fri Feb 20 17:16:04 2015
@@ -27,10 +27,13 @@ define(["qpid/common/util", "dojo/query"
function BDB(data)
{
- util.buildUI(data.containerNode, data.parent,
"virtualhost/bdb_ha/show.html", fields, this);
-
- this[localTransactionSynchronizationPolicy]= query("." +
localTransactionSynchronizationPolicy, data.containerNode)[0];
- this[remoteTransactionSynchronizationPolicy]= query("."+
remoteTransactionSynchronizationPolicy, data.containerNode)[0];
+ var that = this;
+ util.buildUI(data.containerNode, data.parent,
"virtualhost/bdb_ha/show.html", fields, this,
+ function()
+ {
+ that[localTransactionSynchronizationPolicy]= query("." +
localTransactionSynchronizationPolicy, data.containerNode)[0];
+ that[remoteTransactionSynchronizationPolicy]= query("."+
remoteTransactionSynchronizationPolicy, data.containerNode)[0];
+ });
}
BDB.prototype.update = function(data)
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
Fri Feb 20 17:16:04 2015
@@ -22,8 +22,11 @@ define(["qpid/common/util", "dijit/regis
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"],
data.data);
- registry.byId("editVirtualHostNode.storePath").set("disabled",
!(data.data.state == "STOPPED" || data.data.state == "ERRORED"));
+ util.buildEditUI(data.containerNode,
"virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"],
data.data,
+ function()
+ {
+ registry.byId("editVirtualHostNode.storePath").set("disabled",
!(data.data.state == "STOPPED" || data.data.state == "ERRORED"));
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
Fri Feb 20 17:16:04 2015
@@ -37,15 +37,21 @@ define(["dojo/_base/xhr",
var that=this;
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
-
- // lookup field
- this.groupChoice = registry.byId("addVirtualHostNode.group");
- this.virtualHostNodeBdbhaTypeFieldsContainer =
dom.byId("addVirtualHostNode.bdbha.typeFields");
-
- // add callback
- this.groupChoice.on("change",
function(type){that._groupChoiceChanged(type,
that.virtualHostNodeBdbhaTypeFieldsContainer,
"qpid/management/virtualhostnode/bdb_ha/add/");});
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ // lookup field
+ that.groupChoice = registry.byId("addVirtualHostNode.group");
+ that.virtualHostNodeBdbhaTypeFieldsContainer =
dom.byId("addVirtualHostNode.bdbha.typeFields");
+ // add callback
+ that.groupChoice.on("change",
+ function(type)
+ {
+ that._groupChoiceChanged(type,
+
that.virtualHostNodeBdbhaTypeFieldsContainer,
+
"qpid/management/virtualhostnode/bdb_ha/add/");
+ });
+ });
},
_groupChoiceChanged: function(type, typeFieldsContainer, urlStem)
{
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
Fri Feb 20 17:16:04 2015
@@ -33,15 +33,15 @@ define(["dojo/_base/xhr",
show: function(data)
{
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
-
- registry.byId("addVirtualHostNode.groupName").set("regExpGen",
util.nameOrContextVarRegexp);
-
registry.byId("addVirtualHostNode.helperNodeName").set("regExpGen",
util.nameOrContextVarRegexp);
- registry.byId("addVirtualHostNode.helperAddress").set("regExpGen",
util.nodeAddressOrContextVarRegexp);
- registry.byId("addVirtualHostNode.address").set("regExpGen",
util.nodeAddressOrContextVarRegexp);
-
- dom.byId("addVirtualHostNode.uploadFields").style.display = "none";
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ registry.byId("addVirtualHostNode.groupName").set("regExpGen",
util.nameOrContextVarRegexp);
+
registry.byId("addVirtualHostNode.helperNodeName").set("regExpGen",
util.nameOrContextVarRegexp);
+
registry.byId("addVirtualHostNode.helperAddress").set("regExpGen",
util.nodeAddressOrContextVarRegexp);
+ registry.byId("addVirtualHostNode.address").set("regExpGen",
util.nodeAddressOrContextVarRegexp);
+ dom.byId("addVirtualHostNode.uploadFields").style.display =
"none";
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
Fri Feb 20 17:16:04 2015
@@ -37,8 +37,15 @@ define(["dojo/_base/xhr",
var that=this;
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ that._postParse(data);
+ });
+ },
+ _postParse: function(data)
+ {
+ var that=this;
this.addVirtualHostNodeAddress =
registry.byId("addVirtualHostNode.address");
this.addVirtualHostNodeAddress.set("regExpGen",
util.nodeAddressOrContextVarRegexp);
@@ -72,7 +79,6 @@ define(["dojo/_base/xhr",
registry.byId("addVirtualHostNode.groupName").set("regExpGen",
util.nameOrContextVarRegexp);
dom.byId("addVirtualHostNode.uploadFields").style.display = "block";
-
},
_updatePermittedNodesJson: function ()
{
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
Fri Feb 20 17:16:04 2015
@@ -32,8 +32,13 @@ define(["qpid/common/util",
return {
show: function(data)
{
+ var that = this;
+ util.buildEditUI(data.containerNode,
"virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, data.data,
+ function(){that._postParse(data);});
+ },
+ _postParse: function(data)
+ {
var node = data.data;
- util.buildEditUI(data.containerNode,
"virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, node);
if ( !(data.data.state == "ERRORED" || data.data.state ==
"STOPPED"))
{
registry.byId("editVirtualHostNode.storePath").set("disabled", true);
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
Fri Feb 20 17:16:04 2015
@@ -82,11 +82,14 @@ define(["dojo/_base/xhr",
function BDBHA(data)
{
- var containerNode = data.containerNode;
this.parent = data.parent;
var that = this;
- util.buildUI(data.containerNode, data.parent,
"virtualhostnode/bdb_ha/show.html", nodeFields, this);
-
+ util.buildUI(data.containerNode, data.parent,
"virtualhostnode/bdb_ha/show.html", nodeFields, this,
function(){that._postParse(data);});
+ };
+ BDBHA.prototype._postParse = function(data)
+ {
+ var that = this;
+ var containerNode = data.containerNode;
this.designatedPrimaryContainer = findNode("designatedPrimaryContainer",
containerNode);
this.priorityContainer = findNode("priorityContainer", containerNode);
this.quorumOverrideContainer = findNode("quorumOverrideContainer",
containerNode);
Modified:
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
Fri Feb 20 17:16:04 2015
@@ -34,10 +34,11 @@ define(["dojo/_base/xhr",
show: function (data)
{
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
-
-
registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
- registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ parser.parse(this.containerNode).then(function(instances)
+ {
+
registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+
registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
Fri Feb 20 17:16:04 2015
@@ -22,10 +22,12 @@ define(["qpid/common/util", "dijit/regis
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null);
-
-
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
-
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ util.buildEditUI(data.containerNode,
"virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null,
+ function()
+ {
+
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
Fri Feb 20 17:16:04 2015
@@ -22,8 +22,11 @@ define(["qpid/common/util", "dijit/regis
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"],
data.data);
- registry.byId("editVirtualHostNode.storePath").set("disabled",
data.data.state != "STOPPED");
+ util.buildEditUI(data.containerNode,
"virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"],
data.data,
+ function()
+ {
+ registry.byId("editVirtualHostNode.storePath").set("disabled",
data.data.state != "STOPPED");
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
Fri Feb 20 17:16:04 2015
@@ -40,13 +40,15 @@ define(["dojo/_base/xhr",
sync: true,
load: function(template) {
containerNode.innerHTML = template;
- parser.parse(containerNode);
+ parser.parse(containerNode).then(function(instances)
+ {
+ for(var i=0; i<fieldNames.length;i++)
+ {
+ var fieldName = fieldNames[i];
+ that[fieldName]= query("." + fieldName, containerNode)[0];
+ }
+ });
}});
- for(var i=0; i<fieldNames.length;i++)
- {
- var fieldName = fieldNames[i];
- this[fieldName]= query("." + fieldName, containerNode)[0];
- }
}
BoneCP.prototype.update=function(data)
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
Fri Feb 20 17:16:04 2015
@@ -36,12 +36,18 @@ define(["dojo/_base/xhr",
return {
show: function (data)
{
+ var that = this;
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ that._postParse(data);
+ });
+ },
+ _postParse: function (data)
+ {
+ var that = this;
registry.byId("addVirtualHost.connectionUrl").set("regExpGen",
util.jdbcUrlOrContextVarRegexp);
registry.byId("addVirtualHost.username").set("regExpGen",
util.nameOrContextVarRegexp);
-
var poolTypes = json.parse(poolTypeJsonString);
var poolTypesData = [];
for (var i =0 ; i < poolTypes.length; i++)
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
Fri Feb 20 17:16:04 2015
@@ -33,8 +33,11 @@ define(["qpid/common/util",
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhost/jdbc/edit.html", "editVirtualHost.", fieldNames, data.data);
-
+ var that = this;
+ util.buildEditUI(data.containerNode,
"virtualhost/jdbc/edit.html", "editVirtualHost.", fieldNames, data.data,
function(){that._postParse(data)});
+ },
+ _postParse: function(data)
+ {
registry.byId("editVirtualHost.connectionUrl").set("regExpGen",
util.jdbcUrlOrContextVarRegexp);
registry.byId("editVirtualHost.username").set("regExpGen",
util.nameOrContextVarRegexp);
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
Fri Feb 20 17:16:04 2015
@@ -25,9 +25,12 @@ define(["qpid/common/util", "dojo/query"
function JDBC(data)
{
- util.buildUI(data.containerNode, data.parent,
"virtualhostnode/jdbc/show.html", fieldNames, this);
- this.usernameAttributeContainer=query(".usernameAttributeContainer",
data.containerNode)[0];
-
this.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer",
data.containerNode)[0];
+ var that = this;
+ util.buildUI(data.containerNode, data.parent,
"virtualhostnode/jdbc/show.html", fieldNames, this, function()
+ {
+
that.usernameAttributeContainer=query(".usernameAttributeContainer",
data.containerNode)[0];
+
that.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer",
data.containerNode)[0];
+ });
}
JDBC.prototype.update = function(data)
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
Fri Feb 20 17:16:04 2015
@@ -38,9 +38,16 @@ define(["dojo/_base/xhr",
return {
show: function (data)
{
+ var that = this;
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ that._postParse(data);
+ });
+ },
+ _postParse: function(data)
+ {
+ var that = this;
registry.byId("addVirtualHostNode.connectionUrl").set("regExpGen",
util.jdbcUrlOrContextVarRegexp);
registry.byId("addVirtualHostNode.username").set("regExpGen",
util.nameOrContextVarRegexp);
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
Fri Feb 20 17:16:04 2015
@@ -32,8 +32,12 @@ define(["qpid/common/util",
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhostnode/jdbc/edit.html", "editVirtualHostNode.", fieldNames,
data.data);
-
+ var that = this;
+ util.buildEditUI(data.containerNode,
"virtualhostnode/jdbc/edit.html", "editVirtualHostNode.",
+ fieldNames, data.data, function(){
that._postParse(data);});
+ },
+ _postParse: function(data)
+ {
registry.byId("editVirtualHostNode.connectionUrl").set("regExpGen",
util.jdbcUrlOrContextVarRegexp);
registry.byId("editVirtualHostNode.username").set("regExpGen",
util.nameOrContextVarRegexp);
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
Fri Feb 20 17:16:04 2015
@@ -27,10 +27,13 @@ define(["qpid/common/util", "dojo/query"
function Jdbc(data)
{
this.parent = data.parent;
- util.buildUI(data.containerNode, data.parent,
"virtualhostnode/jdbc/show.html", fieldNames, this);
-
- this.usernameAttributeContainer=query(".usernameAttributeContainer",
data.containerNode)[0];
-
this.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer",
data.containerNode)[0];
+ var that = this;
+ util.buildUI(data.containerNode, data.parent,
"virtualhostnode/jdbc/show.html", fieldNames, this,
+ function()
+ {
+ that.usernameAttributeContainer=query(".usernameAttributeContainer",
data.containerNode)[0];
+
that.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer",
data.containerNode)[0];
+ });
}
Jdbc.prototype.update=function(data)
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
Fri Feb 20 17:16:04 2015
@@ -45,10 +45,15 @@ return declare("qpid.common.grid.ColumnD
constructor: function(args){
var grid = this.grid = args.grid;
-
+ var that = this;
this.containerNode = dom.create("div", {innerHTML: template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ that._postParse();
+ });
+ },
+ _postParse: function()
+ {
var submitButton = registry.byNode(query(".displayButton",
this.containerNode)[0]);
this.closeButton = registry.byNode(query(".cancelButton",
this.containerNode)[0]);
var columnsContainer = query(".columnList", this.containerNode)[0];
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
Fri Feb 20 17:16:04 2015
@@ -41,11 +41,17 @@ return declare("qpid.management.logs.Row
grid: null,
dialog: null,
- constructor: function(domNode, limitChangedCallback){
-
+ constructor: function(domNode, limitChangedCallback)
+ {
+ var that = this;
this.containerNode = dom.create("div", {innerHTML: template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ that._postParse(domNode, limitChangedCallback);
+ });
+ },
+ _postParse: function(domNode, limitChangedCallback)
+ {
this.rowNumberLimit = registry.byNode(query(".rowNumberLimit",
this.containerNode)[0])
this.submitButton = registry.byNode(query(".submitButton",
this.containerNode)[0]);
this.closeButton = registry.byNode(query(".cancelButton",
this.containerNode)[0]);
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Fri Feb 20 17:16:04 2015
@@ -528,40 +528,64 @@ define(["dojo/_base/xhr",
return object1 === object2;
}
- util.parseHtmlIntoDiv = function(containerNode,
htmlTemplateLocation)
+ util.parseHtmlIntoDiv = function(containerNode,
htmlTemplateLocation, postParseCallback)
{
xhr.get({url: htmlTemplateLocation,
sync: true,
load: function(template) {
containerNode.innerHTML = template;
- parser.parse(containerNode);
+
parser.parse(containerNode).then(function(instances)
+ {
+ if
(postParseCallback && typeof postParseCallback == "function")
+ {
+
postParseCallback();
+ }
+ });
}});
}
- util.buildUI = function(containerNode, parent,
htmlTemplateLocation, fieldNames, obj)
+ util.buildUI = function(containerNode, parent,
htmlTemplateLocation, fieldNames, obj, postParseCallback)
{
- this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation);
- if (fieldNames && obj)
- {
- for(var i=0; i<fieldNames.length;i++)
+ this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation,
+ function()
+ {
+ if (fieldNames && obj)
{
- var fieldName = fieldNames[i];
- obj[fieldName]= query("." + fieldName,
containerNode)[0];
+ for(var i=0; i<fieldNames.length;i++)
+ {
+ var fieldName = fieldNames[i];
+ obj[fieldName]= query("." + fieldName,
containerNode)[0];
+ }
}
- }
+
+ if (postParseCallback && typeof postParseCallback ==
"function")
+ {
+ postParseCallback();
+ }
+ });
+
}
- util.buildEditUI = function(containerNode, htmlTemplateLocation,
fieldNamePrefix, fieldNames, data)
+ util.buildEditUI = function(containerNode, htmlTemplateLocation,
fieldNamePrefix, fieldNames, data, postParseCallback)
{
- this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation);
- if (fieldNames)
+ this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation,
function()
{
+
+ if (fieldNames)
+ {
for(var i = 0; i < fieldNames.length; i++)
{
var fieldName = fieldNames[i];
var widget = registry.byId(fieldNamePrefix + fieldName);
widget.set("value", data[fieldName]);
}
- }
+ }
+
+ if (postParseCallback && typeof postParseCallback ==
"function")
+ {
+ postParseCallback();
+ }
+
+ });
}
util.updateUI = function(data, fieldNames, obj)
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
Fri Feb 20 17:16:04 2015
@@ -52,17 +52,19 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
- that.accessControlProviderUpdater = new
AccessControlProviderUpdater(contentPane.containerNode, that.modelObj,
that.controller);
+ that.accessControlProviderUpdater = new
AccessControlProviderUpdater(contentPane.containerNode, that.modelObj,
that.controller);
- var deleteButton =
query(".deleteAccessControlProviderButton", contentPane.containerNode)[0];
- var deleteWidget = registry.byNode(deleteButton);
- connect.connect(deleteWidget, "onClick",
+ var deleteButton =
query(".deleteAccessControlProviderButton", contentPane.containerNode)[0];
+ var deleteWidget =
registry.byNode(deleteButton);
+ connect.connect(deleteWidget, "onClick",
function(evt){
event.stop(evt);
that.deleteAccessControlProvider();
});
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
Fri Feb 20 17:16:04 2015
@@ -56,7 +56,8 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
var authProviderUpdater = new
AuthProviderUpdater(contentPane.containerNode, that.modelObj, that.controller,
that);
that.authProviderUpdater = authProviderUpdater;
@@ -97,6 +98,7 @@ define(["dojo/_base/xhr",
}
updater.add( that.authProviderUpdater );
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Fri Feb 20 17:16:04 2015
@@ -82,14 +82,10 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
-
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
that.brokerUpdater = new
BrokerUpdater(contentPane.containerNode, that.modelObj, that.controller);
- updater.add( that.brokerUpdater );
-
- that.brokerUpdater.update();
-
var logViewerButton = query(".logViewer",
contentPane.containerNode)[0];
registry.byNode(logViewerButton).on("click",
function(evt){
that.controller.show("logViewer", "");
@@ -233,6 +229,7 @@ define(["dojo/_base/xhr",
"Are you sure you want to
delete access control provider");
}
);
+ });
}});
};
@@ -554,6 +551,9 @@ define(["dojo/_base/xhr",
});
}, gridProperties,
EnhancedGrid);
that.displayACLWarnMessage(aclData);
+
+ updater.add( that);
+
});
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
Fri Feb 20 17:16:04 2015
@@ -50,14 +50,12 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
-
- that.connectionUpdater = new
ConnectionUpdater(contentPane.containerNode, that.modelObj, that.controller);
-
- updater.add( that.connectionUpdater );
-
- that.connectionUpdater.update();
-
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
+ that.connectionUpdater = new
ConnectionUpdater(contentPane.containerNode, that.modelObj, that.controller);
+ updater.add( that.connectionUpdater );
+ that.connectionUpdater.update();
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
Fri Feb 20 17:16:04 2015
@@ -69,7 +69,8 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
that.exchangeUpdater = new
ExchangeUpdater(contentPane.containerNode, that.modelObj, that.controller);
@@ -106,7 +107,7 @@ define(["dojo/_base/xhr",
that.deleteExchange();
});
}
-
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
Fri Feb 20 17:16:04 2015
@@ -56,8 +56,13 @@ define(["dojo/_base/xhr",
var that = this;
this.contentPane = contentPane;
contentPane.containerNode.innerHTML = template;
- parser.parse(contentPane.containerNode);
+
parser.parse(contentPane.containerNode).then(function(instances) {
that.onOpen(); });
+ };
+ GroupProvider.prototype.onOpen = function()
+ {
+ var that = this;
+ var contentPane = this.contentPane;
this.groupProviderUpdater = new
GroupProviderUpdater(contentPane.containerNode, this.modelObj, this.controller);
// load data
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
Fri Feb 20 17:16:04 2015
@@ -51,7 +51,8 @@ define(["dojo/dom",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
that.keyStoreUpdater = new
KeyStoreUpdater(contentPane.containerNode, that.modelObj, that.controller,
that.url);
that.keyStoreUpdater.update();
@@ -75,6 +76,7 @@ define(["dojo/dom",
addStore.show(data[0], that.url);
});
});
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
Fri Feb 20 17:16:04 2015
@@ -48,9 +48,10 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
-
- that.pluginUpdater = new
PluginUpdater(contentPane.containerNode, that.modelObj, that.controller);
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
+ that.pluginUpdater = new
PluginUpdater(contentPane.containerNode, that.modelObj, that.controller);
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
Fri Feb 20 17:16:04 2015
@@ -51,8 +51,8 @@ define(["dojo/dom",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
-
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
that.portUpdater = new
PortUpdater(contentPane.containerNode, that.modelObj, that.controller,
"api/latest/port/" + encodeURIComponent(that.name));
updater.add( that.portUpdater );
@@ -72,6 +72,7 @@ define(["dojo/dom",
function(evt){
that.showEditDialog();
});
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
Fri Feb 20 17:16:04 2015
@@ -65,8 +65,15 @@ function (declare, xhr, event, connect,
this.userPreferences = {};
this.domNode = domConstruct.create("div", {innerHTML: markup});
- this.preferencesDialog = parser.parse(this.domNode)[0];
-
+ parser.parse(this.domNode).then(function(instances)
+ {
+ that._postParse();
+ });
+ },
+ _postParse: function()
+ {
+ var that = this;
+ this.preferencesDialog = registry.byId("preferences.preferencesDialog");
for(var i=0; i<preferenceNames.length; i++)
{
var name = preferenceNames[i];
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
Fri Feb 20 17:16:04 2015
@@ -51,8 +51,8 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
node.innerHTML = data;
- parser.parse(node);
-
+ parser.parse(node).then(function(instances)
+ {
that.containerNode = node;
that.parentObject = parentObject;
that.preferencesProviderType=query(".preferencesProviderType", node)[0];
@@ -65,6 +65,7 @@ define(["dojo/_base/xhr",
editPreferencesProviderWidget.on("click", function(evt){
event.stop(evt); that.editPreferencesProvider();});
var deletePreferencesProviderWidget =
registry.byNode(that.deletePreferencesProviderButton);
deletePreferencesProviderWidget.on("click", function(evt){
event.stop(evt); that.deletePreferencesProvider();});
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
Fri Feb 20 17:16:04 2015
@@ -79,7 +79,8 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
that.queueUpdater = new
QueueUpdater(contentPane.containerNode, that, that.controller);
@@ -180,6 +181,8 @@ define(["dojo/_base/xhr",
editQueue.show({nodeName:that.modelObj.parent.parent.name,
hostName:that.modelObj.parent.name,queueName:that.name});
});
UserPreferences.addListener(that);
+
+ });
}});
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
Fri Feb 20 17:16:04 2015
@@ -51,7 +51,8 @@ define(["dojo/dom",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
that.keyStoreUpdater = new
KeyStoreUpdater(contentPane.containerNode, that.modelObj, that.controller,
that.url);
that.keyStoreUpdater.update();
@@ -75,6 +76,7 @@ define(["dojo/dom",
addStore.show(data[0], that.url);
});
});
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
Fri Feb 20 17:16:04 2015
@@ -55,8 +55,8 @@ define(["dojo/_base/xhr",
load: function(data) {
var containerNode = contentPane.containerNode;
containerNode.innerHTML = data;
- parser.parse(containerNode);
-
+
parser.parse(containerNode).then(function(instances)
+ {
that.vhostUpdater = new Updater(containerNode,
that.modelObj, that.controller, that);
var addQueueButton = query(".addQueueButton",
containerNode)[0];
@@ -149,6 +149,7 @@ define(["dojo/_base/xhr",
that.vhostUpdater.update();
updater.add( that.vhostUpdater );
+ });
}});
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
Fri Feb 20 17:16:04 2015
@@ -56,8 +56,10 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
- that.onOpen(contentPane.containerNode)
+
parser.parse(contentPane.containerNode).then(function(instances)
+ {
+ that.onOpen(contentPane.containerNode)
+ });
}});
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
Fri Feb 20 17:16:04 2015
@@ -53,14 +53,14 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
node.innerHTML = data;
- parser.parse(node);
-
+
parser.parse(node).then(function(instances)
+ {
that.groupDatabaseUpdater= new
AclFileUpdater(node, aclProviderObj, controller);
updater.add(
that.groupDatabaseUpdater);
that.groupDatabaseUpdater.update();
-
+ });
}});
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js
Fri Feb 20 17:16:04 2015
@@ -31,8 +31,11 @@ define(["dojo/dom","dojo/query","dijit/r
show: function(data)
{
var that=this;
- util.parseHtmlIntoDiv(data.containerNode,
"accesscontrolprovider/aclfile/add.html");
-
+ util.parseHtmlIntoDiv(data.containerNode,
"accesscontrolprovider/aclfile/add.html", function(){that._postParse(data);});
+ },
+ _postParse: function(data)
+ {
+ var that=this;
this.aclServerPath =
registry.byId("addAccessControlProvider.serverPath");
this.aclUploadFields =
dom.byId("addAccessControlProvider.uploadFields");
this.aclSelectedFileContainer =
dom.byId("addAccessControlProvider.selectedFile");
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
Fri Feb 20 17:16:04 2015
@@ -53,8 +53,11 @@ define(["dojo/_base/lang",
{
var that=this;
this.containerNode = construct.create("div", {innerHTML:
template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances){
that._postParse(); });
+ },
+ _postParse: function()
+ {
+ var that=this;
this.accessControlProviderName =
registry.byId("addAccessControlProvider.name");
this.accessControlProviderName.set("regExpGen",
util.nameOrContextVarRegexp);
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
Fri Feb 20 17:16:04 2015
@@ -56,8 +56,11 @@ define(["dojo/_base/xhr",
{
var that=this;
this.containerNode = construct.create("div", {innerHTML:
template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances) {
that._postParse(); });
+ },
+ _postParse: function()
+ {
+ var that = this;
this.authenticationProviderName =
registry.byId("addAuthenticationProvider.name");
this.authenticationProviderName.set("regExpGen",
util.nameOrContextVarRegexp);
this.authenticationProviderName.on("change",
function(newValue){that.preferencesProviderForm.preferencesProviderNameWidget.set("value",newValue);});
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
Fri Feb 20 17:16:04 2015
@@ -53,8 +53,11 @@ define([
{
var that=this;
this.containerNode = construct.create("div", {innerHTML:
template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances) {
that._postParse(); });
+ },
+ _postParse: function()
+ {
+ var that=this;
this.groupProviderName =
registry.byId("addGroupProvider.name");
this.groupProviderName.set("regExpGen",
util.nameOrContextVarRegexp);
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
Fri Feb 20 17:16:04 2015
@@ -40,8 +40,11 @@ define([
{
var that=this;
this.containerNode = construct.create("div", {innerHTML:
template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances) {
that._postParse(); });
+ },
+ _postParse: function()
+ {
+ var that=this;
this.preferencesProviderForm =
registry.byId("addPreferencesProvider.preferencesProvider");
this.dialog = registry.byId("addPreferencesProvider");
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
Fri Feb 20 17:16:04 2015
@@ -53,8 +53,11 @@ define(["dojo/_base/lang",
{
var that=this;
this.containerNode = construct.create("div", {innerHTML:
template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances) {
that._postParse(); });
+ },
+ _postParse: function()
+ {
+ var that=this;
this.storeName = registry.byId("addStore.name");
this.storeName.set("regExpGen", util.nameOrContextVarRegexp);
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
Fri Feb 20 17:16:04 2015
@@ -57,8 +57,11 @@ define(["dojo/_base/xhr",
{
var that=this;
this.containerNode = domConstruct.create("div", {innerHTML: template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances) {
that._postParse(); });
+ },
+ _postParse: function()
+ {
+ var that=this;
var virtualHostNodeName = registry.byId("addVirtualHostNode.nodeName");
virtualHostNodeName.set("regExpGen", util.nameOrContextVarRegexp);
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
Fri Feb 20 17:16:04 2015
@@ -51,8 +51,10 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
node.innerHTML = data;
- parser.parse(node);
- that.init(node, authProviderObj,
controller);
+
parser.parse(node).then(function(instances)
+ {
+ that.init(node, authProviderObj,
controller);
+ });
}});
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
Fri Feb 20 17:16:04 2015
@@ -24,12 +24,15 @@ define(["dojo/query","dijit/registry","q
return {
show: function(data)
{
- util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/filebased/add.html");
- if (data.data)
+ util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/filebased/add.html",
+ function()
{
- var path = registry.byNode(query(".path",
data.containerNode)[0]);
- path.set("value", data.data.path);
- }
+ if (data.data)
+ {
+ var path = registry.byNode(query(".path",
data.containerNode)[0]);
+ path.set("value", data.data.path);
+ }
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js
Fri Feb 20 17:16:04 2015
@@ -24,12 +24,15 @@ define(["dojo/query","dijit/registry","q
return {
show: function(data)
{
- util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/external/add.html");
- if (data.data)
+ util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/external/add.html",
+ function()
{
- var useFullDN = registry.byNode(query(".useFullDN",
data.containerNode)[0]);
- useFullDN.set("value", data.data.useFullDN);
- }
+ if (data.data)
+ {
+ var useFullDN = registry.byNode(query(".useFullDN",
data.containerNode)[0]);
+ useFullDN.set("value", data.data.useFullDN);
+ }
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
Fri Feb 20 17:16:04 2015
@@ -24,12 +24,15 @@ define(["dojo/query","dijit/registry","q
return {
show: function(data)
{
- util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/filebased/add.html");
- if (data.data)
+ util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/filebased/add.html",
+ function()
{
- var path = registry.byNode(query(".path",
data.containerNode)[0]);
- path.set("value", data.data.path);
- }
+ if (data.data)
+ {
+ var path = registry.byNode(query(".path",
data.containerNode)[0]);
+ path.set("value", data.data.path);
+ }
+ });
}
};
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js?rev=1661166&r1=1661165&r2=1661166&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
Fri Feb 20 17:16:04 2015
@@ -24,8 +24,11 @@ define(["dojo/_base/xhr","dojo/query","d
return {
show: function(data)
{
- util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/simpleldap/add.html");
-
+ var that = this;
+ util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/simpleldap/add.html",
function(){that._postParse(data);});
+ },
+ _postParse: function(data)
+ {
var that = this;
xhr.get({url: "api/latest/truststore", sync: true, handleAs:
"json"}).then(
function(trustStores)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
