You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/11/03 00:21:51 UTC
svn commit: r709989 - in
/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement:
AnnouncementMailMojo.java mailsender/ProjectJavamailMailSender.java
Author: olamy
Date: Sun Nov 2 15:21:50 2008
New Revision: 709989
URL: http://svn.apache.org/viewvc?rev=709989&view=rev
Log:
[MCHANGES-107] Add html output format for mail annoucement
Submitted by Christophe Lallement
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java?rev=709989&r1=709988&r2=709989&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java Sun Nov 2 15:21:50 2008
@@ -19,22 +19,23 @@
* under the License.
*/
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.model.Developer;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.announcement.mailsender.ProjectJavamailMailSender;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.console.ConsoleLogger;
+import org.codehaus.plexus.mailsender.MailMessage;
import org.codehaus.plexus.mailsender.MailSenderException;
import org.codehaus.plexus.util.IOUtil;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Goal which sends an announcement through email.
*
@@ -152,6 +153,14 @@
* @required
*/
private String template;
+
+ /**
+ * Mail content type to use.
+ * @parameter default-value="text/plain"
+ * @required
+ * @since 2.1
+ */
+ private String mailContentType;
private ProjectJavamailMailSender mailer = new ProjectJavamailMailSender();
@@ -179,8 +188,9 @@
{
mailer.setPassword( password );
}
+
mailer.initialize();
-
+
if ( getLog().isDebugEnabled() )
{
getLog().debug( "fromDeveloperId: " + getFromDeveloperId() );
@@ -223,8 +233,13 @@
{
email = it.next().toString();
getLog().info( "Sending mail to " + email + "..." );
- mailer.send( getSubject(), IOUtil.toString( readAnnouncement( templateFile ) ), email, "", fromAddress,
- fromName );
+ MailMessage mailMsg = new MailMessage();
+ mailMsg.setSubject( getSubject() );
+ mailMsg.setContent( IOUtil.toString( readAnnouncement( templateFile ) ) );
+ mailMsg.setContentType( this.mailContentType );
+ mailMsg.setFrom( email, "" );
+ mailMsg.addTo( fromAddress, fromName );
+ mailer.send( mailMsg );
getLog().info( "Sent..." );
}
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java?rev=709989&r1=709988&r2=709989&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java Sun Nov 2 15:21:50 2008
@@ -178,7 +178,7 @@
// Setting the Subject and Content Type
msg.setSubject( mail.getSubject() );
- msg.setContent( mail.getContent(), "text/plain" );
+ msg.setContent( mail.getContent(), mail.getContentType() == null ? "text/plain" : mail.getContentType() );
if ( mail.getSendDate() != null )
{