Author: bleny Date: 2011-02-21 11:07:36 +0000 (Mon, 21 Feb 2011) New Revision: 1036 Log: replacing call to nuiton-utils snapshot Modified: trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/pom.xml 2011-02-21 11:07:36 UTC (rev 1036) @@ -312,7 +312,7 @@ <!-- libraries version --> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.2</topiaVersion> <eugeneVersion>2.3</eugeneVersion> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-21 11:07:36 UTC (rev 1036) @@ -152,4 +152,13 @@ DateFormat dateFormat = new SimpleDateFormat(pattern, context.getLocale()); return dateFormat.format(date); } + + /** + * + * @deprecated should be replaced by StringUtil.isEmail + */ + @Deprecated + public static boolean isEmail(String str) { + return str.matches("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9\\-]*[a-z0-9])?$"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-02-21 11:07:36 UTC (rev 1036) @@ -439,7 +439,7 @@ // sending the same e-mail to all of them for (WaoUser waoUser : waoUsers) { String userLogin = waoUser.getLogin(); - if (StringUtil.isEmail(userLogin)) { + if (WaoUtils.isEmail(userLogin)) { try { WaoUtils.sendEmail(userLogin, object, body); } catch (EmailException e) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-02-21 11:07:36 UTC (rev 1036) @@ -31,6 +31,7 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.WaoQueryHelper; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ConnectedUserImpl; import fr.ifremer.wao.bean.ObsProgram; @@ -253,7 +254,7 @@ transaction.commitTransaction(); try { - if (StringUtil.isEmail(user.getLogin()) && user.isPasswordChanged()) { + if (WaoUtils.isEmail(user.getLogin()) && user.isPasswordChanged()) { String subject = "[WAO] "; String msg = "Bonjour,\n\n"; if (isNewUser) {