From 37d95e7a4f4f8f089087d5c552a5f431cc0bcf31 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 25 Apr 2004 18:19:41 +0000
Subject: [PATCH] a) Specify the output file as maven.announcement.file b)
 Default it to ${maven.build.dir}/announcement.txt c) Add
 ${maven.announcement.file} to the echo when generating it so the user knows
 where to find it.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115049 13f79535-47bb-0310-9956-ffa450edef68
---
 announcement/plugin.jelly         |  4 ++--
 announcement/plugin.properties    |  3 ++-
 announcement/xdocs/changes.xml    |  3 +++
 announcement/xdocs/properties.xml | 10 ++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/announcement/plugin.jelly b/announcement/plugin.jelly
index a323c1a1..ea4c5917 100644
--- a/announcement/plugin.jelly
+++ b/announcement/plugin.jelly
@@ -38,7 +38,7 @@
       <ant:fail>The 'maven.announcement.version' property needs to be defined.</ant:fail>
     </j:if>
   
-    <echo>Generating announcement for release ${maven.announcement.version} ...</echo>
+    <echo>Generating announcement for release ${maven.announcement.version} in ${maven.announcement.file}...</echo>
 
     <util:file var="inputFile" name="${maven.docs.src}/changes.xml"/>
     <x:parse var="doc" xml="${inputFile}"/>
@@ -62,7 +62,7 @@
     <j:set var="stylesheetURI" 
         value="file:${plugin.resources}/announcement.jsl"/>
     <j:file
-        name="${maven.build.dir}/announcement.txt"
+        name="${maven.announcement.file}"
         outputMode="xml"
         omitXmlDeclaration="true"
         prettyPrint="false">
diff --git a/announcement/plugin.properties b/announcement/plugin.properties
index b60db3e9..e64ac796 100644
--- a/announcement/plugin.properties
+++ b/announcement/plugin.properties
@@ -20,4 +20,5 @@
 
 # Version for which to create a release note. This property needs to
 # be defined in your project. For example:
-maven.announcement.version = ${pom.version}
\ No newline at end of file
+maven.announcement.version = ${pom.version}
+maven.announcement.file=${maven.build.dir}/announcement.txt
\ No newline at end of file
diff --git a/announcement/xdocs/changes.xml b/announcement/xdocs/changes.xml
index af7cefc3..b005afef 100644
--- a/announcement/xdocs/changes.xml
+++ b/announcement/xdocs/changes.xml
@@ -25,6 +25,9 @@
   </properties>
   <body>
     <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">
+        Added maven.announcement.file property and echo'd it during generation
+      </action>
       <action dev="vmassol" type="add" issue="MPANNOUNCEMENT-2" due-to="Fabrizio Giustina">
         Added more information when running the plugin. Also added a check to 
         verify if the announcement version matches an entry in the 
diff --git a/announcement/xdocs/properties.xml b/announcement/xdocs/properties.xml
index 91f9fe32..325a1d5b 100644
--- a/announcement/xdocs/properties.xml
+++ b/announcement/xdocs/properties.xml
@@ -38,6 +38,16 @@
             <code>${pom.version}</code>
           </td>
         </tr>
+        <tr>
+          <td>maven.announcement.file</td>
+          <td>Yes</td>
+          <td>
+            The file name that the announcement is generated into.
+          </td>
+          <td>
+            <code>${maven.build.dir}/announcement.txt</code>
+          </td>
+        </tr>
       </table>
     </section>
   </body>