vmassol     2003/11/15 11:10:47

  Modified:    changes  project.xml
               changes/src/plugin-resources changes.jsl
               changes/xdocs changes.xml
  Log:
  <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.
  
  Revision  Changes    Path
  1.16      +3 -3      maven-plugins/changes/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/changes/project.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project.xml       15 Nov 2003 17:08:14 -0000      1.15
  +++ project.xml       15 Nov 2003 19:10:47 -0000      1.16
  @@ -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>
  
  
  
  1.6       +38 -31    maven-plugins/changes/src/plugin-resources/changes.jsl
  
  Index: changes.jsl
  ===================================================================
  RCS file: /home/cvs/maven-plugins/changes/src/plugin-resources/changes.jsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- changes.jsl       5 Aug 2003 11:40:28 -0000       1.5
  +++ changes.jsl       15 Nov 2003 19:10:47 -0000      1.6
  @@ -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>
  
  
  
  1.9       +10 -0     maven-plugins/changes/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/changes/xdocs/changes.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- changes.xml       15 Nov 2003 16:33:11 -0000      1.8
  +++ changes.xml       15 Nov 2003 19:10:47 -0000      1.9
  @@ -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>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to