Browse Source

Applied patch from Romin Irani, thanks

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273199 13f79535-47bb-0310-9956-ffa450edef68
master
Erik Hatcher 23 years ago
parent
commit
f052bb39d6
1 changed files with 6 additions and 4 deletions
  1. +6
    -4
      src/main/org/apache/tools/ant/listener/MailLogger.java

+ 6
- 4
src/main/org/apache/tools/ant/listener/MailLogger.java View File

@@ -72,7 +72,7 @@ import org.apache.tools.mail.MailMessage;
* results. The following Project properties are used to send the mail. * results. The following Project properties are used to send the mail.
* <ul> * <ul>
* <li> MailLogger.mailhost [default: localhost] - Mail server to use</li> * <li> MailLogger.mailhost [default: localhost] - Mail server to use</li>
*
* <li> MailLogger.port [default: 25] - Default port for SMTP </li>
* <li> MailLogger.from [required] - Mail "from" address</li> * <li> MailLogger.from [required] - Mail "from" address</li>
* <li> MailLogger.failure.notify [default: true] - Send build failure * <li> MailLogger.failure.notify [default: true] - Send build failure
* e-mails?</li> * e-mails?</li>
@@ -150,13 +150,14 @@ public class MailLogger extends DefaultLogger {
} }


String mailhost = getValue(properties, "mailhost", "localhost"); String mailhost = getValue(properties, "mailhost", "localhost");
int port = Integer.parseInt(getValue(properties,"port",String.valueOf(MailMessage.DEFAULT_PORT)));
String from = getValue(properties, "from", null); String from = getValue(properties, "from", null);


String toList = getValue(properties, prefix + ".to", null); String toList = getValue(properties, prefix + ".to", null);
String subject = getValue(properties, prefix + ".subject", String subject = getValue(properties, prefix + ".subject",
(success) ? "Build Success" : "Build Failure"); (success) ? "Build Success" : "Build Failure");


sendMail(mailhost, from, toList, subject, buffer.toString());
sendMail(mailhost, port, from, toList, subject, buffer.toString());
} catch (Exception e) { } catch (Exception e) {
System.out.println("MailLogger failed to send e-mail!"); System.out.println("MailLogger failed to send e-mail!");
e.printStackTrace(System.err); e.printStackTrace(System.err);
@@ -207,15 +208,16 @@ public class MailLogger extends DefaultLogger {
* Send the mail * Send the mail
* *
* @param mailhost mail server * @param mailhost mail server
* @param port mail server port number
* @param from from address * @param from from address
* @param toList comma-separated recipient list * @param toList comma-separated recipient list
* @param subject mail subject * @param subject mail subject
* @param message mail body * @param message mail body
* @exception IOException thrown if sending message fails * @exception IOException thrown if sending message fails
*/ */
private void sendMail(String mailhost, String from, String toList,
private void sendMail(String mailhost, int port, String from, String toList,
String subject, String message) throws IOException { String subject, String message) throws IOException {
MailMessage mailMessage = new MailMessage(mailhost);
MailMessage mailMessage = new MailMessage(mailhost, port);


mailMessage.from(from); mailMessage.from(from);




Loading…
Cancel
Save