donaldp     02/03/20 17:16:30

  Modified:    .        gump.xml
               cache    .cvsignore build.xml
               cli      .cvsignore build.xml
               extension .cvsignore build.xml
               i18n     .cvsignore build.xml
               io       .cvsignore build.xml
               naming   .cvsignore build.xml
  Added:       tools/etc checkstyle-frames.xsl
  Log:
  Integrate Checkstyle into our build process.
  
  To get checkstyle running locally you need to download the checkstyle 
product, set the checkstyle.jar property to point to the checkstyle-all jar and 
set do.checkstyle=true
  
  ie Place something similar to the following into your 
jakarta0avalon-excalibur/ant.properties
  
  do.checkstyle=true
  checkstyle-jar=/opt/projects/forestcraft/tools/lib/checkstyle-all-2.1.jar
  
  Revision  Changes    Path
  1.8       +12 -0     jakarta-avalon-excalibur/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/gump.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- gump.xml  19 Mar 2002 09:10:07 -0000      1.7
  +++ gump.xml  21 Mar 2002 01:16:30 -0000      1.8
  @@ -43,10 +43,12 @@
         <depend property="junit.jar"   project="junit"/>
         <property name="version" value="@@DATE@@"/>
         <property name="junit.failonerror" value="true"/>
  +      <property name="do.checkstyle" value="true"/>
       </ant>
   
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
  +    <depend project="checkstyle"/>
       <work nested="extension/build/classes"/>
   
       <home nested="extension"/>
  @@ -61,10 +63,12 @@
         <depend property="junit.jar" project="junit"/>
         <property name="version" value="@@DATE@@"/>
         <property name="junit.failonerror" value="true"/>
  +      <property name="do.checkstyle" value="true"/>
       </ant>
   
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
  +    <depend project="checkstyle"/>
       <work nested="cache/build/classes"/>
   
       <home nested="cache"/>
  @@ -78,10 +82,12 @@
         <depend property="junit.jar" project="junit"/>
         <property name="version" value="@@DATE@@"/>
         <property name="junit.failonerror" value="true"/>
  +      <property name="do.checkstyle" value="true"/>
       </ant>
   
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
  +    <depend project="checkstyle"/>
       <work nested="cli/build/classes"/>
   
       <home nested="cli"/>
  @@ -95,10 +101,12 @@
         <depend property="junit.jar" project="junit"/>
         <property name="version" value="@@DATE@@"/>
         <property name="junit.failonerror" value="true"/>
  +      <property name="do.checkstyle" value="true"/>
       </ant>
   
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
  +    <depend project="checkstyle"/>
       <work nested="io/build/classes"/>
   
       <home nested="io"/>
  @@ -112,10 +120,12 @@
         <depend property="junit.jar" project="junit"/>
         <property name="version" value="@@DATE@@"/>
         <property name="junit.failonerror" value="true"/>
  +      <property name="do.checkstyle" value="true"/>
       </ant>
   
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
  +    <depend project="checkstyle"/>
       <work nested="i18n/build/classes"/>
   
       <home nested="i18n"/>
  @@ -129,10 +139,12 @@
         <depend property="junit.jar" project="junit"/>
         <property name="version" value="@@DATE@@"/>
         <property name="junit.failonerror" value="true"/>
  +      <property name="do.checkstyle" value="true"/>
       </ant>
   
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
  +    <depend project="checkstyle"/>
       <work nested="naming/build/classes"/>
   
       <home nested="naming"/>
  
  
  
  1.3       +1 -0      jakarta-avalon-excalibur/cache/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- .cvsignore        21 Mar 2002 00:06:34 -0000      1.2
  +++ .cvsignore        21 Mar 2002 01:16:30 -0000      1.3
  @@ -1,5 +1,6 @@
   ant.properties
   build
  +checkstyle.cache
   distributions
   dist
   excalibur-*
  
  
  
  1.4       +50 -1     jakarta-avalon-excalibur/cache/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml 21 Mar 2002 00:02:48 -0000      1.3
  +++ build.xml 21 Mar 2002 01:16:30 -0000      1.4
  @@ -48,6 +48,7 @@
           <pathelement location="${framework.jar}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${junit.jar}"/>
  +        <pathelement location="${checkstyle.jar}"/>
       </path>
   
       <target name="main" depends="dist" description="Build the project"/>
  @@ -186,8 +187,56 @@
                  style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  +     <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +    
  +        <!-- this invocation of checkstyle requires that checkstyle be 
