[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter NewsletterSumLogsCronJob.java NewsletterSendFailException.java NewsletterCronJob.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter In directory james.mmbase.org:/tmp/cvs-serv24485/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter Modified Files: NewsletterSumLogsCronJob.java NewsletterSendFailException.java NewsletterCronJob.java Log Message: CMSC-1091 improve code style. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter See also: http://www.mmbase.org/jira/browse/CMSC-1091 Index: NewsletterSumLogsCronJob.java === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterSumLogsCronJob.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- NewsletterSumLogsCronJob.java 23 Sep 2008 07:41:58 - 1.4 +++ NewsletterSumLogsCronJob.java 14 Oct 2008 11:22:44 - 1.5 @@ -13,7 +13,6 @@ /** * @author nikko - * */ public class NewsletterSumLogsCronJob extends AbstractCronJob implements CronJob { @@ -33,14 +32,14 @@ @Override public void run() { StatisticService service = (StatisticService) ApplicationContextFactory.getBean(statisticService); - List StatisticResult listRecorder = service.getLogs(); + ListStatisticResult listRecorder = service.getLogs(); if (null != listRecorder) { insetStatRecord(service, listRecorder); listRecorder.clear(); } } - private int insetStatRecord(StatisticService service, List StatisticResult listRecorder) { + private int insetStatRecord(StatisticService service, ListStatisticResult listRecorder) { if (null != listRecorder) { return service.pushSumedLogs(listRecorder); } else { Index: NewsletterSendFailException.java === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterSendFailException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- NewsletterSendFailException.java22 Apr 2008 03:35:53 - 1.1 +++ NewsletterSendFailException.java14 Oct 2008 11:22:44 - 1.2 @@ -1,6 +1,6 @@ package com.finalist.newsletter; -public class NewsletterSendFailException extends RuntimeException{ +public class NewsletterSendFailException extends RuntimeException { public NewsletterSendFailException() { } Index: NewsletterCronJob.java === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterCronJob.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- NewsletterCronJob.java 10 Sep 2008 11:48:09 - 1.18 +++ NewsletterCronJob.java 14 Oct 2008 11:22:44 - 1.19 @@ -50,30 +50,31 @@ private void createPublication(ListNode newslettersToPublish, Node newsletter, Object scheduleExpression, Date lastCreatedDateTime) { - String expression = (String)scheduleExpression; + String expression = (String) scheduleExpression; String[] expressions = expression.split(\\|); - if(isPublish(expressions,lastCreatedDateTime)) { + if (isPublish(expressions, lastCreatedDateTime)) { newslettersToPublish.add(newsletter); } } - private boolean isPublish(String[] expressions,Date lastCreatedDateTime) { + private boolean isPublish(String[] expressions, Date lastCreatedDateTime) { boolean isPublish = false; DateFormat df = new SimpleDateFormat(dd-MM- HH:mm); Date minDate = null; try { minDate = df.parse(01-01-1970 00:00); } catch (ParseException e) { - log.debug(-- Parse date Exception);; + log.debug(-- Parse date Exception); + ; } Date now = new Date(); Calendar calender = Calendar.getInstance(); //expressions[0] value: 1 once - if(expressions[0].equals(1)) { - String startDatetime = expressions[1]+ +expressions[2]+:+expressions[3]; + if (expressions[0].equals(1)) { + String startDatetime = expressions[1] + + expressions[2] + : + expressions[3]; try { Date startDate = df.parse(startDatetime); -if(now.after(startDate) (lastCreatedDateTime == null || DateUtils.isSameDay(minDate, lastCreatedDateTime))) { +if (now.after(startDate) (lastCreatedDateTime == null || DateUtils.isSameDay(minDate, lastCreatedDateTime))) { isPublish = true; } } @@ -82,30 +83,27 @@ } }//expressions[0] : 2 daily else if (expressions[0].equals(2)) { - String startDatetime =
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter NewsletterSumLogsCronJob.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter In directory james.mmbase.org:/tmp/cvs-serv19907 Modified Files: NewsletterSumLogsCronJob.java Log Message: CMSC-899,Check and improve all lists according to guideline,delete tab character See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter See also: http://www.mmbase.org/jira/browse/CMSC-899 Index: NewsletterSumLogsCronJob.java === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterSumLogsCronJob.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- NewsletterSumLogsCronJob.java 10 Sep 2008 11:48:09 - 1.3 +++ NewsletterSumLogsCronJob.java 23 Sep 2008 07:41:58 - 1.4 @@ -1,7 +1,5 @@ package com.finalist.newsletter; - - import java.util.List; import org.mmbase.applications.crontab.AbstractCronJob; @@ -12,35 +10,47 @@ import com.finalist.cmsc.services.community.ApplicationContextFactory; import com.finalist.newsletter.domain.StatisticResult; import com.finalist.newsletter.services.StatisticService; + +/** + * @author nikko + * + */ public class NewsletterSumLogsCronJob extends AbstractCronJob implements CronJob { - private static Logger log = Logging - .getLoggerInstance(NewsletterSumLogsCronJob.class.getName()); + private static Logger log = Logging.getLoggerInstance(NewsletterSumLogsCronJob.class.getName()); + /* +* @see org.mmbase.applications.crontab.AbstractCronJob#init() +*/ @Override public void init() { log.info(Initializing NewsletterLogRecorder); } + /* +* @see org.mmbase.applications.crontab.AbstractCronJob#run() +*/ @Override public void run() { StatisticService service = (StatisticService) ApplicationContextFactory.getBean(statisticService); - ListStatisticResult listRecorder = service.getLogs(); + List StatisticResult listRecorder = service.getLogs(); if (null != listRecorder) { insetStatRecord(service, listRecorder); listRecorder.clear(); } } - private int insetStatRecord(StatisticService service,ListStatisticResult listRecorder) { - if(null!=listRecorder){ + private int insetStatRecord(StatisticService service, List StatisticResult listRecorder) { + if (null != listRecorder) { return service.pushSumedLogs(listRecorder); - } - else{ + } else { return 0; } } + /* +* @see org.mmbase.applications.crontab.AbstractCronJob#stop() +*/ @Override public void stop() { log.info(Stopping NewsletterLogRecorder); ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter NewsletterSumLogsCronJob.java PublicationSentCronJob.java ApplicationContextFactory.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter In directory james.mmbase.org:/tmp/cvs-serv10582/portlets-newsletter/src/java/com/finalist/newsletter Modified Files: NewsletterSumLogsCronJob.java PublicationSentCronJob.java Removed Files: ApplicationContextFactory.java Log Message: CMSC-1023 Move ApplicationContextFactory from newsletter to community module project See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter See also: http://www.mmbase.org/jira/browse/CMSC-1023 Index: NewsletterSumLogsCronJob.java === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterSumLogsCronJob.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- NewsletterSumLogsCronJob.java 27 May 2008 07:29:02 - 1.1 +++ NewsletterSumLogsCronJob.java 21 Jul 2008 13:09:00 - 1.2 @@ -7,6 +7,8 @@ import org.mmbase.applications.crontab.CronJob; import org.mmbase.util.logging.Logger; import org.mmbase.util.logging.Logging; + +import com.finalist.cmsc.services.community.ApplicationContextFactory; import com.finalist.newsletter.domain.StatisticResult; import com.finalist.newsletter.services.StatisticService; public class NewsletterSumLogsCronJob implements CronJob { Index: PublicationSentCronJob.java === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/PublicationSentCronJob.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- PublicationSentCronJob.java 8 May 2008 06:37:14 - 1.1 +++ PublicationSentCronJob.java 21 Jul 2008 13:09:00 - 1.2 @@ -1,5 +1,6 @@ package com.finalist.newsletter; +import com.finalist.cmsc.services.community.ApplicationContextFactory; import com.finalist.newsletter.services.NewsletterPublicationService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs