MPANNOUNCEMENT-18: Support new format of action element in changes.xml

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@291201 13f79535-47bb-0310-9956-ffa450edef68

announcement/src/plugin-resources/announcement.jsl

@@ -56,6 +56,8 @@ ${pom.url}
 </j:whitespace>
       </j:forEach>
       <j:whitespace trim="false">
+===============================================================================
+
 Changes in this version include:</j:whitespace>
 
       <x:set var="actions" select="action[@type='add']" sort="@type" />
@@ -103,6 +105,9 @@ Changes in this version include:</j:whitespace>
       <u:available file="${basedir}/plugin.jelly">
         <j:whitespace trim="false"> 
 
+===============================================================================
+
+
 To automatically install the plugin, type the following on a single line:
 
 maven plugin:download
@@ -113,28 +118,78 @@ maven plugin:download
 
 For a manual installation, you can download the plugin here:
 ${maven.announcement.distributionUrl}/${pom.artifactId}-${versionVariable}.jar
-        </j:whitespace>
+</j:whitespace>
       </u:available>
       <j:whitespace trim="false"> 
 
 Have fun!
 -The ${pom.name} development team
-      </j:whitespace>
+</j:whitespace>
     </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>
-        
+    <x:set var="currentAction" select="."/>
     <j:set var="text" trim="true">
-      ${body}
-      <j:if test="${issue != ''}"><j:whitespace> Issue: ${issue}.</j:whitespace></j:if>
-      <j:if test="${dueto != ''}"><j:whitespace> Thanks to ${dueto}.</j:whitespace></j:if>
+
+      <x:if select="$currentAction/description">
+        <x:set var="text" select="string(./description)"/>
+      </x:if>
+      <x:if select="not(./description)">
+        <x:set var="text" select="string(.)"/>
+      </x:if>
+      <j:whitespace>${text}</j:whitespace>
+
+      <x:if select="$currentAction/fixes">
+        <j:set var="fixesTotal"><x:expr select="count(./fixes)"/></j:set>
+        <j:set var="fixesCount" value="1"/>
+        <j:whitespace>Fixes </j:whitespace>
+        <x:forEach var="item" select="./fixes">
+          <j:set var="issue"><x:expr select="@issue"/></j:set>
+          <j:set var="separator">
+            <j:choose>
+              <j:when test="${fixesCount == fixesTotal}"><j:whitespace>. </j:whitespace></j:when>
+              <j:when test="${fixesCount == fixesTotal-1}"><j:whitespace> and </j:whitespace></j:when>
+              <j:otherwise><j:whitespace>, </j:whitespace></j:otherwise>
+            </j:choose>
+          </j:set>
+          <j:whitespace>${issue}${separator}</j:whitespace>
+          <j:set var="fixesCount" value="${1+fixesCount}"/>
+        </x:forEach>
+      </x:if>
+      <x:if select="not(./fixes)">
+        <j:set var="issue"><x:expr select="@issue"/></j:set>
+        <j:if test="${!empty(issue)}">
+          <j:whitespace> Fixes ${issue}.</j:whitespace>
+        </j:if>
+      </x:if>
+
+      <x:if select="$currentAction/dueto">
+        <j:set var="duetoTotal"><x:expr select="count(./dueto)"/></j:set>
+        <j:set var="duetoCount" value="1"/>
+        <j:whitespace>Thanks to </j:whitespace>
+        <x:forEach var="item" select="./dueto">
+          <j:set var="name"><x:expr select="@name"/></j:set>
+          <j:set var="separator">
+            <j:choose>
+              <j:when test="${duetoCount == duetoTotal}"><j:whitespace>. </j:whitespace></j:when>
+              <j:when test="${duetoCount == duetoTotal-1}"><j:whitespace> and </j:whitespace></j:when>
+              <j:otherwise><j:whitespace>, </j:whitespace></j:otherwise>
+            </j:choose>
+          </j:set>
+          <j:whitespace>${name}${separator}</j:whitespace>
+          <j:set var="duetoCount" value="${1+duetoCount}"/>
+        </x:forEach>
+      </x:if>
+      <x:if select="not(./dueto)">
+        <j:set var="dueto"><x:expr select="@due-to"/></j:set>
+        <j:if test="${!empty(dueto)}">
+          <j:whitespace> Thanks to ${dueto}.</j:whitespace>
+        </j:if>
+      </x:if>
+
     </j:set>
         
     <j:forEach var="line" items="${formatter.format(text,75)}">

announcement/xdocs/changes.xml

@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.4-SNAPSHOT" date="in CVS">
+      <action dev="ltheussl" type="add" issue="MPANNOUNCEMENT-18">Support new format of <code>&lt;action&gt;</code> element in <code>changes.xml</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPANNOUNCEMENT-3">CR-LF generated do not match the platform.</action>
       <action dev="ltheussl" type="fix" issue="MPANNOUNCEMENT-10">Xml entities transformed in wrong direction.</action>
       <action dev="vmassol" type="add" issue="MPANNOUNCEMENT-15">