Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter
In directory james.mmbase.org:/tmp/cvs-serv9888
Modified Files:
NewsletterCronJob.java PublicationSentCronJob.java
Log Message:
CMSC-1085 Newsletter publication should be emailed from Live environment
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-1085
Index: NewsletterCronJob.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterCronJob.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterCronJob.java 14 Oct 2008 11:22:44 -0000 1.19
+++ NewsletterCronJob.java 22 Oct 2008 09:33:51 -0000 1.20
@@ -12,6 +12,7 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.services.publish.Publish;
import com.finalist.newsletter.publisher.bounce.BounceChecker;
@@ -219,13 +220,14 @@
public void init() {
NewsletterService newsletterService = (NewsletterService)
ApplicationContextFactory.getBean("newsletterServices");
BounceChecker checker = new BounceChecker(newsletterService);
- if (!checker.isRunning()) {
+ if (!checker.isRunning() && ServerUtil.isLive()) {
checker.start();
}
}
@Override
public void run() {
+ if(ServerUtil.isSingle() || ServerUtil.isStaging()) {
List<Node> newslettersToPublish = getNewslettersToPublish();
for (int newsletterIterator = 0; newsletterIterator <
newslettersToPublish.size(); newsletterIterator++) {
Node newsletterNode = newslettersToPublish.get(newsletterIterator);
@@ -235,9 +237,12 @@
log.info("Running Newsletter CronJob for newsletter " +
newsletterNumber);
//NewsletterPublicationUtil.createPublication(newsletterNumber, true);
Node publicationNode =
NewsletterPublicationUtil.createPublication(newsletterNumber, true);
+ if(ServerUtil.isStaging()) {
Publish.publish(publicationNode);
}
}
+ }
+ }
@Override
public void stop() {
Index: PublicationSentCronJob.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/PublicationSentCronJob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PublicationSentCronJob.java 10 Sep 2008 11:48:09 -0000 1.3
+++ PublicationSentCronJob.java 22 Oct 2008 09:33:51 -0000 1.4
@@ -5,6 +5,7 @@
import org.mmbase.applications.crontab.AbstractCronJob;
import org.mmbase.applications.crontab.CronJob;
+import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.newsletter.services.NewsletterPublicationService;
@@ -24,8 +25,10 @@
@Override
public void run() {
+ if(ServerUtil.isSingle() || ServerUtil.isLive()) {
log.debug("Delivering all publications.");
NewsletterPublicationService service = (NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
service.deliverAllPublication();
}
+ }
}
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
