Author: ltheussl
Date: Sat Feb 4 09:18:31 2006
New Revision: 374888
URL: http://svn.apache.org/viewcvs?rev=374888&view=rev
Log:
Check if unitTestSourceDirectory is present
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=374888&r1=374887&r2=374888&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
Sat Feb 4 09:18:31 2006
@@ -90,9 +90,11 @@
<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}"/>
+ <j:if test="${pom.build.unitTestSourceDirectory != null}">
+ <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}"/>
+ </j:if>
<x:set var="files" select="file" sort="@name"/>
<!-- x:forEach is busted -->
@@ -101,12 +103,14 @@
<!-- Type coercion doesn't work worth a fuck in jexl. -->
<j:set var="name"
value="${file.attribute('name').getValue()}"/>
<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 test="${pom.build.unitTestSourceDirectory != null}">
+ <j:set var="tstRelPathLen"
value="${pathtool.getRelativePath(tstDir,name).length()}"/>
+ <j:if test="${tstRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(tstDirLength.toString()))}"/>
+ </j:if>
</j:if>
<util:replace var="name" value="${name}" oldChar="\\"
newChar="/"/>
<!--- +1 is for the trailing slash above -->
@@ -133,17 +137,19 @@
<j:if test="${errorCount != 0}">
<j:set var="name" value="${file.attribute('name').getValue()}"/>
<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 test="${pom.build.unitTestSourceDirectory != null}">
+ <j:set var="tstRelPathLen"
value="${pathtool.getRelativePath(tstDir,name).length()}"/>
+ <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>
</j:if>
<util:replace var="name" value="${name}" oldChar="\\"
newChar="/"/>
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=374888&r1=374887&r2=374888&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
Sat Feb 4 09:18:31 2006
@@ -100,21 +100,25 @@
<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}"/>
+ <j:if test="${pom.build.unitTestSourceDirectory != null}">
+ <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}"/>
+ </j:if>
<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="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 test="${pom.build.unitTestSourceDirectory != null}">
+ <j:set var="tstRelPathLen"
value="${pathtool.getRelativePath(tstDir,name).length()}"/>
+ <j:if test="${tstRelPathLen > 0}">
+ <j:set var="name"
value="${name.substring(mavenTool.toInteger(tstDirLength.toString()))}"/>
+ </j:if>
</j:if>
<util:replace var="name" value="${name}" oldChar="\\"
newChar="/"/>
<!--- +1 is for the trailing slash above -->
@@ -137,17 +141,19 @@
<j:if test="${errorCount != 0}">
<j:set var="name" value="${file.attribute('name').getValue()}"/>
<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 test="${pom.build.unitTestSourceDirectory != null}">
+ <j:set var="tstRelPathLen"
value="${pathtool.getRelativePath(tstDir,name).length()}"/>
+ <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>
</j:if>
<util:replace var="name" value="${name}" oldChar="\\"
newChar="/"/>
