Author: echatellier Date: 2014-08-07 10:31:16 +0200 (Thu, 07 Aug 2014) New Revision: 489 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/489 Log: fixes #5524: Surcharge du validateur email pour supporter le domaine ".fax" Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java Modified: trunk/faxtomail-service/src/main/resources/validators.xml Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java (rev 0) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java 2014-08-07 08:31:16 UTC (rev 489) @@ -0,0 +1,42 @@ +package com.franciaflex.faxtomail.services.validators; + +/* + * #%L + * FaxToMail :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.opensymphony.xwork2.validator.validators.EmailValidator; + +/** + * Surcharge du validateur d'email par default de struts pour autoriser en plus le domaine ".fax". + */ +public class FaxToMailEmailValidator extends EmailValidator { + + // see XW-371 + public static final String EMAIL_ADDRESS_PATTERN = + "\\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|fax)$\\b"; + + public FaxToMailEmailValidator() { + setRegex(EMAIL_ADDRESS_PATTERN); + } + +} \ No newline at end of file Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/resources/validators.xml =================================================================== --- trunk/faxtomail-service/src/main/resources/validators.xml 2014-08-07 08:16:40 UTC (rev 488) +++ trunk/faxtomail-service/src/main/resources/validators.xml 2014-08-07 08:31:16 UTC (rev 489) @@ -23,7 +23,6 @@ #L% --> - <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator Config 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd"> @@ -40,7 +39,6 @@ <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/> <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/> <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/> - <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/> <!-- les validateurs fournis par nuiton-validator --> <validator name="collectionUniqueKey" class="org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator"/> @@ -48,4 +46,6 @@ <validator name="skipablefieldexpression" class="org.nuiton.validator.xwork2.field.NuitonFieldExpressionValidator"/> <validator name="existingFile" class="org.nuiton.validator.xwork2.field.ExistingFileFieldValidator"/> + <!-- les validateur specifiques --> + <validator name="email" class="com.franciaflex.faxtomail.services.validators.FaxToMailEmailValidator"/> </validators>