Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services
In directory
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/java/com/finalist/newsletter/services
Modified Files:
NewsletterService.java NewsletterSubscriptionServices.java
NewsletterServiceFactory.java
Log Message:
CMSC-888 fix.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services
See also: http://www.mmbase.org/jira/browse/CMSC-888
Index: NewsletterService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterService.java 5 May 2008 02:40:11 -0000 1.3
+++ NewsletterService.java 7 May 2008 02:54:40 -0000 1.4
@@ -8,7 +8,7 @@
public List<Newsletter> getAllNewsletter();
- public String getNewsletterName(int newsletterId);
+ public String getNewsletterName(String newsletterId);
public int countAllNewsletters();
@@ -17,4 +17,6 @@
public List<Newsletter> getNewslettersByTitle(String title);
public Newsletter getNewsletterBySubscription(int id);
+
+ public List<Newsletter> getNewsletters(String subscriber, String title);
}
Index: NewsletterSubscriptionServices.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterSubscriptionServices.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterSubscriptionServices.java 5 May 2008 02:40:11 -0000 1.9
+++ NewsletterSubscriptionServices.java 7 May 2008 02:54:40 -0000 1.10
@@ -1,21 +1,10 @@
package com.finalist.newsletter.services;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.cache.CachePolicy;
-
-import com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl;
-import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.domain.Subscription;
+import com.finalist.cmsc.services.community.person.Person;
+
+import java.util.List;
+import java.util.Set;
public interface NewsletterSubscriptionServices {
@@ -57,5 +46,15 @@
public List<Subscription> getAllSubscription();
- public List<Subscription> getSubscriptionsByNewsletterId(int i);
+ public List<Subscription> getSubscriptionsByNewsletterId(String i);
+
+ Set<Subscription> getSubscriptions(String newsletterId, String name, String
email);
+
+ public List<Person> getAllSubscribers();
+
+ public List<Person> getAllSubscribers(String name, String email);
+
+ public List<Subscription> getSubscriptionBySubscriber(String newsletterid);
+
+ public Subscription getSubscription(int sbId, int nId);
}
Index: NewsletterServiceFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterServiceFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterServiceFactory.java 5 May 2008 02:40:11 -0000 1.7
+++ NewsletterServiceFactory.java 7 May 2008 02:54:40 -0000 1.8
@@ -30,7 +30,7 @@
public static NewsletterSubscriptionServices
getNewsletterSubscriptionServices() {
NewsletterSubscriptionCAO subscriptionCAO = new
NewsletterSubscriptionCAOImpl(cloudProvider.getCloud());
NewsletterSubscriptionServicesImpl newsletterSubscriptionServices = new
NewsletterSubscriptionServicesImpl();
- newsletterSubscriptionServices.setSubscriptinCAO(subscriptionCAO);
+ newsletterSubscriptionServices.setSubscriptionCAO(subscriptionCAO);
NewsletterCAO newsletterCAO = new
NewsletterCAOImpl(cloudProvider.getCloud());
newsletterSubscriptionServices.setNewsletterCAO(newsletterCAO);
return newsletterSubscriptionServices;
@@ -52,13 +52,6 @@
}
- public static NewsletterService getNewsletterService (){
-
- NewsletterServiceImpl service = new NewsletterServiceImpl();
- service.setNewsletterCAO(new
NewsletterCAOImpl(cloudProvider.getCloud()));
- return service;
- }
-
public static StatisticService getStatisticService (){
StatisticServiceImpl service = new StatisticServiceImpl();
service.setNewLettercao(new
NewsletterCAOImpl(cloudProvider.getCloud()));
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
