You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/04/02 17:12:58 UTC
svn commit: r1463590 - in /syncope/trunk: ./
core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/AlwaysTrueValidator.java
core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/EmailAddressValidator.java
Author: ilgrosso
Date: Tue Apr 2 15:12:57 2013
New Revision: 1463590
URL: http://svn.apache.org/r1463590
Log:
[SYNCOPE-348] Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/AlwaysTrueValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/EmailAddressValidator.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1463509-1463586
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/AlwaysTrueValidator.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/AlwaysTrueValidator.java?rev=1463590&r1=1463589&r2=1463590&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/AlwaysTrueValidator.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/AlwaysTrueValidator.java Tue Apr 2 15:12:57 2013
@@ -23,14 +23,14 @@ import org.apache.syncope.core.persisten
public class AlwaysTrueValidator extends AbstractValidator {
- public AlwaysTrueValidator(AbstractSchema schema) {
+ private static final long serialVersionUID = 872107345555773183L;
+ public AlwaysTrueValidator(final AbstractSchema schema) {
super(schema);
}
@Override
- protected void doValidate(AbstractAttrValue attributeValue) throws InvalidAttrValueException {
-
+ protected void doValidate(final AbstractAttrValue attributeValue) throws InvalidAttrValueException {
Boolean value = attributeValue.getValue();
if (!value) {
String error = "This attribute must be set to \"true\"";
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/EmailAddressValidator.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/EmailAddressValidator.java?rev=1463590&r1=1463589&r2=1463590&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/EmailAddressValidator.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/EmailAddressValidator.java Tue Apr 2 15:12:57 2013
@@ -26,8 +26,12 @@ import org.apache.syncope.core.persisten
public class EmailAddressValidator extends AbstractValidator {
+ private static final long serialVersionUID = 792457177290331518L;
+
private static final Pattern EMAIL_PATTERN = Pattern.compile(
- "^[\\w\\-]([\\.\\w])+[\\w]+@([\\w\\-]+\\.)+[A-Z]{2,4}$", Pattern.CASE_INSENSITIVE);
+ "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*"
+ + "@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$",
+ Pattern.CASE_INSENSITIVE);
public EmailAddressValidator(final AbstractSchema schema) {
super(schema);