vmassol     2002/09/05 09:46:49

  Modified:    anttasks build.xml
               framework build.xml
  Added:       .        checkstyle.properties
  Log:
  now use a proeprties file to define and share checkstyle properties.
  
  Revision  Changes    Path
  1.26      +3 -12     jakarta-cactus/anttasks/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/anttasks/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml 28 Aug 2002 18:42:25 -0000      1.25
  +++ build.xml 5 Sep 2002 16:46:48 -0000       1.26
  @@ -244,22 +244,13 @@
   
           <echo message="Errors are reported in ${target.dir}/checkstyle_errors.xml"/>
   
  -        <checkstyle
  -            lcurlyType="nl"
  -            lcurlyMethod="nl"
  -                     lcurlyOther="nl"
  -                     rcurly="alone"
  -            allowProtected="true"
  -            ignoreLineLengthPattern="(@version.*\$Id|@see)"
  -            paramPattern="^(the|is|has)[A-Z][a-zA-Z0-9]*$"
  -            publicMemberPattern="^[a-z][a-zA-Z0-9]*$"
  -            headerFile="./LICENSE.cactus"
  -            failOnViolation="true"
  -            cacheFile="${target.dir}/checkstyle.cache">
  +        <checkstyle properties="./checkstyle.properties" 
  +             failOnViolation="true">
   
               <fileset dir="${src.java.dir}">
                   <include name="**/*.java"/>
               </fileset>
  +            <formatter type="plain"/>
               <formatter type="xml" toFile="${target.dir}/checkstyle_errors.xml"/>
           </checkstyle>
   
  
  
  
  1.1                  jakarta-cactus/checkstyle.properties
  
  Index: checkstyle.properties
  ===================================================================
  # -----------------------------------------------------------------------------
  # Checkstyle properties for Cactus projects.
  #
  # $Id:  $
  # -----------------------------------------------------------------------------
  
  # Cactus checkstyle preferences
  
  checkstyle.header.file = ./LICENSE.cactus
  checkstyle.rcurly = alone
  checkstyle.lcurly.type = nl
  checkstyle.lcurly.method = nl
  checkstyle.lcurly.other = nl
  checkstyle.ignore.maxlinelen = (@version|@see)
  checkstyle.allow.protected = true
  checkstyle.pattern.parameter = ^(the|is|has)[A-Z][a-zA-Z0-9]*$
  checkstyle.pattern.publicmember = ^[a-z][a-zA-Z0-9]*$
  
  
  1.26      +2 -13     jakarta-cactus/framework/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml 28 Aug 2002 20:50:06 -0000      1.25
  +++ build.xml 5 Sep 2002 16:46:49 -0000       1.26
  @@ -591,19 +591,8 @@
   
           <echo message="Errors are reported in ${target.dir}/checkstyle_errors.xml"/>
   
  -        <checkstyle
  -            lcurlyType="nl"
  -            lcurlyMethod="nl"
  -                     lcurlyOther="nl"
  -                     rcurly="alone"
  -            allowProtected="true"
  -            ignoreLineLengthPattern="(@version.*\$Id|@see)"
  -            paramPattern="^(the|is|has)[A-Z][a-zA-Z0-9]*$"
  -            publicMemberPattern="^[a-z][a-zA-Z0-9]*$"
  -            headerFile="./LICENSE.cactus"
  -            failOnViolation="true"
  -            maxParameters="10"
  -            cacheFile="${target.dir}/checkstyle.cache">
  +        <checkstyle properties="./checkstyle.properties" 
  +             failOnViolation="true">
   
               <fileset dir="${src.java.dir}">
                   <include name="**/*.java"/>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to