downloaded and setup -->
  +        <!-- thats why you are required to define do.checkstyle property to 
generate the report -->
  +             <taskdef name="checkstyle"
  +                     
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +                     <classpath refid="project.class.path"/>
  +             </taskdef>
  +             <checkstyle
  +                     lcurlyType="nl"
  +                     lcurlyMethod="nl"
  +                     lcurlyOther="nl"
  +                     rcurly="ignore"
  +                     allowProtected="false"
  +                     allowPackage="false"
  +                     allowNoAuthor="false"
  +                     maxLineLen="100"
  +                     maxMethodLen="100"
  +                     maxConstructorLen="100"
  +                     memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +                     staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +                     constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +                     ignoreImportLen="true"
  +                     allowTabs="false"
  +                     javadocScope="protected"
  +                     ignoreWhitespace="true"
  +                     cacheFile="checkstyle.cache"
  +                     failOnViolation="false"
  +                     ignoreCastWhitespace="true">
  +                     <fileset dir="${java.dir}">
  +                             <include name="**/*.java"/>
  +                     </fileset>
  +            <formatter type="plain"/>
  +            <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  +             </checkstyle>
  +     </target>
  +
  +     <target name="checkstyle-report" 
  +            depends="checkstyle" 
  +            if="do.checkstyle" 
  +            description="Generate Checkstyle Report">
  +
  +             <mkdir dir="${build.reports}/checkstyle"/>
  +             <style style="../tools/etc/checkstyle-frames.xsl" 
in="build/checkstyle-results.xml"
  +                     out="${build.reports}/checkstyle/delete-me.html"/>
  +
  +     </target>
  +
       <!-- Creates the distribution -->
  -    <target name="dist" depends="jar, test-reports, jdepend, javadocs" 
description="Generates the jar files">
  +    <target name="dist" depends="jar, test-reports, jdepend, 
checkstyle-report, javadocs" description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
  
  
  
  1.4       +1 -0      jakarta-avalon-excalibur/cli/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .cvsignore        21 Mar 2002 00:06:34 -0000      1.3
  +++ .cvsignore        21 Mar 2002 01:16:30 -0000      1.4
  @@ -1,5 +1,6 @@
   ant.properties
   build
  +checkstyle.cache
   distributions
   dist
   excalibur-*
  
  
  
  1.18      +53 -1     jakarta-avalon-excalibur/cli/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml 21 Mar 2002 00:02:48 -0000      1.17
  +++ build.xml 21 Mar 2002 01:16:30 -0000      1.18
  @@ -47,6 +47,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${junit.jar}"/>
  +        <pathelement location="${checkstyle.jar}"/>
       </path>
   
       <target name="main" depends="dist" description="Build the project"/>
  @@ -185,8 +186,58 @@
                  style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  +     <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +    
  +        <!-- this invocation of checkstyle requires that checkstyle be 
downloaded and setup -->
  +        <!-- thats why you are required to define do.checkstyle property to 
generate the report -->
  +             <taskdef name="checkstyle"
  +                     
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +                     <classpath refid="project.class.path"/>
  +             </taskdef>
  +             <checkstyle
  +                     lcurlyType="nl"
  +                     lcurlyMethod="nl"
  +                     lcurlyOther="nl"
  +                     rcurly="ignore"
  +                     allowProtected="false"
  +                     allowPackage="false"
  +                     allowNoAuthor="false"
  +                     maxLineLen="100"
  +                     maxMethodLen="100"
  +                     maxConstructorLen="100"
  +                     memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +                     staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +                     constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +                     ignoreImportLen="true"
  +                     allowTabs="false"
  +                     javadocScope="protected"
  +                     ignoreWhitespace="true"
  +                     cacheFile="checkstyle.cache"
  +                     failOnViolation="false"
  +                     ignoreCastWhitespace="true">
  +                     <fileset dir="${java.dir}">
  +                             <include name="**/*.java"/>
  +                     </fileset>
  +            <formatter type="plain"/>
  +            <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  +             </checkstyle>
  +     </target>
  +
  +     <target name="checkstyle-report" 
  +            depends="checkstyle" 
  +            if="do.checkstyle" 
  +            description="Generate Checkstyle Report">
  +
  +             <mkdir dir="${build.reports}/checkstyle"/>
  +             <style style="../tools/etc/checkstyle-frames.xsl" 
