Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory james.mmbase.org:/tmp/cvs-serv21235/cao/impl
Modified Files:
Tag: b1_5
NewsletterPublicationCAOImpl.java
Log Message:
CMSC-1323 Newsletter: email from/to/name fields are ignored while sending mail
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
See also: http://www.mmbase.org/jira/browse/CMSC-1323
Index: NewsletterPublicationCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterPublicationCAOImpl.java,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -u -b -r1.24.2.4 -r1.24.2.5
--- NewsletterPublicationCAOImpl.java 17 Nov 2008 02:49:28 -0000 1.24.2.4
+++ NewsletterPublicationCAOImpl.java 10 Mar 2009 08:24:25 -0000 1.24.2.5
@@ -1,19 +1,20 @@
package com.finalist.newsletter.cao.impl;
-import com.finalist.cmsc.beans.MMBaseNodeMapper;
-import com.finalist.cmsc.navigation.NavigationUtil;
-import com.finalist.cmsc.paging.PagingStatusHolder;
-import com.finalist.cmsc.paging.PagingUtils;
-import com.finalist.newsletter.cao.NewsletterPublicationCAO;
-import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.domain.Publication;
-import com.finalist.newsletter.domain.Term;
-import com.finalist.newsletter.util.NewsletterPublicationUtil;
-import com.finalist.newsletter.util.POConvertUtils;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Field;
+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.Queries;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Constraint;
@@ -21,7 +22,14 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import java.util.*;
+import com.finalist.cmsc.beans.MMBaseNodeMapper;
+import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.cmsc.paging.PagingStatusHolder;
+import com.finalist.cmsc.paging.PagingUtils;
+import com.finalist.newsletter.cao.NewsletterPublicationCAO;
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.domain.Term;
+import com.finalist.newsletter.util.NewsletterPublicationUtil;
public class NewsletterPublicationCAOImpl implements NewsletterPublicationCAO {
@@ -62,22 +70,6 @@
}
public Publication getPublication(int number) {
- Node newsletterPublicationNode = cloud.getNode(number);
-
- List<Node> relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
- log.debug("Get " + relatedNewsletters.size() + " related newsletter");
-
- Publication pub = new Publication();
- pub.setId(newsletterPublicationNode.getNumber());
-
pub.setStatus(Publication.STATUS.valueOf(newsletterPublicationNode.getStringValue("status")));
- pub.setUrl(getPublicationURL(number));
- Newsletter newsletter = new Newsletter();
-
- Node node = relatedNewsletters.get(0);
- new POConvertUtils<Newsletter>().convert(newsletter, node);
- newsletter.setReplyAddress(node.getStringValue("replyto_mail"));
- pub.setNewsletter(newsletter);
-
return NewsletterPublicationUtil.getPublication(cloud,number);
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
