plynch 2002/07/12 11:38:42
Modified: src/plugins/checkstyle plugin.jelly
Log:
o Comma seperated exclusion/inclusion patterns only work for the includes and
excludes attributes, not the include and exclude elements of fileset. This fix allows
comma seperated excludes/includes to actually work.
Revision Changes Path
1.8 +7 -8 jakarta-turbine-maven/src/plugins/checkstyle/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/checkstyle/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 10 Jul 2002 22:25:10 -0000 1.7
+++ plugin.jelly 12 Jul 2002 18:38:42 -0000 1.8
@@ -22,22 +22,21 @@
description="Generate code convention conformance reports"
prereqs="checkstyle:check-license-file"/>
- <goal
+ <goal
name="checkstyle:generate-report"
description="Generate code convention conformance reports">
<j:if test="${sourcesPresent == 'true'}">
-
+
<echo>${maven.checkstyle.properties}</echo>
-
+
<checkstyle
properties="${maven.checkstyle.properties}"
failOnViolation="${maven.checkstyle.fail.on.violation}"
cacheFile="${maven.checkstyle.cache.file}" >
- <fileset dir="${pom.build.sourceDirectory}">
- <include name="${maven.checkstyle.includes}"/>
- <exclude name="${maven.checkstyle.excludes}"/>
- </fileset>
+ <fileset dir="${pom.build.sourceDirectory}"
+ includes="${maven.checkstyle.includes}"
+ excludes="${maven.checkstyle.excludes}" />
<formatter type="xml" toFile="${maven.build.dir}/checkstyle-raw-report.xml"/>
<formatter type="plain"
toFile="${maven.build.dir}/checkstyle-raw-report.txt"/>
</checkstyle>
@@ -60,7 +59,7 @@
<goal name="checkstyle:check-license-file"
description="Checks the existence of the LICENSE.txt file">
- <available file="${basedir}/LICENSE.txt"
+ <available file="${basedir}/LICENSE.txt"
property="maven.checkstyle.license.exists"/>
<j:set var="licenseExists" value="${maven.checkstyle.license.exists}X"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
