Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao
In directory 
james.mmbase.org:/tmp/cvs-serv23447/src/java/com/finalist/newsletter/cao

Modified Files:
        NewsletterCAO.java NewsletterPublicationCAO.java 
        NewsletterSubscriptionCAO.java 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao


Index: NewsletterCAO.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterCAO.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterCAO.java  21 Jul 2008 12:52:40 -0000      1.5
+++ NewsletterCAO.java  24 Jul 2008 09:04:16 -0000      1.6
@@ -17,7 +17,9 @@
 
    public int getNewsletterIdBySubscription(int id);
 
-   Node getNewsletterNodeById(int newsletterId);
+   public List<Term> getNewsletterTermsByName(int newsletterId, String name, 
int pagesize, int offset, String order, String direction);
+
+   public int getNewsletterTermsCountByName(int newsletterId, String name);
 
-   public Set<Term> getNewsletterTermsByName(int newsltterId, String name ,int 
pagesize, int offset);
+   Node getNewsletterNodeById(int newsletterId);
 }


Index: NewsletterPublicationCAO.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterPublicationCAO.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterPublicationCAO.java       18 Jul 2008 08:31:56 -0000      1.10
+++ NewsletterPublicationCAO.java       24 Jul 2008 09:04:16 -0000      1.11
@@ -27,7 +27,8 @@
    
    public void renamePublicationTitle(int publicationId);
    
-   public Set<Publication> getPublicationsByNewsletterAndPeriod(int id, String 
title, String subject, Date startDate, Date endDate, int pagesize, int offset);
+   public List<Publication> getPublicationsByNewsletterAndPeriod(int id, 
String title, String subject, Date startDate, Date endDate, int pagesize, int 
offset, String order, String direction);
 
    public int getPublicationCountForEdit(int id, String title, String subject, 
Date startDate, Date endDate);
+
 }


Index: NewsletterSubscriptionCAO.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterSubscriptionCAO.java      21 Jul 2008 09:48:02 -0000      1.14
+++ NewsletterSubscriptionCAO.java      24 Jul 2008 09:04:16 -0000      1.15
@@ -37,6 +37,7 @@
    public List<Subscription> getSubscriptionByUserIdAndStatus(int userId, 
Subscription.STATUS status);
 
    public List<Node> getAllSubscriptions();
+   public List<Node>getSubscriptionsByTerms(int newsletterId, String terms);
 
    void updateLastBounce(int subscriptionId);
 
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to