Index: announcement.jsl
===================================================================
RCS file: /home/cvspublic/maven-plugins/announcement/src/plugin-resources/announcement.jsl,v
retrieving revision 1.4
diff -u -r1.4 announcement.jsl
--- announcement.jsl	6 Jan 2004 20:48:07 -0000	1.4
+++ announcement.jsl	12 Apr 2004 16:45:07 -0000
@@ -16,21 +16,86 @@
 
       <j:useBean var="formatter" class="org.apache.maven.announcement.Formatter"/>
 
-      <j:set var="header" value="The Maven team is pleased to announce the ${pom.name} ${versionVariable} release!"/>
-      <j:set var="formattedHeader" value="${formatter.format(header,78)}"/>
+      <j:set var="header" trim="true">
+        The ${pom.groupId} team is pleased to announce the ${pom.name} ${versionVariable} release!
+      </j:set>
+
+      <j:forEach var="line" items="${formatter.format(header,78)}">
+         <j:whitespace trim="false">${line}
+</j:whitespace>
+      </j:forEach>
+      <j:whitespace trim="false">
+${pom.url}
 
-      <!-- TODO: Find out why brackets are added -->
 
-      <j:whitespace trim="false">${formattedHeader}
+Changes in this version include:
+      </j:whitespace>
 
-${pom.url}
+      <x:set var="actions" select="action[@type='add']" sort="@type" />
+        <j:if test="${!empty(actions)}">
+<j:whitespace trim="false">
+
+  New Features:
+</j:whitespace>
+        <j:forEach var="action" items="${actions}">
+          <x:set var="item" select="."/><jsl:applyTemplates select="$action"/>
+        </j:forEach>
+      </j:if>
+      <x:set var="actions" select="action[@type='fix']" sort="@type" />
+        <j:if test="${!empty(actions)}">
+<j:whitespace trim="false">
+
+  Fixed bugs:
+</j:whitespace>
+        <j:forEach var="action" items="${actions}">
+          <x:set var="item" select="."/><jsl:applyTemplates select="$action"/>
+        </j:forEach>
+      </j:if>
+      <x:set var="actions" select="action[@type='update']" sort="@type" />
+        <j:if test="${!empty(actions)}">
+<j:whitespace trim="false">
+
+  Changes:
+</j:whitespace>
+        <j:forEach var="action" items="${actions}">
+          <x:set var="item" select="."/><jsl:applyTemplates select="$action"/>
+        </j:forEach>
+      </j:if>
+      <x:set var="actions" select="action[@type='remove']" sort="@type" />
+        <j:if test="${!empty(actions)}">
+<j:whitespace trim="false">
+
+  Removed features:
+</j:whitespace>
+        <j:forEach var="action" items="${actions}">
+          <x:set var="item" select="."/><jsl:applyTemplates select="$action"/>
+        </j:forEach>
+      </j:if>
 
-Changes in this version include (last changes first):
+      <j:whitespace trim="false"> 
+
+You can download the ${pom.name} here:
+${pom.distributionDirectory}
+
+Have fun!
+-The development team
       </j:whitespace>
 
-      <x:forEach var="action" select="action">
-        <x:set var="text" select="string($action)"/>
+    </j:if>
+
+  </jsl:template>
+  
+  <jsl:template match="action" trim="true">
+        <x:set var="body" select="string(.)"/>
         <j:set var="counter" value=""/>
+        
+        <j:set var="issue"><x:expr select="@issue"/></j:set>
+        <j:set var="dueto"><x:expr select="@due-to"/></j:set>
+        
+        <j:set var="text" trim="true">
+          ${body}<j:if test="${issue != ''}"> Fixes ${issue}.</j:if> <j:if test="${dueto != ''}"> Thanks to ${dueto}.</j:if>
+        </j:set>
+        
         <j:forEach var="line" items="${formatter.format(text,75)}">
           <j:choose>
             <j:when test="${counter.length() == '0'}">
@@ -42,25 +107,8 @@
   ${line}</j:whitespace>
             </j:otherwise>
           </j:choose>
-          <!-- TODO: Add reference to issue number if there's any -->
           <j:set var="counter" value="${counter}X"/>
         </j:forEach>
-      </x:forEach>
-
-      <j:whitespace trim="false"> 
-     	
-This plugin has been tested with Maven [TODO]. Using it with
-another version of Maven is at your own risks! :-)
-
-You can download the ${pom.name} here:
-${maven.repo.remote}/${pom.groupId}/jars/${pom.artifactId}-${versionVariable}.jar
-
-Have fun!
--The development team
-      </j:whitespace>
-
-    </j:if>
-
   </jsl:template>
 
   <jsl:template match="@*"/>