branch develop-1.1.x updated (bc337b14 -> 138260f3)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from bc337b14 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 138260f3 correction de l'acceptation des adresses email en .bzh The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 138260f3295dfb72a763a4268b8a6b53d7d04306 Author: Kevin Morin <morin@codelutin.com> Date: Thu Aug 3 16:29:05 2017 +0200 correction de l'acceptation des adresses email en .bzh Summary of changes: .../validators/FaxToMailEmailValidator.java | 42 ---------------------- .../validators/FaxToMailEmailsValidator.java | 10 +++--- .../src/main/resources/validators.xml | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 138260f3295dfb72a763a4268b8a6b53d7d04306 Author: Kevin Morin <morin@codelutin.com> Date: Thu Aug 3 16:29:05 2017 +0200 correction de l'acceptation des adresses email en .bzh --- .../validators/FaxToMailEmailValidator.java | 42 ---------------------- .../validators/FaxToMailEmailsValidator.java | 10 +++--- .../src/main/resources/validators.xml | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 50 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java deleted file mode 100644 index 79fd5dff..00000000 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.franciaflex.faxtomail.services.validators; - -/* - * #%L - * FaxToMail :: Service - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Mac-Groupe, 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); - } - -} diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java index 0c9d81c5..322a6b35 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java @@ -27,17 +27,15 @@ package com.franciaflex.faxtomail.services.validators; import com.opensymphony.xwork2.validator.validators.EmailValidator; /** - * Surcharge du validateur d'email par default de struts pour autoriser en plus le domaine ".fax". - * Possibilité d'avoir plusieurs emails séparés par des points-virgule + * Surcharge du validateur d'email par default de struts + * pour autoriser plusieurs emails séparés par des points-virgule */ public class FaxToMailEmailsValidator extends EmailValidator { // see XW-371 public static final String EMAIL_ADDRESSES_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)" + - "(\\s*;\\s*['_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^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2,6})" + + "(\\s*;\\s*['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2,6}))*" + "$\\b"; public FaxToMailEmailsValidator() { diff --git a/faxtomail-service/src/main/resources/validators.xml b/faxtomail-service/src/main/resources/validators.xml index 81b8154b..56e1156c 100644 --- a/faxtomail-service/src/main/resources/validators.xml +++ b/faxtomail-service/src/main/resources/validators.xml @@ -47,6 +47,6 @@ <validator name="existingFile" class="org.nuiton.validator.xwork2.field.ExistingFileFieldValidator"/> <!-- les validateur specifiques --> - <validator name="email" class="com.franciaflex.faxtomail.services.validators.FaxToMailEmailValidator"/> + <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/> <validator name="emails" class="com.franciaflex.faxtomail.services.validators.FaxToMailEmailsValidator"/> </validators> diff --git a/pom.xml b/pom.xml index 84e4f8ac..b71a5688 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ <!-- do not upgrade to 1.6.5-1 --> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion> - <struts2Version>2.3.16.3</struts2Version> + <struts2Version>2.3.33</struts2Version> <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>2.0.0</bootstrapPluginVersion> <slf4jVersion>1.7.7</slf4jVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm