Author: markt
Date: Fri Feb 18 16:53:08 2011
New Revision: 1072057
URL: http://svn.apache.org/viewvc?rev=1072057&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50743
Cache CheckStyle results between builds to speed up validation. Patch provided
by Oliver.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/checkstyle/checkstyle.xml
tomcat/trunk/res/checkstyle/javax-checkstyle.xml
tomcat/trunk/res/checkstyle/org-checkstyle.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1072057&r1=1072056&r2=1072057&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Feb 18 16:53:08 2011
@@ -422,6 +422,9 @@
</target>
<target name="validate" depends="download-validate" if="${execute.validate}">
+ <!-- Required so we can cache checkstyle results -->
+ <mkdir dir="${tomcat.output}/res/checkstyle"/>
+
<taskdef resource="checkstyletask.properties"
classpath="${checkstyle.jar}" />
<checkstyle config="res/checkstyle/checkstyle.xml">
Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1072057&r1=1072056&r2=1072057&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Fri Feb 18 16:53:08 2011
@@ -34,6 +34,10 @@
<module name="FileTabCharacter"/>
<module name="TreeWalker">
+ <!-- Cache what has passed checkstyle -->
+ <property name="cacheFile"
+
value="${tomcat.output}/res/checkstyle/cachefile-checkstyle.xml"/>
+
<!-- Block Checks -->
<!-- ~60 errors
<module name="AvoidNestedBlocks"/>
@@ -77,4 +81,4 @@
</module>
-->
</module>
-</module>
\ No newline at end of file
+</module>
Modified: tomcat/trunk/res/checkstyle/javax-checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/javax-checkstyle.xml?rev=1072057&r1=1072056&r2=1072057&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/javax-checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/javax-checkstyle.xml Fri Feb 18 16:53:08 2011
@@ -26,8 +26,12 @@
<!-- Specific checks for javax.* packages -->
<module name="TreeWalker">
+ <!-- Cache what has passed checkstyle -->
+ <property name="cacheFile"
+
value="${tomcat.output}/res/checkstyle/cachefile-javax-checkstyle.xml"/>
+
<module name="ImportControl">
<property name="file"
value="${basedir}/res/checkstyle/javax-import-control.xml"/>
</module>
</module>
-</module>
\ No newline at end of file
+</module>
Modified: tomcat/trunk/res/checkstyle/org-checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-checkstyle.xml?rev=1072057&r1=1072056&r2=1072057&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/org-checkstyle.xml Fri Feb 18 16:53:08 2011
@@ -26,8 +26,12 @@
<!-- Specific checks for javax.* packages -->
<module name="TreeWalker">
+ <!-- Cache what has passed checkstyle -->
+ <property name="cacheFile"
+
value="${tomcat.output}/res/checkstyle/cachefile-org-checkstyle.xml"/>
+
<module name="ImportControl">
<property name="file"
value="${basedir}/res/checkstyle/org-import-control.xml"/>
</module>
</module>
-</module>
\ No newline at end of file
+</module>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1072057&r1=1072056&r2=1072057&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 18 16:53:08 2011
@@ -159,6 +159,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>50743</bug>: Cache CheckStyle results between builds to speed up
+ validation. Patch provided by Oliver. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.8 (markt)" rtext="released 2011-02-05">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
