Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv10490/src/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterPublicationServiceImpl.java
Log Message:
CMSC-743,Newsletter: possibility to send a test email
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-743
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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterPublicationServiceImpl.java 16 Apr 2008 04:26:18 -0000
1.5
+++ NewsletterPublicationServiceImpl.java 16 Apr 2008 10:47:39 -0000
1.6
@@ -1,17 +1,19 @@
package com.finalist.newsletter.services.impl;
-import com.finalist.newsletter.services.NewsletterPublicationService;
-import com.finalist.newsletter.publisher.NewsletterPublisher;
+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.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.domain.Publication;
import com.finalist.newsletter.domain.Subscription;
-import static com.finalist.newsletter.domain.Publication.STATUS;
-import com.finalist.cmsc.services.community.person.Person;
-
-import java.util.Date;
-import java.util.List;
+import com.finalist.newsletter.domain.Publication.STATUS;
+import com.finalist.newsletter.publisher.NewsletterPublisher;
+import com.finalist.newsletter.services.NewsletterPublicationService;
public class NewsletterPublicationServiceImpl implements
NewsletterPublicationService {
@@ -39,22 +41,58 @@
public void deliverAllPublication() {
List<Publication> publications = publicationCAO.getIntimePublication();
for(Publication publication:publications){
+ deliver(publication);
+ }
+
+
+ }
+
+ private void deliver(Publication publication) {
List<Subscription> subscriptions =
subscriptionCAO.getSubscription(publication.getNewsletterId());
publisher.deliver(publication,subscriptions);
statisticCAO.logPubliction(publication.getId(),subscriptions.size());
publicationCAO.setStatus(publication, STATUS.DELIVERED);
}
-
- }
-
- public void testDeliver(int number,String email,String mineType) {
+ public void deliver(int number,String email,String mimeType) {
Publication publication = publicationCAO.getPublication(number);
Subscription subscription = new Subscription();
- subscription.setMimeType(mineType);
+ subscription.setMimeType(mimeType);
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
