Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/announcement/plugin.jelly,v
retrieving revision 1.11
diff -u -r1.11 plugin.jelly
--- plugin.jelly	22 Jul 2004 11:26:28 -0000	1.11
+++ plugin.jelly	27 Jul 2004 13:25:34 -0000
@@ -26,6 +26,7 @@
   xmlns:util="jelly:util"
   xmlns:doc="doc"
   xmlns:maven="jelly:maven"
+  xmlns:email="jelly:email"
   xmlns:jsl="jelly:jsl"
   xmlns:announcement="announcement">
 
@@ -40,6 +41,21 @@
     <maven:property var="announcementFile" name="maven.announcement.file" 
         defaultValue="${maven.gen.docs}/announcements/announcement-${versionVariable}.txt"/>
 
+    <!-- Properties used by announcement:mail -->
+    <maven:property var="smtpServer" name="maven.announcement.mail.server"
+        defaultValue=""/>
+    <maven:property var="mailFrom" name="maven.announcement.mail.from"
+        defaultValue=""/>
+    <j:if test="${empty(mailFrom)}">
+       <j:forEach var="developer" items="${pom.developers}">
+          <j:if test="${empty(mailFrom) and not empty(developer.email)}">
+             <j:set var="mailFrom" value="${developer.email}"/>
+          </j:if>
+       </j:forEach>
+    </j:if>
+    <maven:property var="mailTo" name="maven.announcement.mail.to"
+        defaultValue=""/>
+
     <!-- Ensure the directory where the announcement will be created exists -->
     <ant:dirname property="announcementDir" file="${announcementFile}"/>
     <ant:mkdir dir="${announcementDir}"/>
@@ -97,6 +113,32 @@
     
   </goal>
 
+  <goal name="announcement:mail" prereqs="announcement:generate"
+    description="Send an email message with release announcement">
+
+    <announcement:mail file="${announcementFile}"/>
+
+  </goal>
+
+  <goal name="announcement:mail-all" prereqs="announcement:init"
+    description="Send release announcement messages for all releases">
+
+    <x:parse var="doc" xml="${inputFile}"/>
+
+    <jsl:stylesheet select="$doc">
+      <jsl:template match="document/body/release">
+        <x:set var="versionVariable" select="string(@version)"/>
+        <j:set var="announcementFile" 
+            value="${maven.gen.docs}/announcements/announcement-${versionVariable}.txt"/>
+        <announcement:generate file="${announcementFile}"/>
+        <announcement:mail file="${announcementFile}"/>
+      </jsl:template>
+      <jsl:template match="@*"/>
+      <jsl:template match="text()"/>
+    </jsl:stylesheet>
+    
+  </goal>
+
   <!-- Define common jelly script used by different goals as a jelly tag -->
   <define:taglib uri="announcement">
     <define:tag name="generate">
@@ -118,6 +160,33 @@
       </j:file>
 
     </define:tag>
+
+    <define:tag name="mail">
+      <!-- @file: Announcement file location -->
+
+      <!-- we need to set mailSubject here, otherwise versionVariable will
+           not change -->
+    <maven:property var="mailSubject" name="maven.announcement.mail.subject"
+        defaultValue="Announcing ${pom.groupId} release ${versionVariable}"/>
+
+      <j:if test="${empty(smtpServer)}">
+        <fail>Property maven.announcement.mail.server not set!</fail>
+      </j:if>
+      <j:if test="${empty(mailFrom)}">
+        <fail>Could not get a sender for the announcement message.
+  Please set property maven.announcement.mail.from or make sure at least onte 
+  developer element in the POM has an email address.
+        </fail>
+      </j:if>
+      <j:if test="${empty(mailTo)}">
+        <fail>Property maven.announcement.mail.to not set!</fail>
+      </j:if>
+      <echo>Sending mail using server ${smtpServer}, subject ${mailSubject}</echo>
+      <echo>from ${mailFrom} to ${mailTo}.</echo>
+      <util:loadText uri="file:${file}" var="announcementContent" />
+      <email:email server="${smtpServer}" to="${mailTo}" from="${mailFrom}" message="${announcementContent}" subject="${mailSubject}"/>
+    </define:tag>
+
   </define:taglib>
 
 </project>
