From 7bc975931992d009a8203ae1d2655d6603d595d9 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <stefan.bodewig@innoq.com>
Date: Sat, 18 Apr 2015 22:53:43 +0200
Subject: [PATCH] Add ability to send carbon copies to MailLogger. Submitted by
 Roman Savko PR: 57789

---
 CONTRIBUTORS                                  |  1 +
 WHATSNEW                                      |  3 ++
 contributors.xml                              |  4 +++
 manual/listeners.html                         | 20 ++++++++++++
 .../apache/tools/ant/listener/MailLogger.java | 32 +++++++++++++++++--
 5 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fffd4e40f..564ce67da 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -329,6 +329,7 @@ Rob van Oostrum
 Rodrigo Schmidt
 Roger Vaughn
 Roman Ivashin
+Roman Savko
 Ronen Mashal
 Russell Gold
 Ryan Bennitt
diff --git a/WHATSNEW b/WHATSNEW
index b3ffb298d..939c5dc29 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -104,6 +104,9 @@ Other changes:
  * performance improvements for <intersect>
    Bugzilla Report 57588
 
+ * MailLogger can now add CC and BCC addresses.
+   Bugzilla Report 57789.
+
 Changes from Ant 1.9.3 TO Ant 1.9.4
 ===================================
 
diff --git a/contributors.xml b/contributors.xml
index f7a638d3e..299cee8ea 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -1329,6 +1329,10 @@
     <first>Roman</first>
     <last>Ivashin</last>
   </name>
+  <name>
+    <first>Roman</first>
+    <last>Savko</last>
+  </name>
   <name>
     <first>Ronen</first>
     <last>Mashal</last>
diff --git a/manual/listeners.html b/manual/listeners.html
index 2a5cc737d..2015cd521 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -217,6 +217,26 @@ control for turning off success or failure messages individually.</p>
     <td width="63%">Address(es) to send success messages to, comma-separated</td>
     <td width="63%">Yes, if success mail is to be sent</td>
   </tr>
+  <tr>
+    <td width="337">MailLogger.failure.cc </td>
+    <td width="63%">Address(es) to send failure messages to carbon copy (cc), comma-separated</td>
+    <td width="63%">No</td>
+  </tr>
+  <tr>
+    <td width="337">MailLogger.success.cc </td>
+    <td width="63%">Address(es) to send success messages to carbon copy (cc), comma-separated</td>
+    <td width="63%">No</td>
+  </tr>
+  <tr>
+    <td width="337">MailLogger.failure.bcc </td>
+    <td width="63%">Address(es) to send failure messages to blind carbon copy (bcc), comma-separated</td>
+    <td width="63%">No</td>
+  </tr>
+  <tr>
+    <td width="337">MailLogger.success.bcc </td>
+    <td width="63%">Address(es) to send success messages to blind carbon copy (bcc), comma-separated</td>
+    <td width="63%">No</td>
+  </tr>
   <tr>
     <td width="337">MailLogger.failure.subject </td>
     <td width="63%">Subject of failed build</td>
diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java
index 8c0fff883..4b50547f3 100644
--- a/src/main/org/apache/tools/ant/listener/MailLogger.java
+++ b/src/main/org/apache/tools/ant/listener/MailLogger.java
@@ -65,6 +65,14 @@ import org.apache.tools.mail.MailMessage;
  *    to send failure messages to</li>
  *    <li> MailLogger.success.to [required if success mail to be sent] - Address
  *    to send success messages to</li>
+ *    <li> MailLogger.failure.cc [no default] - Address
+ *    to send failure messages to carbon copy (cc)</li>
+ *    <li> MailLogger.success.to [no default] - Address
+ *    to send success messages to carbon copy (cc)</li>
+ *    <li> MailLogger.failure.bcc [no default] - Address
+ *    to send failure messages to blind carbon copy (bcc)</li>
+ *    <li> MailLogger.success.bcc [no default] - Address
+ *    to send success messages to blind carbon copy (bcc)</li>
  *    <li> MailLogger.failure.subject [default: "Build Failure"] - Subject of
  *    failed build</li>
  *    <li> MailLogger.success.subject [default: "Build Success"] - Subject of
@@ -151,6 +159,8 @@ public class MailLogger extends DefaultLogger {
                 .from(getValue(properties, "from", null))
                 .replytoList(getValue(properties, "replyto", ""))
                 .toList(getValue(properties, prefix + ".to", null))
+                .toCcList(getValue(properties, prefix + ".cc", ""))
+                .toBccList(getValue(properties, prefix + ".bcc", ""))
                 .mimeType(getValue(properties, "mimeType", DEFAULT_MIME_TYPE))
                 .charset(getValue(properties, "charset", ""))
                 .body(getValue(properties, prefix + ".body", ""))
@@ -236,6 +246,22 @@ public class MailLogger extends DefaultLogger {
             this.toList = toList;
             return this;
         }
+        private String toCcList;
+        public String toCcList() {
+            return toCcList;
+        }
+        public Values toCcList(String toCcList) {
+            this.toCcList = toCcList;
+            return this;
+        }
+        private String toBccList;
+        public String toBccList() {
+            return toBccList;
+        }
+        public Values toBccList(String toBccList) {
+            this.toBccList = toBccList;
+            return this;
+        }
         private String subject;
         public String subject() {
             return subject;
@@ -392,8 +418,10 @@ public class MailLogger extends DefaultLogger {
         mailer.setReplyToList(replyToList);
         Vector<EmailAddress> toList = vectorizeEmailAddresses(values.toList());
         mailer.setToList(toList);
-        mailer.setCcList(new Vector<EmailAddress>());
-        mailer.setBccList(new Vector<EmailAddress>());
+        Vector<EmailAddress> toCcList = vectorizeEmailAddresses(values.toCcList());
+        mailer.setCcList(toCcList);
+        Vector<EmailAddress> toBccList = vectorizeEmailAddresses(values.toBccList());
+        mailer.setBccList(toBccList);
         mailer.setFiles(new Vector<File>());
         mailer.setSubject(values.subject());
         mailer.setHeaders(new Vector<Header>());