Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv30364/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationPublish.java
Log Message:
CMSC-818 move service initial to spring.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-818
Index: NewsletterPublicationPublish.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsletterPublicationPublish.java 7 May 2008 05:58:37 -0000 1.11
+++ NewsletterPublicationPublish.java 7 May 2008 08:18:27 -0000 1.12
@@ -9,25 +9,23 @@
*/
package com.finalist.newsletter.forms;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.security.UserRole;
-import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.cmsc.struts.MMBaseFormlessAction;
+import com.finalist.newsletter.ApplicationContextFactory;
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.services.NewsletterPublicationService;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.newsletter.util.NewsletterUtil;
-import com.finalist.newsletter.services.NewsletterServiceFactory;
-import com.finalist.newsletter.services.NewsletterPublicationService;
-import com.finalist.newsletter.domain.Publication;
-import com.finalist.newsletter.ApplicationContextFactory;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
+
+import javax.servlet.http.HttpServletRequest;
public class NewsletterPublicationPublish extends MMBaseFormlessAction {
@@ -40,12 +38,15 @@
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
- NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");;
+ NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
+
int number = Integer.parseInt(getParameter(request, "number", true));
+
if(NewsletterUtil.isPaused(NewsletterPublicationUtil.getNewsletterByPublicationNumber(number)))
{
request.setAttribute("isPaused", true);
return mapping.findForward(SUCCESS);
}
+
Node publicationNode = cloud.getNode(number);
if (isSendAction(request)) {
@@ -59,6 +60,7 @@
if (ServerUtil.isSingle()) {
publicationService.deliver(number);
+ publicationService.setStatus(number, Publication.STATUS.DELIVERED);
}
else {
publicationService.setStatus(number, Publication.STATUS.READY);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
