Author: ltheussl
Date: Mon Jan 23 16:20:24 2006
New Revision: 371733
URL: http://svn.apache.org/viewcvs?rev=371733&view=rev
Log:
Fix links generated for jxr test files
Modified:
maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle-all.jsl
maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle_severity_filter.jsl
Modified:
maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle-all.jsl
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle-all.jsl?rev=371733&r1=371732&r2=371733&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle-all.jsl
(original)
+++
maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle-all.jsl
Mon Jan 23 16:20:24 2006
@@ -90,12 +90,24 @@
<j:set var="fullSrcDir" value="${pom.build.sourceDirectory}"/>
<j:set var="srcDir"
value="${fileutil.file(fullSrcDir).getCanonicalPath()}"/>
<j:set var="srcDirLength" value="${srcDir.length() + 1}"/>
+ <j:set var="fullTstDir"
value="${pom.build.unitTestSourceDirectory}"/>
+ <j:set var="tstDir"
value="${fileutil.file(fullTstDir).getCanonicalPath()}"/>
+ <j:set var="tstDirLength" value="${tstDir.length() + 1}"/>
+
<x:set var="files" select="file" sort="@name"/>
<!-- x:forEach is busted -->
<j:forEach var="file" items="${files}">
+
<!-- Type coercion doesn't work worth a fuck in jexl. -->
<j:set var="name"
value="${file.attribute('name').getValue()}"/>
- <j:set var="name"
value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
+ <j:set var="srcRelPathLen"
value="${pathtool.getRelativePath(srcDir,name).length()}"/>
+ <j:set var="tstRelPathLen"
value="${pathtool.getRelativePath(tstDir,name).length()}"/>
+ <j:if test="${srcRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
+ </j:if>
+ <j:if test="${tstRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(tstDirLength.toString()))}"/>
+ </j:if>
<util:replace var="name" value="${name}" oldChar="\\"
newChar="/"/>
<!--- +1 is for the trailing slash above -->
<j:set var="infoCount"><x:expr select="count($file/[EMAIL
PROTECTED]'info'])"/></j:set>
@@ -120,7 +132,19 @@
<x:set var="errorCount" select="count($file/error)"/>
<j:if test="${errorCount != 0}">
<j:set var="name" value="${file.attribute('name').getValue()}"/>
- <j:set var="name"
value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
+ <j:set var="srcRelPathLen"
value="${pathtool.getRelativePath(srcDir,name).length()}"/>
+ <j:set var="tstRelPathLen"
value="${pathtool.getRelativePath(tstDir,name).length()}"/>
+ <j:set var="jxrPath" value=""/>
+ <j:if test="${srcRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
+ <!-- FIXME: this should be determined by ${maven.jxr.destdir}
-->
+ <j:set var="jxrPath" value="../xref"/>
+ </j:if>
+ <j:if test="${tstRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(tstDirLength.toString()))}"/>
+ <!-- FIXME: this should be determined by
${maven.jxr.destdir.test} -->
+ <j:set var="jxrPath" value="../xref-test"/>
+ </j:if>
<util:replace var="name" value="${name}" oldChar="\\"
newChar="/"/>
<subsection name="${name}">
@@ -156,12 +180,13 @@
<td>
<j:set var="line"
value="${error.attribute('line').getValue()}"/>
<j:set var="lastIndex"
value="${name.lastIndexOf('.java')}"/>
+ <j:set var="jxrPathLen" value="${jxrPath.length()}"/>
<j:choose>
- <j:when test="${lastIndex > 0}">
+ <j:when test="${lastIndex > 0 and jxrPathLen > 0}">
<j:set var="index"
value="${mavenTool.toInteger(lastIndex.toString())}"/>
<j:set var="nameWithoutJavaExtension"
value="${name.substring(0, index)}"/>
<util:replace var="nameWithoutJavaExtension"
value="${nameWithoutJavaExtension}" oldChar="\\" newChar="/"/>
- <a
href="../xref/${nameWithoutJavaExtension}.html#${line}">${line}</a>
+ <a
href="${jxrPath}/${nameWithoutJavaExtension}.html#${line}">${line}</a>
</j:when>
<j:otherwise>
${line}
Modified:
maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle_severity_filter.jsl
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle_severity_filter.jsl?rev=371733&r1=371732&r2=371733&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle_severity_filter.jsl
(original)
+++
maven/maven-1/plugins/trunk/checkstyle/src/plugin-resources/checkstyle_severity_filter.jsl
Mon Jan 23 16:20:24 2006
@@ -100,12 +100,22 @@
<j:set var="fullSrcDir" value="${pom.build.sourceDirectory}"/>
<j:set var="srcDir"
value="${fileutil.file(fullSrcDir).getCanonicalPath()}"/>
<j:set var="srcDirLength" value="${srcDir.length() + 1}"/>
+ <j:set var="fullTstDir"
value="${pom.build.unitTestSourceDirectory}"/>
+ <j:set var="tstDir"
value="${fileutil.file(fullTstDir).getCanonicalPath()}"/>
+ <j:set var="tstDirLength" value="${tstDir.length() + 1}"/>
<x:set var="files" select="file[./[EMAIL PROTECTED]"
sort="@name"/>
<!-- x:forEach is busted -->
<j:forEach var="file" items="${files}">
<!-- Type coercion doesn't work worth a fuck in jexl. -->
<j:set var="name"
value="${file.attribute('name').getValue()}"/>
- <j:set var="name"
value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
+ <j:set var="srcRelPathLen"
value="${pathtool.getRelativePath(srcDir,name).length()}"/>
+ <j:set var="tstRelPathLen"
value="${pathtool.getRelativePath(tstDir,name).length()}"/>
+ <j:if test="${srcRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
+ </j:if>
+ <j:if test="${tstRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(tstDirLength.toString()))}"/>
+ </j:if>
<util:replace var="name" value="${name}" oldChar="\\"
newChar="/"/>
<!--- +1 is for the trailing slash above -->
<j:set var="errorCount"><x:expr select="count($file/[EMAIL
PROTECTED])"/></j:set>
@@ -126,7 +136,19 @@
<x:set var="errorCount" select="count($file/[EMAIL PROTECTED])"/>
<j:if test="${errorCount != 0}">
<j:set var="name" value="${file.attribute('name').getValue()}"/>
- <j:set var="name"
value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
+ <j:set var="srcRelPathLen"
value="${pathtool.getRelativePath(srcDir,name).length()}"/>
+ <j:set var="tstRelPathLen"
value="${pathtool.getRelativePath(tstDir,name).length()}"/>
+ <j:set var="jxrPath" value=""/>
+ <j:if test="${srcRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
+ <!-- FIXME: this should be determined by ${maven.jxr.destdir}
-->
+ <j:set var="jxrPath" value="../xref"/>
+ </j:if>
+ <j:if test="${tstRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(tstDirLength.toString()))}"/>
+ <!-- FIXME: this should be determined by
${maven.jxr.destdir.test} -->
+ <j:set var="jxrPath" value="../xref-test"/>
+ </j:if>
<util:replace var="name" value="${name}" oldChar="\\"
newChar="/"/>
<subsection name="${name}">
@@ -151,12 +173,13 @@
<td>
<j:set var="line"
value="${error.attribute('line').getValue()}"/>
<j:set var="lastIndex"
value="${name.lastIndexOf('.java')}"/>
+ <j:set var="jxrPathLen" value="${jxrPath.length()}"/>
<j:choose>
- <j:when test="${lastIndex > 0}">
+ <j:when test="${lastIndex > 0 and jxrPathLen > 0}">
<j:set var="index"
value="${mavenTool.toInteger(lastIndex.toString())}"/>
<j:set var="nameWithoutJavaExtension"
value="${name.substring(0, index)}"/>
<util:replace var="nameWithoutJavaExtension"
value="${nameWithoutJavaExtension}" oldChar="\\" newChar="/"/>
- <a
href="../xref/${nameWithoutJavaExtension}.html#${line}">${line}</a>
+ <a
href="${jxrPath}/${nameWithoutJavaExtension}.html#${line}">${line}</a>
</j:when>
<j:otherwise>
${line}