in="build/checkstyle-results.xml"
  +                     out="${build.reports}/checkstyle/delete-me.html"/>
  +
  +     </target>
  +
       <!-- Creates the distribution -->
  -    <target name="dist" depends="jar, test-reports, jdepend, javadocs" 
description="Generates the jar files">
  +    <target name="dist" 
  +            depends="jar, test-reports, jdepend, checkstyle-report, 
javadocs" 
  +            description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
  @@ -227,6 +278,7 @@
   
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
  +        <delete file="checkstyle.cache"/>
           <delete dir="${build.dir}" />
           <delete dir="${dist.dir}" />
           <delete dir="test" /> <!-- unit testing output directory -->
  
  
  
  1.4       +1 -0      jakarta-avalon-excalibur/extension/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .cvsignore        21 Mar 2002 00:06:34 -0000      1.3
  +++ .cvsignore        21 Mar 2002 01:16:30 -0000      1.4
  @@ -1,5 +1,6 @@
   ant.properties
   build
  +checkstyle.cache
   distributions
   dist
   excalibur-*
  
  
  
  1.20      +52 -1     jakarta-avalon-excalibur/extension/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml 21 Mar 2002 00:02:48 -0000      1.19
  +++ build.xml 21 Mar 2002 01:16:30 -0000      1.20
  @@ -47,6 +47,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${junit.jar}"/>
  +        <pathelement location="${checkstyle.jar}"/>
       </path>
   
       <target name="main" depends="dist" description="Build the project"/>
  @@ -185,8 +186,58 @@
                  style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  +     <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +    
  +        <!-- this invocation of checkstyle requires that checkstyle be 
downloaded and setup -->
  +        <!-- thats why you are required to define do.checkstyle property to 
generate the report -->
  +             <taskdef name="checkstyle"
  +                     
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +                     <classpath refid="project.class.path"/>
  +             </taskdef>
  +             <checkstyle
  +                     lcurlyType="nl"
  +                     lcurlyMethod="nl"
  +                     lcurlyOther="nl"
  +                     rcurly="ignore"
  +                     allowProtected="false"
  +                     allowPackage="false"
  +                     allowNoAuthor="false"
  +                     maxLineLen="100"
  +                     maxMethodLen="100"
  +                     maxConstructorLen="100"
  +                     memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +                     staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +                     constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +                     ignoreImportLen="true"
  +                     allowTabs="false"
  +                     javadocScope="protected"
  +                     ignoreWhitespace="true"
  +                     cacheFile="checkstyle.cache"
  +                     failOnViolation="false"
  +                     ignoreCastWhitespace="true">
  +                     <fileset dir="${java.dir}">
  +                             <include name="**/*.java"/>
  +                     </fileset>
  +            <formatter type="plain"/>
  +            <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  +             </checkstyle>
  +     </target>
  +
  +     <target name="checkstyle-report" 
  +            depends="checkstyle" 
  +            if="do.checkstyle" 
  +            description="Generate Checkstyle Report">
  +
  +             <mkdir dir="${build.reports}/checkstyle"/>
  +             <style style="../tools/etc/checkstyle-frames.xsl" 
in="build/checkstyle-results.xml"
  +                     out="${build.reports}/checkstyle/delete-me.html"/>
  +
  +     </target>
  +
       <!-- Creates the distribution -->
  -    <target name="dist" depends="jar, test-reports, jdepend, javadocs" 
description="Generates the jar files">
  +    <target name="dist" 
  +            depends="jar, test-reports, jdepend, checkstyle-report, 
javadocs" 
  +            description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
  
  
  
  1.4       +1 -0      jakarta-avalon-excalibur/i18n/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .cvsignore        21 Mar 2002 00:06:34 -0000      1.3
  +++ .cvsignore        21 Mar 2002 01:16:30 -0000      1.4
  @@ -1,5 +1,6 @@
   ant.properties
   build
  +checkstyle.cache
   distributions
   dist
   excalibur-*
  
  
  
  1.20      +52 -1     jakarta-avalon-excalibur/i18n/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml 21 Mar 2002 00:02:48 -0000      1.19
  +++ build.xml 21 Mar 2002 01:16:30 -0000      1.20
  @@ -47,6 +47,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${junit.jar}"/>
  +        <pathelement location="${checkstyle.jar}"/>
       </path>
           
       <target name="main" depends="dist" description="Build the project"/>
  @@ -184,8 +185,58 @@
                  style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  +     <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +    
  +        <!-- this invocation of checkstyle requires that checkstyle be 
