Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv27209/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationTest.java
NewsletterPublicationSendEmail.java UnsubscribeAction.java
SubscribeAction.java NewsletterStatisticAction.java
NewsletterPublicationPublish.java
SubscriptioManagementAction.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: NewsletterPublicationTest.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublicationTest.java 22 Apr 2008 10:45:31 -0000 1.4
+++ NewsletterPublicationTest.java 7 May 2008 05:58:37 -0000 1.5
@@ -18,6 +18,7 @@
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.newsletter.services.NewsletterPublicationService;
import com.finalist.newsletter.services.NewsletterServiceFactory;
+import com.finalist.newsletter.ApplicationContextFactory;
public class NewsletterPublicationTest extends MMBaseFormlessAction {
@@ -44,7 +45,7 @@
// }
// Thread publisher = new NewsletterPublisher(number);
// publisher.start();
- NewsletterPublicationService publicationService =
NewsletterServiceFactory.getNewsletterPublicationService();
+ NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");;
return mapping.findForward(SUCCESS);
}
Index: NewsletterPublicationSendEmail.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationSendEmail.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublicationSendEmail.java 30 Apr 2008 07:30:10 -0000 1.4
+++ NewsletterPublicationSendEmail.java 7 May 2008 05:58:37 -0000 1.5
@@ -20,6 +20,7 @@
import com.finalist.newsletter.services.NewsletterServiceFactory;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.newsletter.util.NewsletterUtil;
+import com.finalist.newsletter.ApplicationContextFactory;
public class NewsletterPublicationSendEmail extends MMBaseFormlessAction {
@@ -43,7 +44,7 @@
if (isSendAction(request)) {
String email = getParameter(request, "email");
String mimeType = request.getParameter("mimetype");
- NewsletterPublicationService publicationService =
NewsletterServiceFactory.getNewsletterPublicationService();
+ NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");;
publicationService.deliver(number,email,mimeType);
return mapping.findForward(SUCCESS);
}
Index: UnsubscribeAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/UnsubscribeAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UnsubscribeAction.java 6 May 2008 12:54:33 -0000 1.1
+++ UnsubscribeAction.java 7 May 2008 05:58:37 -0000 1.2
@@ -12,6 +12,7 @@
import com.finalist.newsletter.services.NewsletterServiceFactory;
import com.finalist.newsletter.services.NewsletterSubscriptionServices;
+import com.finalist.newsletter.ApplicationContextFactory;
public class UnsubscribeAction extends Action {
@@ -19,16 +20,20 @@
private static final String ACTION_REMOVE = "remove";
+ NewsletterSubscriptionServices service ;
+
+
+
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response) throws Exception
{
-
+ service = (NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
log.debug("Excute unsubscribe");
int userId = Integer.parseInt(request.getParameter("userId"));
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
if (isRemoveAction(request)) {
- NewsletterSubscriptionServices service =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
+
service.modifyStauts(userId, newsletterId, "INACTIVE");
return mapping.findForward("finish");
}
Index: SubscribeAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscribeAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SubscribeAction.java 3 May 2008 14:38:57 -0000 1.1
+++ SubscribeAction.java 7 May 2008 05:58:37 -0000 1.2
@@ -1,25 +1,31 @@
package com.finalist.newsletter.forms;
-import com.finalist.newsletter.services.CommunityModuleAdapter;
-import com.finalist.newsletter.services.NewsletterServiceFactory;
-import com.finalist.newsletter.services.NewsletterSubscriptionServices;
+import com.finalist.newsletter.services.*;
+import com.finalist.cmsc.services.community.person.PersonService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.actions.DispatchAction;
+import org.springframework.web.struts.DispatchActionSupport;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-public class SubscribeAction extends DispatchAction {
+public class SubscribeAction extends DispatchActionSupport {
private static Log log = LogFactory.getLog(SubscribeAction.class);
+ NewsletterSubscriptionServices service;
+
+ protected void onInit() {
+ super.onInit();
+ service = (NewsletterSubscriptionServices)
getWebApplicationContext().getBean("subscriptionServices");
+ }
+
public ActionForward modifyStatus(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- NewsletterSubscriptionServices service =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
int userId = CommunityModuleAdapter.getCurrentUserId();
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
@@ -36,7 +42,6 @@
public ActionForward modifyFormat(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- NewsletterSubscriptionServices service =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
int userId = CommunityModuleAdapter.getCurrentUserId();
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
String format = request.getParameter("format");
@@ -51,7 +56,6 @@
public ActionForward modifyTag(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- NewsletterSubscriptionServices service =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
Boolean hasSelect = Boolean.parseBoolean(request.getParameter("select"));
int userId = CommunityModuleAdapter.getCurrentUserId();
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
Index: NewsletterStatisticAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterStatisticAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterStatisticAction.java 7 May 2008 02:54:40 -0000 1.4
+++ NewsletterStatisticAction.java 7 May 2008 05:58:37 -0000 1.5
@@ -37,7 +37,7 @@
throws Exception {
NewsletterService newsletterService = (NewsletterService)
ApplicationContextFactory.getBean("newsletterServices");
- StatisticService service =
NewsletterServiceFactory.getStatisticService();
+ StatisticService service = (StatisticService)
ApplicationContextFactory.getBean("statisticService");
List<Newsletter> newsletters =
newsletterService.getAllNewsletter();
addBlankNewsletter(newsletters);
request.setAttribute("newsletters", newsletters);
Index: NewsletterPublicationPublish.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterPublicationPublish.java 30 Apr 2008 08:54:26 -0000 1.10
+++ NewsletterPublicationPublish.java 7 May 2008 05:58:37 -0000 1.11
@@ -27,6 +27,7 @@
import com.finalist.newsletter.services.NewsletterServiceFactory;
import com.finalist.newsletter.services.NewsletterPublicationService;
import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.ApplicationContextFactory;
public class NewsletterPublicationPublish extends MMBaseFormlessAction {
@@ -39,7 +40,7 @@
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
- NewsletterPublicationService publicationService =
NewsletterServiceFactory.getNewsletterPublicationService();
+ NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");;
int number = Integer.parseInt(getParameter(request, "number", true));
if(NewsletterUtil.isPaused(NewsletterPublicationUtil.getNewsletterByPublicationNumber(number)))
{
request.setAttribute("isPaused", true);
Index: SubscriptioManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SubscriptioManagementAction.java 7 May 2008 02:54:40 -0000 1.2
+++ SubscriptioManagementAction.java 7 May 2008 05:58:37 -0000 1.3
@@ -31,7 +31,7 @@
newsletterService = (NewsletterService)
getWebApplicationContext().getBean("newsletterServices");
subscriptionServices = (NewsletterSubscriptionServices)
getWebApplicationContext().getBean("subscriptionServices");
personServices = (PersonService)
getWebApplicationContext().getBean("personService");
- publicationService =
NewsletterServiceFactory.getNewsletterPublicationService();
+ publicationService = (NewsletterPublicationService)
getWebApplicationContext().getBean("publicationService");
}
protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
