svn commit: r375824 - in /maven/maven-1/plugins/trunk/checkstyle: plugin.jelly src/plugin-resources/checkstyle2rss.jsl xdocs/changes.xml

[lt...@apache.org]

Author: ltheussl
Date: Tue Feb  7 17:29:52 2006
New Revision: 375824

URL: http://svn.apache.org/viewcvs?rev=375824&view=rev
Log:
PR: MPCHECKSTYLE-38
RSS file has incorrect links when used in multiproject build.

Modified:
    maven/maven-1/plugins/trunk/checkstyle/plugin.jelly
    maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle2rss.jsl
    maven/maven-1/plugins/trunk/checkstyle/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/checkstyle/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/checkstyle/plugin.jelly?rev=375824&r1=375823&r2=375824&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/checkstyle/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/checkstyle/plugin.jelly Tue Feb  7 17:29:52 2006
@@ -262,6 +262,13 @@
       <format property="currentYear" pattern="yyyy"/>
     </tstamp>
 
+    <j:set var="baseurl" value="${pom.url}/checkstyle"/>
+    <maven:get plugin="maven-multiproject-plugin" property="maven.multiproject.navigation" var="navType" />
+    <j:if test="${navType == 'aggregate'}">
+      <maven:get plugin="maven-multiproject-plugin" property="maven.multiproject.aggregateDir" var="aggregateDir" />
+      <j:set var="baseurl" value="${pom.url}/${aggregateDir}/${pom.artifactId}"/>
+    </j:if>
+
     <!-- Generate a RSS feed of the checktyle errors -->
     <doc:jsl
       input="${maven.checkstyle.output.xml}"

Modified: maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle2rss.jsl
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle2rss.jsl?rev=375824&r1=375823&r2=375824&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle2rss.jsl (original)
+++ maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle2rss.jsl Tue Feb  7 17:29:52 2006
@@ -39,8 +39,9 @@
 
     <rss version="0.91">
       <channel>
-        <title>Checkstyle report</title> 
-        <link>${pom.url}/checkstyle/index.html</link> 
+        <title>Checkstyle report</title>
+        <j:set var="link" value="${baseurl}/index.html"/>
+        <link>${link}</link>
         <description>Checkstyle report</description>
         <language>en-us</language>
         <copyright>Copyright ${currentYear} ${pom.organization.name}</copyright>
@@ -53,13 +54,13 @@
 
           <title>File: ${fileCount}, Errors: ${errorCount}, Warnings: ${warningCount}, Infos: ${infoCount}</title>
           
-          <!-- If we don't go through a tmp variable Jelly inserts a space between ${pom.url} 
-               and '/checkstyle/all.html'. Go figure... -->
-          <j:set var="link" value="${pom.url}/checkstyle/all.html"/>
+          <!-- If we don't go through a tmp variable Jelly inserts a space between ${baseurl} 
+               and '/all.html'. Go figure... -->
+          <j:set var="link" value="${baseurl}/all.html"/>
           
           <link>${link}</link> 
           <description>
-            <p>Click <a href="${pom.url}/checkstyle/index.html">here</a> for the full Checkstyle report.</p>
+            <p>Click <a href="${baseurl}/index.html">here</a> for the full Checkstyle report.</p>
             
           <table summary="Files" border="1">
             <thead>
@@ -81,6 +82,8 @@
                 <j:set var="name" value="${file.attribute('name').getValue()}"/>
                 <j:set var="name" value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
                 <util:replace var="name" value="${name}" oldChar="\\" newChar="/"/>
+                <util:replace var="name" value="${name}" oldChar="/" newChar="_"/>
+                <util:replace var="name" value="${name}" oldChar="." newChar="_"/>
                 <!--- +1 is for the trailing slash above -->
                 <j:set var="infoCount"><x:expr select="count($file/error[@severity='info'])"/></j:set>
                 <j:set var="warningCount"><x:expr select="count($file/error[@severity='warning'])"/></j:set>

Modified: maven/maven-1/plugins/trunk/checkstyle/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/checkstyle/xdocs/changes.xml?rev=375824&r1=375823&r2=375824&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/checkstyle/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/checkstyle/xdocs/changes.xml Tue Feb  7 17:29:52 2006
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="3.0.1-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPCHECKSTYLE-38">RSS file has incorrect links when used in multiproject build.</action>
       <action dev="ltheussl" type="fix" issue="MPCHECKSTYLE-9"><code>maven.checkstyle.header.file</code> now defaults to <code>${maven.license.licenseFile}</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPCHECKSTYLE-53" due-to="Bernard Durfee">ClassCastException when moving from 2.5 to 3.0. Xalan is used for ant's style task.</action>
     </release>