Author: indika
Date: Wed Jan 9 22:11:26 2008
New Revision: 12094
Log:
allow hyphen , em /en dash for name
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/esbregistry.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/header_mediator.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/throttle_mediator.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/xquery_mediator.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/proxyservices.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
Wed Jan 9 22:11:26 2008
@@ -15,6 +15,9 @@
messageheader[TYPE_WARN] = "Warning Message";
messageheader[TYPE_ERROR] = "Error Message";
+var INVALID_NAME = "The value for the name contains invalid characters." +
+ " Only, alphanumeric , underscore , hyphen or dash
characters are allowed. ";
+
function initoverlaymanager() {
if (paneloverlaymanager == null) {
paneloverlaymanager = new YAHOO.widget.OverlayManager();
@@ -31,7 +34,10 @@
|| (code > 64 && code < 91)// capital
|| (code > 96 && code < 123)// simple
|| (code == 46) //dot
- || code == 95) // underscore
+ || (code == 95) // underscore
+ || (code == 2013) // en dash
+ || (code == 2014) // em dash
+ || (code == 45)) // minus sign - hyphen
{
}
else {
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js
Wed Jan 9 22:11:26 2008
@@ -606,7 +606,7 @@
var name = document.getElementById(nameId.toString());
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid
characters. Only, alphanumeric or underscore characters are allowed. ",
TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
}
var childepstr = dataToString(type);
if (childepstr != undefined && childepstr != null) {
@@ -620,7 +620,7 @@
var name = document.getElementById(nameId.toString());
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid
characters. Only, alphanumeric or underscore characters are allowed. ",
TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
}
var childepstr = dataToString(type);
if (childepstr != undefined && childepstr != null) {
@@ -1259,8 +1259,7 @@
var name = document.getElementById(nameId.toString());
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var childepstr = dataToString(type);
@@ -1281,8 +1280,7 @@
var name = document.getElementById(nameId.toString());
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var childepstr = dataToString(type);
@@ -1306,8 +1304,7 @@
if (name != null && name.value != "") {
var value = trim(name.value);
if (!namevalidate(value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
if (uri != null && uri.value != "") {
@@ -1440,8 +1437,7 @@
var uri = document.getElementById("endpoint_address0");
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var inlinewsdlstr = null;
@@ -1630,8 +1626,7 @@
if (childepstr != undefined && childepstr != null) {
var value = trim(name.value);
if (!namevalidate(value)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore characters
are allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var body_xml = '<ns1:saveEndpoint
xmlns:ns1="http://org.apache.synapse/xsd"; xmlns:syn="' + SYNAPSE_NS + '">' +
@@ -1652,8 +1647,7 @@
if (childepstr != undefined && childepstr != null) {
var value = trim(name.value);
if (!namevalidate(value)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore characters
are allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var body_xml = '<ns1:saveEndpoint
xmlns:ns1="http://org.apache.synapse/xsd"; xmlns:syn="' + SYNAPSE_NS + '">' +
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js
Wed Jan 9 22:11:26 2008
@@ -201,8 +201,7 @@
return;
}
if (!namevalidate(entryName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed.
", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var valueId = document.getElementById("entry_value");
@@ -279,8 +278,7 @@
return;
}
if (!namevalidate(entryName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed.
", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var valueId = document.getElementById("entry_value");
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/esbregistry.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/esbregistry.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/esbregistry.js
Wed Jan 9 22:11:26 2008
@@ -272,8 +272,7 @@
}
if (!namevalidate(newFolderName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed.
", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
@@ -307,8 +306,7 @@
}
if (!namevalidate(newFolderName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed.
", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
@@ -430,8 +428,7 @@
}
if (!namevalidate(newFileName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed.
", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/header_mediator.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/header_mediator.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/header_mediator.js
Wed Jan 9 22:11:26 2008
@@ -27,8 +27,7 @@
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
mediator.setAttribute("name", name.value);
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property.js
Wed Jan 9 22:11:26 2008
@@ -145,8 +145,7 @@
}
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
var propertystr = "<syn:property
xmlns:syn='http://ws.apache.org/ns/synapse' name='"
@@ -177,8 +176,7 @@
}
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
@@ -280,8 +278,7 @@
}
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
@@ -298,8 +295,7 @@
}
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/throttle_mediator.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/throttle_mediator.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/throttle_mediator.js
Wed Jan 9 22:11:26 2008
@@ -61,7 +61,7 @@
var id = trim(thottleID.value);
if (!namevalidate(id)) {
esbwarning("The value for the ID contains invalid characters."
+
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ " Only, alphanumeric , underscore or dash
characters are allowed. ", TYPE_INFO);
return false;
}
mediator.setAttribute("id", id);
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/xquery_mediator.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/xquery_mediator.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/xquery_mediator.js
Wed Jan 9 22:11:26 2008
@@ -175,8 +175,7 @@
&& name != "") {
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore
characters are allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
@@ -255,8 +254,7 @@
&& name != "") {
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid
characters." +
- " Only, alphanumeric or underscore
characters are allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
var property;
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/proxyservices.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/proxyservices.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/proxyservices.js
Wed Jan 9 22:11:26 2008
@@ -586,7 +586,7 @@
function setproxysavepanel(proxydiv) {
var savepanel = document.createElement("div");
-
+
savepanel.innerHTML = "<div class='description'>You must save changes to "
+ "the proxy service for it to be deployed</div>";
@@ -622,8 +622,7 @@
if (document.getElementById("proxy_name") != null &&
document.getElementById("proxy_name").value != "") {
if (!namevalidate(document.getElementById("proxy_name").value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return -1;
}
internalmodel.proxyname = document.getElementById("proxy_name").value;
@@ -1274,7 +1273,7 @@
if (document.getElementById("editingDiv") != null ||
document.getElementById("editingDiv") != undefined) {
document.getElementById("editingDiv").removeAttribute("id");
}
-
+
internalmodel.sequence = createesbelement("<syn:sequence name='' "
+ "xmlns:syn='http://ws.apache.org/ns/synapse'></syn:sequence>");
@@ -1512,7 +1511,7 @@
+ "<tr><td></td><td><input type='button' id='createFolderButton'
value='Create Folder' onclick='javascript: addRegistryFolderForSave(\"" +
saveFn + "\",\"" + param1 + "\"); return false;' class='panelbutton_default'
style='width: 100px; height:20px;'/></td></tr></table></div>"
-
+
+ "</p>"
// + "<br/><div style='position:absolute;top:250px; "
@@ -1522,7 +1521,7 @@
// + "<div id='localregkey' style='position:absolute; border: 1px
solid gray; top:280px; "
// + "left:20px; width:620px; height:70px; overflow-x:auto;
overflow-y:auto;'>"
// + "</div>"
-
+
+ "</div><div><table style='margin-left: 210px;margin-top:
150px;_margin-top: 40px;'><tbody><tr>"
+ "<td><input type='button' class='panelbutton_default' "
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
Wed Jan 9 22:11:26 2008
@@ -824,8 +824,7 @@
if(document.getElementById("sequencename") != null &&
document.getElementById("sequencename").value != "") {
if (!namevalidate(document.getElementById("sequencename").value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are
allowed. ", TYPE_INFO);
+ esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
internalmodel.sequencename =
document.getElementById("sequencename").value;
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