downloaded and setup -->
  +        <!-- thats why you are required to define do.checkstyle property to 
generate the report -->
  +             <taskdef name="checkstyle"
  +                     
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +                     <classpath refid="project.class.path"/>
  +             </taskdef>
  +             <checkstyle
  +                     lcurlyType="nl"
  +                     lcurlyMethod="nl"
  +                     lcurlyOther="nl"
  +                     rcurly="ignore"
  +                     allowProtected="false"
  +                     allowPackage="false"
  +                     allowNoAuthor="false"
  +                     maxLineLen="100"
  +                     maxMethodLen="100"
  +                     maxConstructorLen="100"
  +                     memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +                     staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +                     constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +                     ignoreImportLen="true"
  +                     allowTabs="false"
  +                     javadocScope="protected"
  +                     ignoreWhitespace="true"
  +                     cacheFile="checkstyle.cache"
  +                     failOnViolation="false"
  +                     ignoreCastWhitespace="true">
  +                     <fileset dir="${java.dir}">
  +                             <include name="**/*.java"/>
  +                     </fileset>
  +            <formatter type="plain"/>
  +            <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  +             </checkstyle>
  +     </target>
  +
  +     <target name="checkstyle-report" 
  +            depends="checkstyle" 
  +            if="do.checkstyle" 
  +            description="Generate Checkstyle Report">
  +
  +             <mkdir dir="${build.reports}/checkstyle"/>
  +             <style style="../tools/etc/checkstyle-frames.xsl" 
in="build/checkstyle-results.xml"
  +                     out="${build.reports}/checkstyle/delete-me.html"/>
  +
  +     </target>
  +
       <!-- Creates the distribution -->
  -    <target name="dist" depends="jar, test-reports, jdepend, javadocs" 
description="Generates the jar files">
  +    <target name="dist" 
  +            depends="jar, test-reports, jdepend, checkstyle-report, 
javadocs" 
  +            description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
  
  
  
  1.4       +1 -0      jakarta-avalon-excalibur/io/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .cvsignore        21 Mar 2002 00:06:34 -0000      1.3
  +++ .cvsignore        21 Mar 2002 01:16:30 -0000      1.4
  @@ -1,5 +1,6 @@
   ant.properties
   build
  +checkstyle.cache
   distributions
   dist
   excalibur-*
  
  
  
  1.21      +52 -1     jakarta-avalon-excalibur/io/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml 21 Mar 2002 00:02:48 -0000      1.20
  +++ build.xml 21 Mar 2002 01:16:30 -0000      1.21
  @@ -47,6 +47,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${junit.jar}"/>
  +        <pathelement location="${checkstyle.jar}"/>
       </path>
           
       <target name="main" depends="dist" description="Build the project"/>
  @@ -184,8 +185,58 @@
                  style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  +     <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +    
  +        <!-- this invocation of checkstyle requires that checkstyle be 
downloaded and setup -->
  +        <!-- thats why you are required to define do.checkstyle property to 
generate the report -->
  +             <taskdef name="checkstyle"
  +                     
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +                     <classpath refid="project.class.path"/>
  +             </taskdef>
  +             <checkstyle
  +                     lcurlyType="nl"
  +                     lcurlyMethod="nl"
  +                     lcurlyOther="nl"
  +                     rcurly="ignore"
  +                     allowProtected="false"
  +                     allowPackage="false"
  +                     allowNoAuthor="false"
  +                     maxLineLen="100"
  +                     maxMethodLen="100"
  +                     maxConstructorLen="100"
  +                     memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +                     staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +                     constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +                     ignoreImportLen="true"
  +                     allowTabs="false"
  +                     javadocScope="protected"
  +                     ignoreWhitespace="true"
  +                     cacheFile="checkstyle.cache"
  +                     failOnViolation="false"
  +                     ignoreCastWhitespace="true">
  +                     <fileset dir="${java.dir}">
  +                             <include name="**/*.java"/>
  +                     </fileset>
  +            <formatter type="plain"/>
  +            <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  +             </checkstyle>
  +     </target>
  +
  +     <target name="checkstyle-report" 
  +            depends="checkstyle" 
  +            if="do.checkstyle" 
  +            description="Generate Checkstyle Report">
  +
  +             <mkdir dir="${build.reports}/checkstyle"/>
  +             <style style="../tools/etc/checkstyle-frames.xsl" 
