Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/generator
In directory james.mmbase.org:/tmp/cvs-serv12313
Modified Files:
NewsletterGenerator.java NewsletterGeneratorHtml.java
NewsletterGeneratorPlain.java
Log Message:
CMSC-742 add email in text
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/generator
See also: http://www.mmbase.org/jira/browse/CMSC-742
Index: NewsletterGenerator.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/generator/NewsletterGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterGenerator.java 17 Jan 2008 21:47:15 -0000 1.2
+++ NewsletterGenerator.java 2 Apr 2008 09:40:01 -0000 1.3
@@ -8,7 +8,9 @@
import java.net.URLConnection;
import javax.mail.Message;
+import javax.mail.MessagingException;
import javax.mail.Session;
+import javax.mail.internet.MimeMessage;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -81,7 +83,29 @@
return (output);
}
- public abstract Message generateNewsletterMessage(String userName);
+ public Message generateNewsletterMessage(String userName) {
+ Session session = getMailSession();
+ Message message = new MimeMessage(session);
+ String rawHtmlContent = getContent(userName,getType());
+
+ if (rawHtmlContent != null) {
+ // BodyPart htmlBodyPart = new MimeBodyPart();
+ // Multipart content = new MimeMultipart();
+ try {
+ // content.addBodyPart(htmlBodyPart);
+ // message.setContent(content);
+ message.setText(rawHtmlContent + "\n");
+ message.setHeader("Content-type", getType());
+ } catch (MessagingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ return (message);
+ }
+
+ protected abstract String getType();
private String getApplicationName(String hostUrl) {
String[] hostUrlParts = hostUrl.split("/");
@@ -89,7 +113,7 @@
return (appName);
}
- protected String getContent(String userName) {
+ protected String getContent(String userName,String type) {
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
Node publicationNode = cloud.getNode(publicationNumber);
@@ -103,7 +127,12 @@
URLConnection connection = url.openConnection();
((HttpURLConnection) connection).setRequestMethod("GET");
connection.setDoInput(true);
+ if(type == null || type.trim().length() == 0) {
connection.setRequestProperty("Content-Type", "text/html");
+ }
+ else {
+ connection.setRequestProperty("Content-Type", type);
+ }
connection.setRequestProperty("username", userName);
InputStream input = connection.getInputStream();
Reader reader = new InputStreamReader(input);
Index: NewsletterGeneratorHtml.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/generator/NewsletterGeneratorHtml.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterGeneratorHtml.java 17 Jan 2008 21:47:15 -0000 1.2
+++ NewsletterGeneratorHtml.java 2 Apr 2008 09:40:01 -0000 1.3
@@ -14,30 +14,10 @@
public NewsletterGeneratorHtml(int publicationNumber) {
super(publicationNumber);
- // TODO Auto-generated constructor stub
}
@Override
- public Message generateNewsletterMessage(String userName) {
- Session session = getMailSession();
- Message message = new MimeMessage(session);
- String rawHtmlContent = getContent(userName);
-
- if (rawHtmlContent != null) {
- // BodyPart htmlBodyPart = new MimeBodyPart();
- // Multipart content = new MimeMultipart();
- try {
- // content.addBodyPart(htmlBodyPart);
- // message.setContent(content);
- message.setText(rawHtmlContent + "\n");
- message.setHeader("Content-type", "text/html");
- } catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ protected String getType() {
+ return "text/html";
}
-
- return (message);
- }
-
}
Index: NewsletterGeneratorPlain.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/generator/NewsletterGeneratorPlain.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterGeneratorPlain.java 17 Jan 2008 21:47:15 -0000 1.2
+++ NewsletterGeneratorPlain.java 2 Apr 2008 09:40:01 -0000 1.3
@@ -1,6 +1,12 @@
package com.finalist.newsletter.generator;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.MimeMessage;
public class NewsletterGeneratorPlain extends NewsletterGenerator {
@@ -10,10 +16,7 @@
}
@Override
- public Message generateNewsletterMessage(String userName) {
- // TODO Auto-generated method stub
-
- return null;
+ protected String getType() {
+ return "text/plain";
}
-
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
