Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv6479/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterPublicationServiceImpl.java
Log Message:
CMSC-811 update domain test and publisher
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
See also: http://www.mmbase.org/jira/browse/CMSC-811
Index: NewsletterPublicationServiceImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterPublicationServiceImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterPublicationServiceImpl.java 17 Apr 2008 02:36:36 -0000
1.7
+++ NewsletterPublicationServiceImpl.java 22 Apr 2008 03:35:53 -0000
1.8
@@ -1,20 +1,17 @@
package com.finalist.newsletter.services.impl;
-import java.util.List;
-
-import net.sf.mmapps.commons.util.StringUtil;
-
-import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.NewsletterPublicationCAO;
import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
import com.finalist.newsletter.domain.Publication;
-import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.domain.Publication.STATUS;
+import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.publisher.NewsletterPublisher;
import com.finalist.newsletter.services.NewsletterPublicationService;
+import java.util.List;
+
public class NewsletterPublicationServiceImpl implements
NewsletterPublicationService {
private NewsletterPublisher publisher;
@@ -43,8 +40,6 @@
for(Publication publication:publications){
deliver(publication);
}
-
-
}
private void deliver(Publication publication) {
@@ -55,42 +50,20 @@
}
public void deliver(int number,String email,String mimeType) {
+
Publication publication = publicationCAO.getPublication(number);
Subscription subscription = new Subscription();
+
subscription.setMimeType(mimeType);
+
System.out.println("------------------------"+publication.getNewsletter());
+ subscription.setNewsletter(publication.getNewsletter());
+
Person person = new Person();
person.setEmail(email);
-
-
if(StringUtil.isEmptyOrWhitespace(PropertiesUtil.getProperty("mail.system.email")))
{
- subscription.setFromAddress("[EMAIL PROTECTED]");
- }
- else {
-
subscription.setFromAddress(PropertiesUtil.getProperty("mail.system.email"));
- }
-
if(StringUtil.isEmptyOrWhitespace(PropertiesUtil.getProperty("mail.system.name")))
{
- subscription.setFromName("test to send publication");
- }
- else {
-
subscription.setFromName(PropertiesUtil.getProperty("mail.system.name"));
- }
-
-
if(StringUtil.isEmptyOrWhitespace(PropertiesUtil.getProperty("mail.system.email")))
{
- subscription.setReplyAddress("[EMAIL PROTECTED]");
- }
- else {
-
subscription.setReplyAddress(PropertiesUtil.getProperty("mail.system.email"));
- }
-
if(StringUtil.isEmptyOrWhitespace(PropertiesUtil.getProperty("mail.system.name")))
{
- subscription.setReplyname("test sending publication");
- }
- else {
-
subscription.setReplyname(PropertiesUtil.getProperty("mail.system.name"));
- }
subscription.setSubscriber(person);
- subscription.setTitle("test to send publication");
+
publisher.deliver(publication, subscription);
}
-
public void deliverPublication(int number) {
Publication publication = publicationCAO.getPublication(number);
deliver(publication);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