in="build/checkstyle-results.xml"
  +                     out="${build.reports}/checkstyle/delete-me.html"/>
  +
  +     </target>
  +
       <!-- Creates the distribution -->
  -    <target name="dist" depends="jar, test-reports, jdepend, javadocs" 
description="Generates the jar files">
  +    <target name="dist" 
  +            depends="jar, test-reports, jdepend, checkstyle-report, 
javadocs" 
  +            description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
  
  
  
  1.4       +1 -0      jakarta-avalon-excalibur/naming/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .cvsignore        21 Mar 2002 00:06:34 -0000      1.3
  +++ .cvsignore        21 Mar 2002 01:16:30 -0000      1.4
  @@ -1,5 +1,6 @@
   ant.properties
   build
  +checkstyle.cache
   distributions
   dist
   excalibur-*
  
  
  
  1.21      +52 -1     jakarta-avalon-excalibur/naming/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml 21 Mar 2002 00:02:48 -0000      1.20
  +++ build.xml 21 Mar 2002 01:16:30 -0000      1.21
  @@ -47,6 +47,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${junit.jar}"/>
  +        <pathelement location="${checkstyle.jar}"/>
       </path>
           
       <target name="main" depends="dist" description="Build the project"/>
  @@ -191,8 +192,58 @@
                  style="${ant.home}/etc/jdepend-frames.xsl"/>
       </target>
   
  +     <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +    
  +        <!-- this invocation of checkstyle requires that checkstyle be 
downloaded and setup -->
  +        <!-- thats why you are required to define do.checkstyle property to 
generate the report -->
  +             <taskdef name="checkstyle"
  +                     
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  +                     <classpath refid="project.class.path"/>
  +             </taskdef>
  +             <checkstyle
  +                     lcurlyType="nl"
  +                     lcurlyMethod="nl"
  +                     lcurlyOther="nl"
  +                     rcurly="ignore"
  +                     allowProtected="false"
  +                     allowPackage="false"
  +                     allowNoAuthor="false"
  +                     maxLineLen="100"
  +                     maxMethodLen="100"
  +                     maxConstructorLen="100"
  +                     memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  +                     staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  +                     constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  +                     ignoreImportLen="true"
  +                     allowTabs="false"
  +                     javadocScope="protected"
  +                     ignoreWhitespace="true"
  +                     cacheFile="checkstyle.cache"
  +                     failOnViolation="false"
  +                     ignoreCastWhitespace="true">
  +                     <fileset dir="${java.dir}">
  +                             <include name="**/*.java"/>
  +                     </fileset>
  +            <formatter type="plain"/>
  +            <formatter type="xml" toFile="build/checkstyle-results.xml"/>
  +             </checkstyle>
  +     </target>
  +
  +     <target name="checkstyle-report" 
  +            depends="checkstyle" 
  +            if="do.checkstyle" 
  +            description="Generate Checkstyle Report">
  +
  +             <mkdir dir="${build.reports}/checkstyle"/>
  +             <style style="../tools/etc/checkstyle-frames.xsl" 
in="build/checkstyle-results.xml"
  +                     out="${build.reports}/checkstyle/delete-me.html"/>
  +
  +     </target>
  +
       <!-- Creates the distribution -->
  -    <target name="dist" depends="jar, test-reports, jdepend, javadocs" 
description="Generates the jar files">
  +    <target name="dist" 
  +            depends="jar, test-reports, jdepend, checkstyle-report, 
