You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2008/10/01 15:29:48 UTC
svn commit: r700763 -
/continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
Author: evenisse
Date: Wed Oct 1 06:29:48 2008
New Revision: 700763
URL: http://svn.apache.org/viewvc?rev=700763&view=rev
Log:
Set explicitly the sent date
Modified:
continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
Modified: continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=700763&r1=700762&r2=700763&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original)
+++ continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Wed Oct 1 06:29:48 2008
@@ -19,23 +19,6 @@
* under the License.
*/
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.execution.ExecutorConfigurator;
@@ -69,6 +52,23 @@
import org.slf4j.LoggerFactory;
import org.springframework.mail.javamail.JavaMailSender;
+import javax.mail.Address;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
@@ -544,19 +544,17 @@
return;
}
-
-
try
{
-
+
MimeMessage message = javaMailSender.createMimeMessage();
-
+
message.addHeader( "X-Continuum-Build-Host", buildHost );
message.addHeader( "X-Continuum-Project-Id", Integer.toString( project.getId() ) );
- message.addHeader( "X-Continuum-Project-Name", project.getName() );
-
+ message.addHeader( "X-Continuum-Project-Name", project.getName() );
+
message.setSubject( subject );
log.info( "Message Subject: '" + subject + "'." );
@@ -585,15 +583,16 @@
for ( String address : addresses )
{
// TODO: set a proper name
- InternetAddress to = new InternetAddress( address.trim() );
+ InternetAddress to = new InternetAddress( address.trim() );
log.info( "Recipient: To '" + to + "'." );
recipients.add( to );
}
- message.setRecipients(Message.RecipientType.TO, recipients.toArray(new Address[recipients.size()]));
+ message.setRecipients( Message.RecipientType.TO,
+ recipients.toArray( new Address[recipients.size()] ) );
}
-
+
String committerField = (String) notifier.getConfiguration().get( COMMITTER_FIELD );
if ( StringUtils.isNotEmpty( committerField ) && context.getBuildResult() != null )
{
@@ -653,6 +652,8 @@
message.addRecipient( Message.RecipientType.TO, to );
}
+ message.setSentDate( new Date() );
+
javaMailSender.send( message );
//mailSender.send( message );
}
@@ -667,7 +668,7 @@
catch ( UnsupportedEncodingException ex )
{
throw new NotificationException( "Exception while sending message.", ex );
- }
+ }
}
private Map<String, String> mapDevelopersToRecipients( List<ProjectDeveloper> developers )