You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/03/03 15:56:42 UTC
svn commit: r1663717 [4/6] - in
/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: ./
amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/
amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/
amqp-1-0-common/src/main/java/org/a...
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Tue Mar 3 14:56:40 2015
@@ -65,8 +65,8 @@ import org.apache.qpid.filter.selector.P
import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.consumer.ConsumerImpl;
import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.filter.FilterManager;
import org.apache.qpid.server.filter.JMSSelectorFilter;
-import org.apache.qpid.server.filter.SimpleFilterManager;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.model.ExclusivityPolicy;
@@ -154,15 +154,7 @@ public class SendingLink_1_0 implements
actualFilters.put(entry.getKey(), entry.getValue());
}
- catch (ParseException e)
- {
- Error error = new Error();
- error.setCondition(AmqpError.INVALID_FIELD);
- error.setDescription("Invalid JMS Selector: " + selectorFilter.getValue());
- error.setInfo(Collections.singletonMap(Symbol.valueOf("field"), Symbol.valueOf("filter")));
- throw new AmqpErrorException(error);
- }
- catch (SelectorParsingException e)
+ catch (ParseException | SelectorParsingException e)
{
Error error = new Error();
error.setCondition(AmqpError.INVALID_FIELD);
@@ -374,8 +366,16 @@ public class SendingLink_1_0 implements
{
name = getEndpoint().getName();
}
+
+ FilterManager filters = null;
+ if(messageFilter != null)
+ {
+ filters = new FilterManager();
+ filters.add(messageFilter.getName(), messageFilter);
+ }
+
_consumer = _queue.addConsumer(_target,
- messageFilter == null ? null : new SimpleFilterManager(messageFilter),
+ filters,
Message_1_0.class, name, options);
}
catch (MessageSource.ExistingExclusiveConsumer e)
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js Tue Mar 3 14:56:40 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.parseHtmlIntoDiv(data.containerNode, "virtualhost/sizemonitoring/edit.html",
+ function()
+ {
+ registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+ registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+ });
}
};
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js Tue Mar 3 14:56:40 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.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/filebased/edit.html",
+ function()
+ {
+ registry.byId("editVirtualHostNode.storePath").set("disabled", data.data.state != "STOPPED");
+ });
}
};
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js Tue Mar 3 14:56:40 2015
@@ -29,12 +29,15 @@ define(["qpid/common/util",
function (util, poolTypeJsonString, array, json, string, Memory, dom, domConstruct, registry)
{
- var fieldNames = ["connectionUrl", "username", "connectionPoolType"];
return {
show: function(data)
{
- util.buildEditUI(data.containerNode, "virtualhost/jdbc/edit.html", "editVirtualHost.", fieldNames, data.data);
-
+ var that = this;
+ util.parseHtmlIntoDiv(data.containerNode, "virtualhost/jdbc/edit.html",
+ 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js Tue Mar 3 14:56:40 2015
@@ -28,12 +28,14 @@ define(["qpid/common/util",
"dojo/domReady!"],
function (util, poolTypeJsonString, array, json, string, Memory, dom, domConstruct, registry)
{
- var fieldNames = ["connectionUrl", "username", "connectionPoolType"];
return {
show: function(data)
{
- util.buildEditUI(data.containerNode, "virtualhostnode/jdbc/edit.html", "editVirtualHostNode.", fieldNames, data.data);
-
+ var that = this;
+ util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/jdbc/edit.html", 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Tue Mar 3 14:56:40 2015
@@ -69,6 +69,7 @@ import org.apache.qpid.server.management
import org.apache.qpid.server.management.plugin.servlet.rest.MessageContentServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.MessageServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.MetaDataServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.QueueReportServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.SaslServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.StructureServlet;
@@ -304,6 +305,8 @@ public class HttpManagement extends Abst
root.addServlet(new ServletHolder(new StructureServlet()), "/service/structure");
root.addServlet(new ServletHolder(new MessageServlet()), "/service/message/*");
root.addServlet(new ServletHolder(new MessageContentServlet()), "/service/message-content/*");
+ root.addServlet(new ServletHolder(new QueueReportServlet()), "/service/queuereport/*");
+
root.addServlet(new ServletHolder(new LogRecordsServlet()), "/service/logrecords");
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java Tue Mar 3 14:56:40 2015
@@ -162,14 +162,14 @@ public class ConfiguredObjectToMapConver
.getAttributeTypes(confObject.getClass())
.get(name);
- if (attribute.isSecure() && !(isSecureTransport && extractAsConfig))
+ if (attribute.isSecureValue(value) && !(isSecureTransport && extractAsConfig))
{
// do not expose actual secure attribute value
// getAttribute() returns encoded value
value = confObject.getAttribute(name);
}
- if(attribute.isOversized() && !extractAsConfig)
+ if(attribute.isOversized() && !extractAsConfig && !useActualValues)
{
String valueString = String.valueOf(value);
if(valueString.length() > oversizeThreshold)
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html Tue Mar 3 14:56:40 2015
@@ -159,6 +159,23 @@
</div>
</div>
+ <div id="formAddPort:maxOpenConnections" >
+ <div class="clear">
+ <div class="formLabel-labelCell">
+ <label for="formAddPort.transports">Maximum number of connections:</label>
+ </div>
+ <div class="formLabel-controlCell">
+ <input id="formAddPort.maxOpenConnections" type="text"
+ data-dojo-type="dijit.form.ValidationTextBox"
+ data-dojo-props="
+ name: 'maxOpenConnections',
+ placeHolder: 'maximum number of connections',
+ promptMessage: 'Maximum number of concurrent connections permitted by this port. The <code>-1</code> signifies no limit is imposed.',
+ title: 'Enter a maximum number of connections'"/>
+ </div>
+ </div>
+ </div>
+
<div id="formAddPort:fieldsTransportSSL">
<div class="clear">
<div class="formLabel-labelCell">
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html Tue Mar 3 14:56:40 2015
@@ -19,31 +19,34 @@
<div class="dijitHidden">
<div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit Virtual Host'" id="editVirtualHostNodeDialog">
<form id="editVirtualHostNodeForm" method="post" data-dojo-type="dijit/form/Form">
- <div id="editVirtualHostNode.contentPane">
- <div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host Node restart.</div>
- <div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
- <div class="formLabel-controlCell tableContainer-valueCell">
- <input type="text" id="editVirtualHostNode.name"
- data-dojo-type="dijit/form/ValidationTextBox"
- data-dojo-props="
+ <div id="editVirtualHostNode.allFields">
+ <div id="editVirtualHostNode.contentPane">
+ <div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host Node restart.</div>
+ <div class="clear">
+ <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="text" id="editVirtualHostNode.name"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
name: 'name',
placeHolder: 'name',
required: true,
missingMessage: 'Name must be supplied',
disabled: true,
title: 'Enter virtual host name'" />
- </div>
- </div>
+ </div>
+ </div>
- <div id="editVirtualHostNode.typeFields"></div>
+ <div id="editVirtualHostNode.typeFields"></div>
- <div class="clear"></div>
+ <div class="clear"></div>
- <div data-dojo-type="dijit/TitlePane" data-dojo-props="title: 'Context variables', open: false">
- <div id="editVirtualHostNode.context" ></div>
+ <div data-dojo-type="dijit/TitlePane" data-dojo-props="title: 'Context variables', open: false">
+ <div id="editVirtualHostNode.context" ></div>
+ </div>
+ </div>
</div>
- </div>
+
<div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
<button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.saveButton" data-dojo-props="label: 'Save'">Save</button>
<button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js Tue Mar 3 14:56:40 2015
@@ -44,6 +44,7 @@ function (declare, array, lang, util, _W
fileReaderSupported: window.FileReader ? true : false,
displayWarningWhenFileReaderUnsupported: false,
isDebug: false,
+ uploaded: false,
buildRendering: function()
{
@@ -74,7 +75,7 @@ function (declare, array, lang, util, _W
{
// Fall back for IE8/9 which do not support FileReader
this.uploadFields.style.display = "none";
- if (displayWarningWhenFileReaderUnsupported)
+ if (this.displayWarningWhenFileReaderUnsupported)
{
this.unsupportedWarning.className = this.unsupportedWarning.className.replace("hidden", "");
}
@@ -127,6 +128,7 @@ function (declare, array, lang, util, _W
},
_fileClearButtonClicked: function(event)
{
+ this.uploaded = false;
this.uploader.reset();
this.set("value", this._resetValue);
},
@@ -134,20 +136,17 @@ function (declare, array, lang, util, _W
{
var serverPathValue = this.resourceLocation.get("value") || this._resetValue;
this.set("value", serverPathValue);
+ if (this.uploaded )
+ {
+ this.uploaded = !serverPathValue;
+ }
},
_setValueAttr: function(newValue, priorityChange)
{
- var isDataUrl = newValue && newValue.indexOf("data:") == 0;
+ var isDataUrl = this.uploaded || ( newValue && newValue.indexOf("data:") == 0 );
if (isDataUrl)
{
- this.uploadData.style.display = "block";
- this.selectedFileStatus.className = "loadedIcon";
- this.selectedFile.innerHTML = this.selectedFileName || "uploaded data";
- this.resourceLocation.set("value", "");
- this.resourceLocation.setDisabled(true);
- this.resourceLocation.set("required", false);
- this.clearButton.setDisabled(false);
- this.selectedFileStatus.className = "loadedIcon";
+ this._initUploaded(true);
}
else
{
@@ -172,6 +171,25 @@ function (declare, array, lang, util, _W
_setPlaceHolderAttr: function(newValue)
{
this.resourceLocation.set("placeHolder", newValue);
+ },
+ _setUploadedAttr: function(uploaded)
+ {
+ this.uploaded = uploaded;
+ this._initUploaded(uploaded);
+ },
+ _initUploaded: function(uploaded)
+ {
+ if (uploaded)
+ {
+ this.uploadData.style.display = "block";
+ this.selectedFileStatus.className = "loadedIcon";
+ this.selectedFile.innerHTML = this.selectedFileName || "uploaded data";
+ this.resourceLocation.set("value", "");
+ this.resourceLocation.setDisabled(true);
+ this.resourceLocation.set("required", false);
+ this.clearButton.setDisabled(false);
+ this.selectedFileStatus.className = "loadedIcon";
+ }
}
}
);
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js Tue Mar 3 14:56:40 2015
@@ -528,40 +528,41 @@ 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];
+ }
}
- }
- }
- util.buildEditUI = function(containerNode, htmlTemplateLocation, fieldNamePrefix, fieldNames, data)
- {
- this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation);
- 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)
@@ -736,6 +737,11 @@ define(["dojo/_base/xhr",
return "^(\\d+)|" + singleContextVarRegexp + "$";
}
+ util.signedOrContextVarRegexp = function(constraints)
+ {
+ return "^(-?\\d+)|" + singleContextVarRegexp + "$";
+ }
+
util.nameOrContextVarRegexp = function(constraints)
{
return "^(\\w+)|" + singleContextVarRegexp + "$";
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js Tue Mar 3 14:56:40 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();
});
+ });
}});
};
@@ -137,12 +138,15 @@ define(["dojo/dom",
"needClientAuthValue",
"wantClientAuthValue",
"trustStoresValue",
+ "connectionCountValue",
+ "maxOpenConnectionsValue",
"authenticationProvider",
"bindingAddress",
"keyStore",
"needClientAuth",
"wantClientAuth",
- "trustStores"
+ "trustStores",
+ "maxOpenConnections"
]);
this.query = url;
@@ -150,6 +154,7 @@ define(["dojo/dom",
xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data)
{
that.portData = data[0];
+ util.flattenStatistics( that.portData );
that.updateHeader();
});
@@ -177,6 +182,9 @@ define(["dojo/dom",
this.protocolsValue.innerHTML = printArray( "protocols", this.portData);
this.transportsValue.innerHTML = printArray( "transports", this.portData);
this.bindingAddressValue.innerHTML = this.portData[ "bindingAddress" ] ? entities.encode(String(this.portData[ "bindingAddress" ])) : "" ;
+ this.connectionCountValue.innerHTML = this.portData[ "connectionCount" ] ? entities.encode(String(this.portData[ "connectionCount" ])) : "0" ;
+ this.maxOpenConnectionsValue.innerHTML = (this.portData[ "maxOpenConnections" ] && this.portData[ "maxOpenConnections" ] >= 0) ? entities.encode(String(this.portData[ "maxOpenConnections" ])) : "(no limit)" ;
+
this.keyStoreValue.innerHTML = this.portData[ "keyStore" ] ? entities.encode(String(this.portData[ "keyStore" ])) : "";
this.needClientAuthValue.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.portData[ "needClientAuth" ] ? "checked='checked'": "")+" />" ;
this.wantClientAuthValue.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.portData[ "wantClientAuth" ] ? "checked='checked'": "")+" />" ;
@@ -190,6 +198,9 @@ define(["dojo/dom",
this.needClientAuth.style.display = "needClientAuth" in typeMetaData.attributes ? "block" : "none";
this.wantClientAuth.style.display = "wantClientAuth" in typeMetaData.attributes ? "block" : "none";
this.trustStores.style.display = "trustStores" in typeMetaData.attributes ? "block" : "none";
+
+ this.maxOpenConnections.style.display = "maxOpenConnections" in typeMetaData.attributes ? "block" : "none";
+
};
PortUpdater.prototype.update = function()
@@ -200,6 +211,7 @@ define(["dojo/dom",
xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data)
{
thisObj.portData = data[0];
+ util.flattenStatistics( thisObj.portData );
thisObj.updateHeader();
});
};
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js Tue Mar 3 14:56:40 2015
@@ -79,6 +79,10 @@ define(["dojo/_base/xhr",
registry.byId("formAddPort.bindingAddress").set("disabled", ! ("bindingAddress" in typeMetaData.attributes));
dom.byId("formAddPort:fieldsBindingAddress").style.display = "bindingAddress" in typeMetaData.attributes ? "block" : "none";
+ //maxOpenConnections
+ registry.byId("formAddPort.maxOpenConnections").set("disabled", ! ("maxOpenConnections" in typeMetaData.attributes));
+ dom.byId("formAddPort:maxOpenConnections").style.display = "maxOpenConnections" in typeMetaData.attributes ? "block" : "none";
+
//transports
var transportsMultiSelect = dom.byId("formAddPort.transports");
var transportsValidValues = typeMetaData.attributes.transports.validValues;
@@ -314,6 +318,7 @@ define(["dojo/_base/xhr",
var nameWidget = registry.byId("formAddPort.name");
var typeWidget = registry.byId("formAddPort.type");
var portWidget = registry.byId("formAddPort.port");
+ var maxOpenConnectionsWidget = registry.byId("formAddPort.maxOpenConnections");
var editWarning = dojo.byId("portEditWarning");
var providerWidget = registry.byId("formAddPort.authenticationProvider");
@@ -418,6 +423,13 @@ define(["dojo/_base/xhr",
bindAddressWidget.set("disabled", ! ("bindingAddress" in typeMetaData.attributes));
dom.byId("formAddPort:fieldsBindingAddress").style.display = "bindingAddress" in typeMetaData.attributes ? "block" : "none";
+ //maxOpenConnections
+ var maxOpenConnectionsWidget = registry.byId("formAddPort.maxOpenConnections");
+ maxOpenConnectionsWidget.set("regExpGen", util.signedOrContextVarRegexp);
+ maxOpenConnectionsWidget.set("value", port.maxOpenConnections ? port.maxOpenConnections : "");
+ maxOpenConnectionsWidget.set("disabled", ! ("maxOpenConnections" in typeMetaData.attributes));
+ dom.byId("formAddPort:maxOpenConnections").style.display = "maxOpenConnections" in typeMetaData.attributes ? "block" : "none";
+
//ssl
keystoreWidget.set("value", port.keyStore ? port.keyStore : "");
if (port.trustStores)
@@ -447,6 +459,7 @@ define(["dojo/_base/xhr",
truststoreWidget.initialValue = port.trustStores;
transportWidget.initialValue = transportWidget.value;
providerWidget.initialValue = providerWidget.value;
+ maxOpenConnectionsWidget.initialValue = maxOpenConnectionsWidget.value;
registry.byId("addPort").show();
util.applyMetadataToWidgets(registry.byId("addPort").domNode, "Port", portType);
@@ -465,8 +478,8 @@ define(["dojo/_base/xhr",
nameWidget.set("disabled", false);
nameWidget.set("regExpGen", util.nameOrContextVarRegexp);
-
portWidget.set("regExpGen", util.numericOrContextVarRegexp);
+ maxOpenConnectionsWidget.set("regExpGen", util.signedOrContextVarRegexp);
editWarning.style.display = "none";
registry.byId("addPort").show();
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js Tue Mar 3 14:56:40 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);
@@ -81,11 +84,11 @@ define(["dojo/_base/lang",
show: function(effectiveData)
{
this.effectiveData = effectiveData;
+ this._destroyTypeFields(this.containerNode);
this.storeForm.reset();
if (effectiveData)
{
- this._destroyTypeFields(this.containerNode);
this._initFields(effectiveData);
}
this.storeName.set("disabled", effectiveData == null ? false : true);
@@ -185,11 +188,6 @@ define(["dojo/_base/lang",
{
typeUI.show({containerNode:typeFieldsContainer, parent: that, data: that.initialData, effectiveData: that.effectiveData});
util.applyMetadataToWidgets(typeFieldsContainer, category, type);
- if (that.effectiveData)
- {
- typeUI.update(that.effectiveData);
- that.effectiveData = undefined;
- }
}
catch(e)
{
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js Tue Mar 3 14:56:40 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/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js Tue Mar 3 14:56:40 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);
+ }
+ });
}
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org