Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv9154/portlets-newsletter/src/java/com/finalist/newsletter
Modified Files:
PublicationSentCronJob.java NewsletterSumLogsCronJob.java
NewsletterCronJob.java
Log Message:
CMSC-1063 MMBase 1.9 cronjob has an additional method which will give compile
error
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-1063
Index: PublicationSentCronJob.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/PublicationSentCronJob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PublicationSentCronJob.java 21 Jul 2008 13:09:00 -0000 1.2
+++ PublicationSentCronJob.java 10 Sep 2008 11:48:09 -0000 1.3
@@ -1,24 +1,28 @@
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;
-import org.mmbase.applications.crontab.CronEntry;
+import org.mmbase.applications.crontab.AbstractCronJob;
import org.mmbase.applications.crontab.CronJob;
-public class PublicationSentCronJob implements CronJob {
+import com.finalist.cmsc.services.community.ApplicationContextFactory;
+import com.finalist.newsletter.services.NewsletterPublicationService;
+
+public class PublicationSentCronJob extends AbstractCronJob implements CronJob
{
private static Log log = LogFactory.getLog(PublicationSentCronJob.class);
- public void init(CronEntry cronEntry) {
+ @Override
+ public void init() {
log.info("Publication sent cronjob starting");
}
+ @Override
public void stop() {
log.info("Publication sent cronjob stop");
}
+ @Override
public void run() {
log.debug("Delivering all publications.");
NewsletterPublicationService service = (NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
Index: NewsletterSumLogsCronJob.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterSumLogsCronJob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterSumLogsCronJob.java 21 Jul 2008 13:09:00 -0000 1.2
+++ NewsletterSumLogsCronJob.java 10 Sep 2008 11:48:09 -0000 1.3
@@ -3,7 +3,8 @@
import java.util.List;
-import org.mmbase.applications.crontab.CronEntry;
+
+import org.mmbase.applications.crontab.AbstractCronJob;
import org.mmbase.applications.crontab.CronJob;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -11,15 +12,17 @@
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.newsletter.domain.StatisticResult;
import com.finalist.newsletter.services.StatisticService;
-public class NewsletterSumLogsCronJob implements CronJob {
+public class NewsletterSumLogsCronJob extends AbstractCronJob implements
CronJob {
private static Logger log = Logging
.getLoggerInstance(NewsletterSumLogsCronJob.class.getName());
- public void init(CronEntry cronEntry) {
+ @Override
+ public void init() {
log.info("Initializing NewsletterLogRecorder");
}
+ @Override
public void run() {
StatisticService service = (StatisticService)
ApplicationContextFactory.getBean("statisticService");
List<StatisticResult> listRecorder = service.getLogs();
@@ -37,6 +40,8 @@
return 0;
}
}
+
+ @Override
public void stop() {
log.info("Stopping NewsletterLogRecorder");
Index: NewsletterCronJob.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterCronJob.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterCronJob.java 24 Jul 2008 11:45:43 -0000 1.17
+++ NewsletterCronJob.java 10 Sep 2008 11:48:09 -0000 1.18
@@ -1,23 +1,14 @@
package com.finalist.newsletter;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.text.*;
+import java.util.*;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import org.apache.commons.lang.time.DateUtils;
-import org.mmbase.applications.crontab.CronEntry;
+import org.mmbase.applications.crontab.AbstractCronJob;
import org.mmbase.applications.crontab.CronJob;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -28,7 +19,7 @@
import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.newsletter.util.NewsletterUtil;
-public class NewsletterCronJob implements CronJob {
+public class NewsletterCronJob extends AbstractCronJob implements CronJob {
private static Logger log =
Logging.getLoggerInstance(NewsletterCronJob.class.getName());
@@ -129,9 +120,9 @@
Calendar startTime = getStartCalendar(expressions);
char[] weeks = expressions[4].toCharArray();
- for(int j = 0 ; j < weeks.length; j++) {
+ for (char week2 : weeks) {
- String week = String.valueOf(weeks[j]);
+ String week = String.valueOf(week2);
if((calender.get(Calendar.DAY_OF_WEEK) != 1 &&
calender.get(Calendar.DAY_OF_WEEK) == (Integer.parseInt(week)+1)) ||
(calender.get(Calendar.DAY_OF_WEEK) == 1 && Integer.parseInt(week) == 7)) {
if(calender.after(startTime)) {
try {
@@ -160,8 +151,8 @@
if(expressions[3].equals("0")) {
String dayOfMonth = expressions[4];
char[] months = expressions[5].toCharArray();
- for(int j = 0 ; j < months.length ; j++) {
- String month = String.valueOf(months[j]);
+ for (char month2 : months) {
+ String month = String.valueOf(month2);
if(!month.equals("a") && !month.equals("b") &&
(Integer.parseInt(month) == calender.get(Calendar.MONTH)) || (month.equals("b")
&& calender.get(Calendar.MONTH) == 11) || (month.equals("a") &&
calender.get(Calendar.MONTH) == 10)) {
if(calender.get(Calendar.DAY_OF_MONTH) ==
Integer.parseInt(dayOfMonth)) {
if(calender.after(startTime)) {
@@ -185,8 +176,8 @@
String week = expressions[5];
char[] months = expressions[6].toCharArray();
- for(int j = 0 ; j < months.length ; j++) {
- String month = String.valueOf(months[j]);
+ for (char month2 : months) {
+ String month = String.valueOf(month2);
if(!month.equals("a") && !month.equals("b") &&
(Integer.parseInt(month) == calender.get(Calendar.MONTH)) || (month.equals("a")
&& calender.get(Calendar.MONTH) == 10) || (month.equals("b") &&
calender.get(Calendar.MONTH) == 11)) {
if(calender.get(Calendar.WEEK_OF_MONTH) ==
Integer.parseInt(weekOfMonth)) {
if(calender.get(Calendar.DAY_OF_WEEK)!= 1 &&
calender.get(Calendar.DAY_OF_WEEK)== (Integer.parseInt(week)+1)) {
@@ -231,7 +222,8 @@
return isPublish;
}
- public void init(CronEntry arg0) {
+ @Override
+ public void init() {
NewsletterService newsletterService = (NewsletterService)
ApplicationContextFactory.getBean("newsletterServices");
BounceChecker checker = new BounceChecker(newsletterService);
if (!checker.isRunning()) {
@@ -239,6 +231,7 @@
}
}
+ @Override
public void run() {
List<Node> newslettersToPublish = getNewslettersToPublish();
for (int newsletterIterator = 0; newsletterIterator <
newslettersToPublish.size(); newsletterIterator++) {
@@ -253,6 +246,7 @@
}
}
+ @Override
public void stop() {
log.info("Stopping Newsletter CronJob");
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