javadocs" 
  +            description="Generates the jar files">
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${build.lib}/${dist.name}.jar" todir="${dist.dir}"/>
  
  
  
  1.1                  jakarta-avalon-excalibur/tools/etc/checkstyle-frames.xsl
  
  Index: checkstyle-frames.xsl
  ===================================================================
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
      xmlns:lxslt="http://xml.apache.org/xslt";
      xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
      extension-element-prefixes="redirect">
  
  <!--
   The Apache Software License, Version 1.1
  
   Copyright (c) 2002 The Apache Software Foundation.  All rights
   reserved.
  
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
  
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
  
   3. The end-user documentation included with the redistribution, if
      any, must include the following acknowlegement:
         "This product includes software developed by the
          Apache Software Foundation (http://www.apache.org/)."
      Alternately, this acknowlegement may appear in the software itself,
      if and wherever such third-party acknowlegements normally appear.
  
   4. The names "The Jakarta Project", "Ant", and "Apache Software
      Foundation" must not be used to endorse or promote products derived
      from this software without prior written permission. For written
      permission, please contact [EMAIL PROTECTED]
  
   5. Products derived from this software may not be called "Apache"
      nor may "Apache" appear in their names without prior written
      permission of the Apache Group.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
   ====================================================================
  
   This software consists of voluntary contributions made by many
   individuals on behalf of the Apache Software Foundation.  For more
   information on the Apache Software Foundation, please see
   <http://www.apache.org/>.
   -->
  
      <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
      <xsl:decimal-format decimal-separator="." grouping-separator="," />
  
      <xsl:param name="output.dir" select="'.'"/>
  
      <xsl:template match="checkstyle">
          <!-- create the index.html -->
          <redirect:write file="{$output.dir}/index.html">
              <xsl:call-template name="index.html"/>
          </redirect:write>
  
          <!-- create the stylesheet.css -->
          <redirect:write file="{$output.dir}/stylesheet.css">
              <xsl:call-template name="stylesheet.css"/>
          </redirect:write>
  
          <!-- create the overview-summary.html at the root -->
          <redirect:write file="{$output.dir}/overview-frame.html">
              <xsl:apply-templates select="." mode="overview"/>
          </redirect:write>
  
          <!-- create the all-classes.html at the root -->
          <redirect:write file="{$output.dir}/allclasses-frame.html">
              <xsl:apply-templates select="." mode="all.classes"/>
          </redirect:write>
  
          <!-- process all files -->
          <xsl:apply-templates select="file"/>
      </xsl:template>
  
      <xsl:template name="index.html">
          <html>
              <head>
                  <title>CheckStyle Audit</title>
              </head>
              <frameset cols="20%,80%">
                  <frame src="allclasses-frame.html" name="fileListFrame"/>
                  <frame src="overview-frame.html" name="fileFrame"/>
              </frameset>
              <noframes>
                  <h2>Frame Alert</h2>
                  <p>
                      This document is designed to be viewed using the frames 
feature. If you see this message, you are using a non-frame-capable web client.
                  </p>
              </noframes>
          </html>
      </xsl:template>
  
      <xsl:template name="pageHeader">
          <table border="0" cellpadding="0" cellspacing="0" width="100%">
              <tr>
                  <td class="text-align:right"><h2>CheckStyle Audit</h2></td>
              </tr>
              <tr>
                  <td class="text-align:right">Designed for use with <a 
href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and <a 
href='http://jakarta.apache.org'>Ant</a>.</td>
              </tr>
          </table>
          <hr size="1"/>
      </xsl:template>
  
      <xsl:template match="checkstyle" mode="overview">
          <html>
              <head>
                  <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
              </head>
              <body>
                  <!-- page header -->
                  <xsl:call-template name="pageHeader"/>
  
                  <!-- Summary part -->
                  <xsl:apply-templates select="." mode="summary"/>
                  <hr size="1" width="100%" align="left"/>
  
                  <!-- File list part -->
                  <xsl:apply-templates select="." mode="filelist"/>
              </body>
          </html>
      </xsl:template>
  
      <xsl:template name="stylesheet.css">
          .bannercell {
          border: 0px;
          padding: 0px;
          }
          body {
          margin-left: 10;
          margin-right: 10;
          font:normal 80% arial,helvetica,sanserif;
          background-color:#FFFFFF;
          color:#000000;
          }
          .a td {
          background: #efefef;
          }
          .b td {
          background: #fff;
          }
          th, td {
          text-align: left;
          vertical-align: top;
          }
          th {
          font-weight:bold;
          background: #ccc;
          color: black;
          }
          table, th, td {
          font-size:100%;
          border: none
          }
          table.log tr td, tr th {
  
          }
          h2 {
          font-weight:bold;
          font-size:140%;
          margin-bottom: 5;
          }
          h3 {
          font-size:100%;
          font-weight:bold;
          background: #525D76;
          color: white;
          text-decoration: none;
          padding: 5px;
          margin-right: 2px;
          margin-left: 2px;
          margin-bottom: 0;
          }
      </xsl:template>
  
      <!--
      Creates an all-classes.html file that contains a link to all files.
      -->
      <xsl:template match="checkstyle" mode="all.classes">
          <html>
              <head>
                  <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
              </head>
              <body>
                  <h2>Files</h2>
                  <p>
                      <table width="100%">
                          <!-- For each file create its part -->
                          <xsl:apply-templates select="file" mode="all.classes">
                              <xsl:sort select="@name"/>
                          </xsl:apply-templates>
                      </table>
                  </p>
              </body>
          </html>
      </xsl:template>
  
      <xsl:template match="checkstyle" mode="filelist">
          <h3>Files</h3>
          <table class="log" border="0" cellpadding="5" cellspacing="2" 
width="100%">
              <tr>
                  <th>Name</th>
                  <th>Errors</th>
              </tr>
              <xsl:apply-templates select="file" mode="filelist">
                  <xsl:sort select="@name"/>
              </xsl:apply-templates>
          </table>
      </xsl:template>
  
      <xsl:template match="file" mode="filelist">
          <tr>
              <xsl:call-template name="alternated-row"/>
              <td nowrap="nowrap">
                  <a>
                      <xsl:attribute name="href">
                          <xsl:text>files/</xsl:text><xsl:value-of 
select="@name"/><xsl:text>.html</xsl:text>
                      </xsl:attribute>
                      <xsl:value-of select="@name"/>
                  </a>
              </td>
              <td><xsl:value-of select="count(error)"/></td>
          </tr>
      </xsl:template>
  
      <xsl:template match="file" mode="all.classes">
          <tr>
              <td nowrap="nowrap">
                  <a target="fileFrame">
                      <xsl:attribute name="href">
                          <xsl:text>files/</xsl:text><xsl:value-of 
select="@name"/><xsl:text>.html</xsl:text>
                      </xsl:attribute>
                      <xsl:value-of select="@name"/>
                  </a>
              </td>
          </tr>
      </xsl:template>
  
      <!--
      transform string like a/b/c to ../../../
      @param path the path to transform into a descending directory path
      -->
      <xsl:template name="path">
          <xsl:param name="path"/>
          <xsl:if test="contains($path,'/')">
              <xsl:text>../</xsl:text>
              <xsl:call-template name="path">
                  <xsl:with-param name="path"><xsl:value-of 
select="substring-after($path,'/')"/></xsl:with-param>
              </xsl:call-template>
          </xsl:if>
          <xsl:if test="not(contains($path,'/')) and not($path = '')">
              <xsl:text>../</xsl:text>
          </xsl:if>
      </xsl:template>
  
      <xsl:template match="file">
          <redirect:write file="{$output.dir}/files/[EMAIL PROTECTED]">
              <html>
                  <head>
                      <link rel="stylesheet" type="text/css">
                          <xsl:attribute name="href"><xsl:call-template 
name="path"><xsl:with-param name="path" 
select="@name"/></xsl:call-template><xsl:text>stylesheet.css</xsl:text></xsl:attribute>
                      </link>
                  </head>
                  <body>
                      <xsl:call-template name="pageHeader"/>
                      <h3>File <xsl:value-of select="@name"/></h3>
                      <table class="log" border="0" cellpadding="5" 
cellspacing="2" width="100%">
                          <tr>
                              <th>Error Description</th>
                              <th>Line</th>
                          </tr>
                          <xsl:for-each select="error">
                              <tr>
                                  <xsl:call-template name="alternated-row"/>
                                  <td><xsl:value-of select="@message"/></td>
                                  <td><xsl:value-of select="@line"/></td>
                              </tr>
                          </xsl:for-each>
                      </table>
                  </body>
              </html>
          </redirect:write>
      </xsl:template>
  
      <xsl:template match="checkstyle" mode="summary">
          <h3>Summary</h3>
          <xsl:variable name="fileCount" select="count(file)"/>
          <xsl:variable name="errorCount" select="count(file/error)"/>
          <table class="log" border="0" cellpadding="5" cellspacing="2" 
width="100%">
              <tr>
                  <th>Files</th>
                  <th>Errors</th>
              </tr>
              <tr>
                  <xsl:call-template name="alternated-row"/>
                  <td><xsl:value-of select="$fileCount"/></td>
                  <td><xsl:value-of select="$errorCount"/></td>
              </tr>
          </table>
      </xsl:template>
  
      <xsl:template name="alternated-row">
          <xsl:attribute name="class">
              <xsl:if test="position() mod 2 = 1">a</xsl:if>
              <xsl:if test="position() mod 2 = 0">b</xsl:if>
          </xsl:attribute>
      </xsl:template>
  </xsl:stylesheet>
  
  
  
  

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

Reply via email to