Changeset 520:84587e916e10

Timestamp:

09/23/09 16:59:53 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@521

Message:

changed subject
+ add baseUri to the context

Files:

• src/org/w3c/unicorn/output/MailOutputModule.java (modified) (4 diffs)

src/org/w3c/unicorn/output/MailOutputModule.java

@@ -1 @@
-// $Id: MailOutputModule.java,v 1.6 2009-09-23 15:40:34 tgambet Exp $
+// $Id: MailOutputModule.java,v 1.7 2009-09-23 16:59:53 tgambet Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -15 +15 @@
 
 import java.util.*; 
+import org.w3c.unicorn.UnicornCall;
 import org.w3c.unicorn.util.Property;
 import org.w3c.unicorn.util.UnicornAuthenticator;
@@ -65 +66 @@
             
                 try {
+                        
+                        mapOfStringObject.put("baseUri", "http://qa-dev.w3.org:8001/unicorn/");
+                        
                         Properties mailProps = Property.getProps("mail.properties");
                         Authenticator auth = new UnicornAuthenticator(mailProps.getProperty("unicorn.mail.username"), mailProps.getProperty("unicorn.mail.password"));
@@ -78 +82 @@
                     InternetAddress addressFrom = new InternetAddress(mailProps.getProperty("unicorn.mail.from"), "Unicorn");
                         msg.setFrom(addressFrom);
-                        
-                        InternetAddress[] adresses = {new InternetAddress(recipient)};
-                        msg.setRecipients(Message.RecipientType.TO, adresses);
+                        msg.setRecipient(Message.RecipientType.TO, new InternetAddress(recipient));
                         
                         // Setting the Subject and Content Type
-                        msg.setSubject("Unicorn results, " + new Date());
+                        UnicornCall uniCall = (UnicornCall) mapOfStringObject.get("unicorncall");
+                        boolean passed = ((UnicornCall) mapOfStringObject.get("unicorncall")).isPassed();
+                        
+                        String subject = "[Unicorn] ";
+                        if (passed)
+                                subject += "SUCCEEDED: ";
+                        else 
+                                subject += "FAILED: ";
+                        subject += "Task \"" + uniCall.getTask().getLongName(mapOfOutputParameters.get("lang")) + "\" for \"" + uniCall.getDocumentName() + "\"";
+                        
+                        msg.setSubject(subject);
                         
                         CharArrayWriter writer = new CharArrayWriter();