Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationPublish.java
Log Message:
CMSC-703 change tag to term
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-703
Index: NewsletterPublicationPublish.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterPublicationPublish.java 22 Apr 2008 03:44:12 -0000 1.7
+++ NewsletterPublicationPublish.java 29 Apr 2008 01:37:05 -0000 1.8
@@ -17,10 +17,15 @@
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.newsletter.publisher.NewsletterPublisher;
+import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.newsletter.util.NewsletterUtil;
+import com.finalist.newsletter.services.NewsletterServiceFactory;
+import com.finalist.newsletter.services.NewsletterPublicationService;
+import com.finalist.newsletter.domain.Publication;
public class NewsletterPublicationPublish extends MMBaseFormlessAction {
@@ -33,6 +38,7 @@
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
+ NewsletterPublicationService publciationService =
NewsletterServiceFactory.getNewsletterPublicationService();
int number = Integer.parseInt(getParameter(request, "number", true));
Node publicationNode = cloud.getNode(number);
@@ -44,8 +50,14 @@
if (NavigationUtil.getChildCount(publicationNode) > 0 &&
!isWebMaster) {
return mapping.findForward("confirmationpage");
}
-// Thread publisher = new NewsletterPublisher(number);
-// publisher.start();
+
+ if (ServerUtil.isSinle()) {
+ publciationService.deliver(number);
+ }
+ else {
+ publciationService.setStatus(number, Publication.STATUS.READY);
+ Publish.publish(publicationNode);
+ }
return mapping.findForward(SUCCESS);
}
@@ -56,12 +68,6 @@
return new ActionForward(forwardPath);
}
- // neither remove or cancel, show confirmation page
-
- String publishDate = publicationNode.getStringValue("publishdate");
- if (publishDate != null && publishDate.length() > 0 ) {
- return mapping.findForward("confirm_resend");
- }
return mapping.findForward("confirm_send");
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
