From f18cbaf95e30a3d1a00fe9cd1048abf87aa5a76f Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 15 Nov 2003 19:10:47 +0000
Subject: [PATCH] <a
 href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MPCHANGES-3">MPCHANGES-3</a>.
 HTML tags entered inside <code>&lt;action&gt;</code> tags now show up in the
 generated report.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114336 13f79535-47bb-0310-9956-ffa450edef68
---
 changes/project.xml                      |  6 +--
 changes/src/plugin-resources/changes.jsl | 69 +++++++++++++-----------
 changes/xdocs/changes.xml                | 10 ++++
 3 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/changes/project.xml b/changes/project.xml
index 487ea87a..03b6cea1 100644
--- a/changes/project.xml
+++ b/changes/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-changes-plugin</id>
   <name>Maven Changes Plug-in</name>
-  <currentVersion>1.2</currentVersion>
+  <currentVersion>1.3-SNAPSHOT</currentVersion>
   <shortDescription>Produce changes report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/changes/</url>
   <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10312</issueTrackingUrl>
@@ -16,8 +16,8 @@
   </repository>
   <versions>
     <version>
-      <id>1.2</id>
-      <name>1.2</name>
+      <id>1.3</id>
+      <name>1.3</name>
       <tag>HEAD</tag>
     </version>
   </versions>
diff --git a/changes/src/plugin-resources/changes.jsl b/changes/src/plugin-resources/changes.jsl
index 11478216..34891afc 100644
--- a/changes/src/plugin-resources/changes.jsl
+++ b/changes/src/plugin-resources/changes.jsl
@@ -31,38 +31,45 @@
                     </x:forEach>
                 </table>
             </section>
-
-            <!-- Release details -->
-            <x:forEach select="release">
-                <j:set var="sectionName">Release <x:expr select="@version"/> - <x:expr select="@date"/></j:set>
-                <j:set var="version"><x:expr select="@version"/></j:set>
-                <section name="${sectionName}">
-                    <a name="${version}"/>
-                    <table>
-                        <tr><th style='width:50px'>Type</th><th>Changes</th><th style='width:70px'>By</th></tr>             
-                        <x:forEach var="action" select="action">
-                            <j:set var="type"><x:expr select="@type"/></j:set>
-                            <j:set var="dev"><x:expr select="@dev"/></j:set>
-                            <tr>
-                                <td><img src="images/${type}.gif" alt="${type}"/></td>
-                                <td><x:expr select="string(.)"/></td>
-                                <td><a href="team-list.html#${dev}">${dev}</a></td>
-                            </tr>               
-                        </x:forEach>
-                    </table>
-                </section>
-            </x:forEach>
+            <!-- Release information -->
+            <jsl:applyTemplates select="*"/>
         </body>
     </jsl:template>
-    
-    <!-- copy any other elements through -->
-    <jsl:template match="*" trim="false">
-        <jsl:copy trim="false">
-            <jsl:applyTemplates trim="false"/>
-        </jsl:copy>
+
+    <jsl:template match="release">
+      <j:set var="sectionName">Release <x:expr select="@version"/> - <x:expr select="@date"/></j:set>
+      <j:set var="version"><x:expr select="@version"/></j:set>
+      <section name="${sectionName}">
+        <a name="${version}"/>
+        <table>
+          <tr><th style='width:50px'>Type</th><th>Changes</th><th style='width:70px'>By</th></tr>             
+          <jsl:applyTemplates select="*"/>
+        </table>
+      </section>
     </jsl:template>
-    
-    <!-- element values don't pass through as text -->
-    <jsl:template match="@*"/>
-    
+
+    <jsl:template match="action">
+      <j:set var="type"><x:expr select="@type"/></j:set>
+      <j:set var="dev"><x:expr select="@dev"/></j:set>
+      <tr>
+        <td><img src="images/${type}.gif" alt="${type}"/></td>
+        <td><jsl:applyTemplates trim="false"/></td>
+        <td><a href="team-list.html#${dev}">${dev}</a></td>
+      </tr>               
+    </jsl:template>
+
+    <jsl:template match="*">
+      <jsl:copy trim="false">
+        <jsl:applyTemplates trim="false"/>
+      </jsl:copy>
+    </jsl:template>
+
+   <!-- element values don't pass through as text -->
+   <jsl:template match="@*"/>
+
+   <!-- CDATA and text nodes pass-thru -->
+   <jsl:template match="text()">
+     <x:expr select="."/>
+   </jsl:template>
+
 </jsl:stylesheet>
diff --git a/changes/xdocs/changes.xml b/changes/xdocs/changes.xml
index 31398c78..9affccbc 100644
--- a/changes/xdocs/changes.xml
+++ b/changes/xdocs/changes.xml
@@ -6,6 +6,15 @@
   </properties>
 
   <body>
+
+    <release version="1.3" date="in CVS">
+      <action dev="vmassol" type="fix">
+        <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MPCHANGES-3">MPCHANGES-3</a>.
+        HTML tags entered inside <code>&lt;action&gt;</code> tags now show up 
+        in the generated report.
+      </action>          
+    </release>
+    
     <release version="1.2" date="2003-09-29">
       <action dev="dion" type="update">
         Add test project
@@ -25,6 +34,7 @@
         docs.
       </action>              
     </release>
+
   </body>
 </document>