Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory james.mmbase.org:/tmp/cvs-serv30889/tree
Modified Files:
NewsletterPublicationTreeItemRenderer.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/tree
See also: http://www.mmbase.org/jira/browse/CMSC-1085
Index: NewsletterPublicationTreeItemRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterPublicationTreeItemRenderer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NewsletterPublicationTreeItemRenderer.java 28 Oct 2008 11:13:36 -0000
1.20
+++ NewsletterPublicationTreeItemRenderer.java 3 Nov 2008 09:01:24 -0000
1.21
@@ -4,16 +4,19 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import com.finalist.cmsc.navigation.*;
+import com.finalist.cmsc.navigation.NavigationRenderer;
+import com.finalist.cmsc.navigation.NavigationTreeItemRenderer;
+import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.cmsc.navigation.PagesUtil;
+import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.security.UserRole;
-import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.tree.TreeElement;
import com.finalist.tree.TreeModel;
import com.finalist.util.module.ModuleUtil;
-import com.finalist.newsletter.services.NewsletterPublicationService;
-import com.finalist.newsletter.domain.Publication;
public class NewsletterPublicationTreeItemRenderer implements
NavigationTreeItemRenderer {
@@ -44,8 +47,8 @@
boolean isPublished;
isSingleApplication = ServerUtil.isSingle();
if (isSingleApplication) {
- NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
- Publication.STATUS status =
publicationService.getStatus(parentNode.getNumber());
+ // NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
+ Publication.STATUS status =
NewsletterPublicationUtil.getStatus(parentNode.getNumber());
isPublished = Publication.STATUS.DELIVERED.equals(status);
} else {
isPublished = Publish.isPublished(parentNode);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
