You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/05/22 20:28:26 UTC
qpid-broker-j git commit: QPID-8165: [Broker-J][WMC] Fix RegEx to
allow more characters in configured object names
Repository: qpid-broker-j
Updated Branches:
refs/heads/7.0.x dc2fa863d -> 9286ee01b
QPID-8165: [Broker-J][WMC] Fix RegEx to allow more characters in configured object names
(cherry picked from commit c8fae15492a09155039a61d11bf7d2dbdc280c65)
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/9286ee01
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/9286ee01
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/9286ee01
Branch: refs/heads/7.0.x
Commit: 9286ee01b1f7519762f8dd0d447679418ef002e4
Parents: dc2fa86
Author: Alex Rudyy <or...@apache.org>
Authored: Wed May 2 16:40:51 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue May 22 21:15:27 2018 +0100
----------------------------------------------------------------------
.../virtualhostnode/bdb_ha/add/existinggroup/add.js | 2 +-
.../management/virtualhostnode/bdb_ha/add/newgroup/add.js | 2 +-
.../src/main/java/resources/js/qpid/common/util.js | 9 +++++++--
.../js/qpid/management/addVirtualHostNodeAndVirtualHost.js | 2 +-
.../qpid/management/virtualhostalias/hostnamealias/add.js | 2 +-
.../management/virtualhostalias/patternmatchingalias/add.js | 2 +-
6 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9286ee01/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js b/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
index 529311a..767e417 100644
--- a/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
+++ b/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
@@ -36,7 +36,7 @@ define(["dojo/_base/xhr",
.then(function (instances)
{
registry.byId("addVirtualHostNode.groupName")
- .set("regExpGen", util.nameOrContextVarRegexp);
+ .set("regExpGen", util.virtualHostNameOrContextVarRegexp);
registry.byId("addVirtualHostNode.helperNodeName")
.set("regExpGen", util.nameOrContextVarRegexp);
registry.byId("addVirtualHostNode.helperAddress")
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9286ee01/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js b/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
index cf74d75..60edc5f 100644
--- a/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
+++ b/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
@@ -96,7 +96,7 @@ define(["dojo/_base/xhr",
this.addVirtualHostNodePermittedNodes = registry.byId("addVirtualHostNode.permittedNodes");
registry.byId("addVirtualHostNode.groupName")
- .set("regExpGen", util.nameOrContextVarRegexp);
+ .set("regExpGen", util.virtualHostNameOrContextVarRegexp);
dom.byId("addVirtualHostNode.uploadFields").style.display = "block";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9286ee01/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
index b6a395c..52c6c43 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
@@ -813,13 +813,18 @@ define(["dojo/_base/xhr",
util.nameOrContextVarRegexp = function (constraints)
{
- return "^(\\w+)|" + singleContextVarRegexp + "$";
+ return "^([0-9a-zA-Z\\-_.:]+)|" + singleContextVarRegexp + "$";
+ };
+
+ util.virtualHostNameOrContextVarRegexp = function (constraints)
+ {
+ return "^([0-9a-zA-Z\\-_]+)|" + singleContextVarRegexp + "$";
};
util.jdbcUrlOrContextVarRegexp = function (constraints)
{
return "^(jdbc:.*:.*)|" + singleContextVarRegexp + "$";
- }
+ };
util.nodeAddressOrContextVarRegexp = function (constraints)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9286ee01/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
index f8b378e..811a1dc 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
@@ -81,7 +81,7 @@ define(["dojo/_base/event",
{
var that = this;
var virtualHostNodeName = registry.byId("addVirtualHostNode.nodeName");
- virtualHostNodeName.set("regExpGen", util.nameOrContextVarRegexp);
+ virtualHostNodeName.set("regExpGen", util.virtualHostNameOrContextVarRegexp);
// Readers are HTML5
this.reader = window.FileReader ? new FileReader() : undefined;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9286ee01/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/hostnamealias/add.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/hostnamealias/add.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/hostnamealias/add.js
index 982ebd7..258e959 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/hostnamealias/add.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/hostnamealias/add.js
@@ -38,7 +38,7 @@ define(["dojo/dom",
.then(function (instances)
{
var virtualHostNodeNameWidget = registry.byId("addVirtualHostAlias.virtualHostNodeName");
- virtualHostNodeNameWidget.set("regExpGen", util.nameOrContextVarRegexp);
+ virtualHostNodeNameWidget.set("regExpGen", util.virtualHostNameOrContextVarRegexp);
});
}
};
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9286ee01/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/patternmatchingalias/add.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/patternmatchingalias/add.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/patternmatchingalias/add.js
index c31a050..62d20d1 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/patternmatchingalias/add.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/patternmatchingalias/add.js
@@ -38,7 +38,7 @@ define(["dojo/dom",
.then(function (instances)
{
var virtualHostNodeNameWidget = registry.byId("addVirtualHostAlias.virtualHostNodeName");
- virtualHostNodeNameWidget.set("regExpGen", util.nameOrContextVarRegexp);
+ virtualHostNodeNameWidget.set("regExpGen", util.virtualHostNameOrContextVarRegexp);
});
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org