vmassol 2002/11/24 09:50:08
Modified: framework build.xml
anttasks build.xml
Added: . checkstyle.xml
Removed: . checkstyle.properties
Log:
Update to Checkstyle 3.0dev (needed for Cactus Gump to stop failing)
Revision Changes Path
1.1 jakarta-cactus/checkstyle.xml
Index: checkstyle.xml
===================================================================
<?xml version="1.0"?>
<!-- Checkstyle properties for Cactus projects -->
<configuration>
<check classname="com.puppycrawl.tools.checkstyle.checks.AvoidStarImport"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.ConstantNameCheck"/>
<!--check classname="com.puppycrawl.tools.checkstyle.checks.EmptyBlockCheck"/-->
<!--check
classname="com.puppycrawl.tools.checkstyle.checks.EqualsHashCodeCheck"/-->
<check classname="com.puppycrawl.tools.checkstyle.checks.FileLengthCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.HeaderCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.IllegalImportCheck"/>
<check
classname="com.puppycrawl.tools.checkstyle.checks.IllegalInstantiationCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.InnerAssignmentCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.JavadocTypeCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.JavadocVariableCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.LineLengthCheck">
<property name="ignorePattern" value="(@version|@see)"/>
</check>
<check
classname="com.puppycrawl.tools.checkstyle.checks.LocalFinalVariableNameCheck"/>
<check
classname="com.puppycrawl.tools.checkstyle.checks.LocalVariableNameCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.MemberNameCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.MethodLeftCurlyCheck">
<property name="option" value="nl"/>
</check>
<check classname="com.puppycrawl.tools.checkstyle.checks.MethodLengthCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.MethodNameCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.ModifierCheck"/>
<!--check
classname="com.puppycrawl.tools.checkstyle.checks.NoWhiteSpaceBeforeCheck"/-->
<check
classname="com.puppycrawl.tools.checkstyle.checks.NoWhitespaceAfterCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.OtherLeftCurlyCheck">
<property name="option" value="nl"/>
</check>
<check classname="com.puppycrawl.tools.checkstyle.checks.PackageNameCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.ParameterNameCheck">
<property name="format" value="^(the|is|has)[A-Z][a-zA-Z0-9]*$"/>
</check>
<check classname="com.puppycrawl.tools.checkstyle.checks.ParameterNumberCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.ParenPadCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.PublicMemberNameCheck">
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
</check>
<check classname="com.puppycrawl.tools.checkstyle.checks.RedundantImportCheck"/>
<check
classname="com.puppycrawl.tools.checkstyle.checks.RedundantModifierCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.RegexpHeaderCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.RightCurlyCheck">
<property name="option" value="alone"/>
</check>
<check
classname="com.puppycrawl.tools.checkstyle.checks.SimplifyBooleanExpressionCheck"/>
<check
classname="com.puppycrawl.tools.checkstyle.checks.SimplifyBooleanReturnCheck"/>
<check
classname="com.puppycrawl.tools.checkstyle.checks.StaticVariableNameCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.TabCharacterCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.TypeLeftCurlyCheck">
<property name="option" value="nl"/>
</check>
<check classname="com.puppycrawl.tools.checkstyle.checks.TypeNameCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.UnusedImportsCheck"/>
<check classname="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
<check
classname="com.puppycrawl.tools.checkstyle.checks.VisibilityModifierCheck">
<property name="protectedAllowed" value="true"/>
<property name="publicMemberPattern" value="^[a-z][a-zA-Z0-9]*$"/>
</check>
<check classname="com.puppycrawl.tools.checkstyle.checks.WhitespaceAroundCheck"/>
</configuration>
1.28 +5 -1 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 22 Nov 2002 22:23:14 -0000 1.27
+++ build.xml 24 Nov 2002 17:50:08 -0000 1.28
@@ -594,7 +594,7 @@
<echo message="Errors are reported in ${target.dir}/checkstyle_errors.xml"/>
- <checkstyle properties="./checkstyle.properties"
+ <checkstyle config="./checkstyle.xml"
failOnViolation="true">
<fileset dir="${src.java.dir}">
@@ -604,8 +604,12 @@
<fileset dir="${src.test.dir}">
<include name="**/*.java"/>
</fileset>
+
<formatter type="plain"/>
<formatter type="xml" toFile="${target.dir}/checkstyle_errors.xml"/>
+
+ <property key="checkstyle.header.file" file="./LICENSE.cactus"/>
+
</checkstyle>
</target>
1.27 +13 -3 jakarta-cactus/anttasks/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/anttasks/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 5 Sep 2002 16:46:48 -0000 1.26
+++ build.xml 24 Nov 2002 17:50:08 -0000 1.27
@@ -203,7 +203,7 @@
Generate the distributable files
========================================================================
-->
- <target name="dist" depends="jar,doc"
+ <target name="dist" depends="jar,doc,checkstyle"
description="Generate the distributable files">
<mkdir dir="${dist.lib.dir}"/>
@@ -234,7 +234,14 @@
Perform a code audit using CheckStyle.
========================================================================
-->
- <target name="checkstyle" depends="init"
+ <target name="checkstyle.check">
+
+ <available property="checkstyle.present"
+ classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"/>
+
+ </target>
+ <target name="checkstyle" depends="checkstyle.check,init"
+ if="checkstyle.present"
description="Perform a code audit using Checkstyle">
<taskdef name="checkstyle"
@@ -244,14 +251,17 @@
<echo message="Errors are reported in ${target.dir}/checkstyle_errors.xml"/>
- <checkstyle properties="./checkstyle.properties"
+ <checkstyle config="./checkstyle.xml"
failOnViolation="true">
<fileset dir="${src.java.dir}">
<include name="**/*.java"/>
</fileset>
+
<formatter type="plain"/>
<formatter type="xml" toFile="${target.dir}/checkstyle_errors.xml"/>
+
+ <property key="checkstyle.header.file" file="./LICENSE.cactus"/>
</checkstyle>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
