Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 09:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3892 adjusts para names to new version of RegexpValidator

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1432586 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-01-13 11:03:39 +00:00
parent b63c5086ba
commit 42c487bbca
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
+5 -5
View File
@@ -61,9 +61,9 @@ package com.opensymphony.xwork2.validator.validators;
* <field name="myEmail">
* <field-validator type="email">
* <param name="parse">true</param>*
* <param name="expression">${emailPattern}</param> <!-- will be evaluated as: String getEmailPattern() -->
* <param name="caseSensitive">${emailCaseSensitive}</param> <!-- will be evaluated as: boolean getEmailCaseSensitive() -->
* <param name="trim">${trimEmail}</param> <!-- will be evaluated as: boolean getTrimEmail() -->
* <param name="regexExpression">${emailPattern}</param> <!-- will be evaluated as: String getEmailPattern() -->
* <param name="caseSensitiveExpression">${emailCaseSensitive}</param> <!-- will be evaluated as: boolean getEmailCaseSensitive() -->
* <param name="trimExpression">${trimEmail}</param> <!-- will be evaluated as: boolean getTrimEmail() -->
* <message>Must provide a valid email</message>
* </field-validator>
* </field>
@@ -81,8 +81,8 @@ public class EmailValidator extends RegexFieldValidator {
"\\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx)$\\b";
public EmailValidator() {
setExpression(emailAddressPattern);
setCaseSensitive("false");
setRegex(emailAddressPattern);
setCaseSensitive(false);
}
}
xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
+3 -3
View File
@@ -95,7 +95,7 @@ public class EmailValidatorTest extends XWorkTestCase {
validator.setFieldName("myEmail");
validator.setDefaultMessage("invalid email");
validator.setParse(true);
validator.setExpression("${emailExpression}");
validator.setRegexExpression("${emailExpression}");
validator.validate(action);
valueStack.pop();
@@ -124,7 +124,7 @@ public class EmailValidatorTest extends XWorkTestCase {
validator.setValueStack(valueStack);
validator.setParse(true);
validator.setCaseSensitive("${emailCaseSensitive}");
validator.setCaseSensitiveExpression("${emailCaseSensitive}");
valueStack.pop();
@@ -152,7 +152,7 @@ public class EmailValidatorTest extends XWorkTestCase {
validator.setValueStack(valueStack);
validator.setParse(true);
validator.setTrim("${trimEmail}");
validator.setTrimExpression("${trimEmail}");
valueStack.pop();