Index: project.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/announcement/project.xml,v
retrieving revision 1.25
diff -u -r1.25 project.xml
--- project.xml	15 Jul 2004 19:19:48 -0000	1.25
+++ project.xml	27 Jul 2004 13:25:34 -0000
@@ -87,5 +87,22 @@
       <version>20030211.142705</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
+    <dependency>
+      <groupId>jaf</groupId>
+      <version>1.0.2</version>
+      <artifactId>activation</artifactId>
+      <url>http://java.sun.com/beans/glasgow/jaf.html</url>
+    </dependency>
+    <dependency>
+      <groupId>javamail</groupId>
+      <version>1.3.1</version>
+      <artifactId>mail</artifactId>
+      <url>http://java.sun.com/products/javamail/</url>
+    </dependency>
+    <dependency>
+      <id>commons-jelly:commons-jelly-tags-email</id>
+      <version>20030211.144034</version>
+      <url>http://jakarta.apache.org/commons/jelly/libs/email/index.html</url>
+    </dependency>
   </dependencies>
 </project>
Index: xdocs/changes.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/announcement/xdocs/changes.xml,v
retrieving revision 1.21
diff -u -r1.21 changes.xml
--- xdocs/changes.xml	22 Jul 2004 11:26:28 -0000	1.21
+++ xdocs/changes.xml	27 Jul 2004 13:25:35 -0000
@@ -25,6 +25,9 @@
   </properties>
   <body>
     <release version="1.3-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="add" issue="MPANNOUNCEMENT-9" due-to="Felipe Leme">
+        Added new <code>announcement:mail</code> goal.
+      </action>
       <action dev="vmassol" type="add" issue="MPANNOUNCEMENT-11" due-to="Felipe Leme">
         Added new optional <code>maven.announcement.stylesheet.path</code>property 
         that defines what stylesheet to use to generate the text announcement.
Index: xdocs/goals.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/announcement/xdocs/goals.xml,v
retrieving revision 1.4
diff -u -r1.4 goals.xml
--- xdocs/goals.xml	2 Jul 2004 20:57:16 -0000	1.4
+++ xdocs/goals.xml	27 Jul 2004 13:25:35 -0000
@@ -47,6 +47,18 @@
             Generate a release announcement in text format for all releases 
             found in <code>changes.xml</code>
           </td>
+        <tr>
+          <td>announcement:mail</td>
+          <td>
+            Send an email announcement message, according to the <a href="properties.html">properties</a>.
+          </td>
+        </tr>
+        <tr>
+          <td>announcement:mail-all</td>
+          <td>
+            Send an email announcement message for all releases, according to the <a href="properties.html">properties</a>.
+          </td>
+        </tr>
         </tr>
       </table>
     </section>
Index: xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/announcement/xdocs/properties.xml,v
retrieving revision 1.9
diff -u -r1.9 properties.xml
--- xdocs/properties.xml	22 Jul 2004 11:26:28 -0000	1.9
+++ xdocs/properties.xml	27 Jul 2004 13:25:35 -0000
@@ -71,6 +71,46 @@
             <code>${plugin.resources}/announcement.jsl</code>
           </td>
         </tr>
+        <tr>
+          <td>maven.announcement.mail.server</td>
+          <td>Yes</td>
+          <td>
+            Address of the SMTP server used to send the email message. This property is required for goals <code>announcement:mail</code> and <code>announcement:mail-all</code>.
+          </td>
+          <td>
+            <code>-</code>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.announcement.mail.subject</td>
+          <td>Yes</td>
+          <td>
+            Subject of the announcement email message.
+          </td>
+          <td>
+            <code>Announcing ${pom.groupId} release ${pom.currentVersion}</code>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.announcement.mail.from</td>
+          <td>Yes</td>
+          <td>
+            Sender (email address) of the announcement message.
+          </td>
+          <td>
+            <code>first developer email available at the POM</code>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.announcement.mail.to</td>
+          <td>Yes</td>
+          <td>
+            Recipients (email addresses separated by ;) of the announcement message. This property is required for goals <code>announcement:mail</code> and <code>announcement:mail-all</code>.
+          </td>
+          <td>
+            <code>-</code>
+          </td>
+        </tr>
       </table>
     </section>
   </body>