Author: echatellier Date: 2010-03-08 16:30:41 +0100 (Mon, 08 Mar 2010) New Revision: 2904 Log: Misc doc update. Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -33,6 +33,9 @@ */ public class PreventRuleManager { + /** log. */ + private static final Log log = LogFactory.getLog(PreventRuleManager.class); + /** Représente l'action qui ne fait rien. */ public static final String NULL_ACTION = "nullAction"; /** Représente l'action qui écrit sur la sortie standard. */ @@ -40,9 +43,6 @@ /** Représente l'action qui envoi un email de notification. */ public static final String EMAIL_ACTION = "emailAction"; - /** log. */ - private static final Log log = LogFactory.getLog(PreventRuleManager.class); - private PreventRuleDTO preventRule = null; /** @@ -150,6 +150,8 @@ /** * Action qui ne fait rien. + * + * TODO set this method to protected */ public static void nullAction(Object data) { // ne fait rien @@ -157,6 +159,8 @@ /** * Action qui écrit sur la sortie standard. + * + * TODO set this method to protected */ public static void printAction(Object data) { String message = ""; @@ -168,14 +172,24 @@ /** * Action qui envoi un email de notification. + * + * @param data mail data + * + * TODO set this method to protected */ public static void emailAction(Object data) { Map<String, String> fields = null; - if (data instanceof Map) { + if (data instanceof Map<?, ?>) { fields = (Map<String, String>) data; + MailUtil.sendMail(fields.get("host"), Integer.parseInt(fields + .get("port")), fields.get("from"), fields.get("to"), fields + .get("title"), fields.get("msg")); } - MailUtil.sendMail(fields.get("host"), Integer.parseInt(fields - .get("port")), fields.get("from"), fields.get("to"), fields - .get("title"), fields.get("msg")); + else { + if (log.isWarnEnabled()) { + log.warn("emailAction data parameter is not instance of Map"); + } + } + } } Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -22,7 +22,7 @@ import org.apache.commons.mail.SimpleEmail; /** - * Classe permettant d'envoyer des mails. Basée sur SimpleMail. + * Classe permettant d'envoyer des mails. Basée sur {@link SimpleMail} (commons-email). * * @author rannou * @version $Id$ @@ -60,13 +60,14 @@ if (log.isInfoEnabled()) { log.info("Email envoyé."); + + if (log.isDebugEnabled()) { + log.debug("Détail de l'email : " + "\ndate: " + email.getSentDate() + + "\nhostname: " + email.getHostName() + "\nport: " + + email.getSmtpPort() + "\nfrom: " + + email.getFromAddress().toString() + "\nto: " + to + + "\nsubject: " + email.getSubject()); + } } - if (log.isDebugEnabled()) { - log.debug("Détail de l'email : " + "\ndate: " + email.getSentDate() - + "\nhostname: " + email.getHostName() + "\nport: " - + email.getSmtpPort() + "\nfrom: " - + email.getFromAddress().toString() + "\nto: " + to - + "\nsubject: " + email.getSubject()); - } } } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -217,6 +217,8 @@ .getFirstName(), newUser.getLastName(), newUser.getLogin(), password, siteURL)); + // FIXME call directly MailUtil.sendMail() + // skip fill map, get from map... PreventRuleManager.emailAction(data); } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -553,6 +553,8 @@ data.put("msg", messages.format("votingEmail_msg", poll .getTitle(), account.getVotingId(), accountVoteURL)); + // FIXME call directly MailUtil.sendMail() + // skip fill map, get from map... PreventRuleManager.emailAction(data); } } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -621,9 +621,7 @@ // Mail au créateur data.put("to", poll.getCreatorEmail()); - data - .put("title", messages.format("voteEmail_subject", poll - .getTitle())); + data.put("title", messages.format("voteEmail_subject", poll.getTitle())); data.put("msg", messages.format("voteEmail_msg", poll.getTitle(), poll .getVoteDTOs().size(), voteURL, modifURL)); Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -168,6 +168,8 @@ .getFirstName(), newUser.getLastName(), newUser.getLogin(), password1, siteURL)); + // FIXME call directly MailUtil.sendMail() + // skip fill map, get from map... PreventRuleManager.emailAction(data); } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -23,6 +23,7 @@ import java.util.Timer; import java.util.TimerTask; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tapestry5.ioc.Messages; @@ -76,9 +77,8 @@ * Lancement des tâches en arrière-plan. */ public void executeTasks() { - if ("".equals(conf.getProperty("siteUrl"))) { - log - .warn("No property siteUrl. Reminder emails would not contain it"); + if (StringUtils.isEmpty(conf.getProperty("siteUrl"))) { + log.warn("No property siteUrl. Reminder emails would not contain it"); } // Exécution de la tâche toutes les 10 min