Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/announcement/plugin.jelly,v
retrieving revision 1.3
diff -u -r1.3 plugin.jelly
--- plugin.jelly	12 Apr 2004 19:46:03 -0000	1.3
+++ plugin.jelly	18 Apr 2004 20:24:48 -0000
@@ -24,7 +24,9 @@
   xmlns:ant="jelly:ant"
   xmlns:define="jelly:define"
   xmlns:util="jelly:util"
-  xmlns:doc="doc">
+  xmlns:doc="doc"
+  xmlns:maven="jelly:maven"
+  xmlns:jsl="jelly:jsl">
 
   <goal name="announcement" prereqs="announcement:generate"
     description="Generate release announcement"/>
@@ -35,12 +37,28 @@
     <j:if test="${context.getVariable('maven.announcement.version') == null}">
       <ant:fail>The 'maven.announcement.version' property needs to be defined.</ant:fail>
     </j:if>
-    
-    <j:echo>Generating announcement for release ${maven.announcement.version} ...</j:echo>
+  
+    <echo>Generating announcement for release ${maven.announcement.version} ...</echo>
 
     <util:file var="inputFile" name="${maven.docs.src}/changes.xml"/>
     <x:parse var="doc" xml="${inputFile}"/>
-
+    
+    <maven:property var="versionVariable" name="maven.announcement.version" defaultValue="${pom.currentVersion}"/>
+  
+    <jsl:stylesheet select="$doc">
+      <jsl:template match="document/body/release">
+        <x:set var="version" select="string(@version)"/>
+        <j:if test="${versionVariable.equals(version)}">
+            <x:set var="versionFound" select="string(@version)"/>
+        </j:if>
+      </jsl:template>
+    </jsl:stylesheet>
+    
+    <j:if test="${versionFound == null}">
+      <ant:fail>The release '${maven.announcement.version}' could not be found in change log</ant:fail>
+    </j:if>
+    
+    
     <j:set var="stylesheetURI" 
         value="file:${plugin.resources}/announcement.jsl"/>
     <j:file
Index: plugin.properties
===================================================================
RCS file: /home/cvspublic/maven-plugins/announcement/plugin.properties,v
retrieving revision 1.4
diff -u -r1.4 plugin.properties
--- plugin.properties	12 Apr 2004 19:46:03 -0000	1.4
+++ plugin.properties	18 Apr 2004 20:24:48 -0000
@@ -20,4 +20,4 @@
 
 # Version for which to create a release note. This property needs to
 # be defined in your project. For example:
-# maven.announcement.version = 1.0
+maven.announcement.version = ${pom.version}
Index: src/plugin-resources/announcement.jsl
===================================================================
RCS file: /home/cvspublic/maven-plugins/announcement/src/plugin-resources/announcement.jsl,v
retrieving revision 1.5
diff -u -r1.5 announcement.jsl
--- src/plugin-resources/announcement.jsl	12 Apr 2004 19:46:04 -0000	1.5
+++ src/plugin-resources/announcement.jsl	18 Apr 2004 20:24:48 -0000
@@ -73,7 +73,7 @@
       <j:whitespace trim="false"> 
 
 You can download the ${pom.name} here:
-${pom.distributionDirectory}
+${pom.url}
 
 Have fun!
 -The development team