rleland     2003/08/27 18:51:24

  Modified:    .        build.properties.sample build.xml
  Log:
  Update PMD to version 1.2.1,
  This shouldl actually work with PMD 1.03 and above.
  
  Revision  Changes    Path
  1.48      +6 -3      jakarta-struts/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- build.properties.sample   23 Aug 2003 03:01:24 -0000      1.47
  +++ build.properties.sample   28 Aug 2003 01:51:23 -0000      1.48
  @@ -102,9 +102,10 @@
   # you do not have Checkstyle installed, do not set this property.
   checkstyle.jar = /Java/checkstyle-2.4/checkstyle-all-2.4.jar
   
  -# The JAR file containing the PMD package version 1.01, if available. If
  +# The Directory containing the PMD package distribution, 1.2.1, if available. If
   # you do not have PMD installed, do not set this property.
  -pmd.jar = /Java/pmd/lib/pmd-1.01.jar
  +pmd.home = /Java/Programs/SourceForge/pmd-1.2.1
  +
   #############################Maven Variables #######################################
   # CVS Start Change Log date
   cvs.start=17 April 2003
  @@ -113,6 +114,8 @@
   # If you are using ssh tunneling & have a .cvspass file setup
   cvs.developer.host=localhost
   cvs.developer.id=rleland
  +
  +#############################End of Maven Variables 
#######################################
   
   # Properties related to Struts Contrib
   # -----------------------------------------
  
  
  
  1.120     +14 -8     jakarta-struts/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/build.xml,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- build.xml 10 Aug 2003 06:00:49 -0000      1.119
  +++ build.xml 28 Aug 2003 01:51:23 -0000      1.120
  @@ -115,7 +115,7 @@
   
       <!-- Default values for unspecified properties -->
       <property name="catalina.home"   value="../jakarta-tomcat-4.0/build"/>
  -    <property name="pmd.rulesets"    
value="rulesets/imports.xml,rulesets/unusedcode.xml"/>
  +    <property name="pmd.rulesets"    
value="rulesets/imports.xml,rulesets/unusedcode.xml,rulesets/basic.xml,rulesets/strings.xml"/>
       <property name="pmd.report"      value="pmdreport.html"/>
   
   
  @@ -218,6 +218,14 @@
         <pathelement location="${xerces.jar}"/>
       </path>
   
  +    <!-- PMD Classpath -->
  +  
  +    <path id="pmd.classpath">
  +      <fileset dir="${pmd.home}/lib">
  +        <include name="*.jar"/>
  +      </fileset>
  +    </path>
  +
   
   <!-- ========== Executable Targets ======================================== -->
   
  @@ -762,19 +770,17 @@
           </checkstyle>
       </target>
   
  -    <target name="pmd" if="pmd.jar"
  +    <target name="pmd" if="pmd.home"
               description="Locates unused imports, unused variables, etc."
               depends="init">
  -        <taskdef name="pmd"
  -                 classname="net.sourceforge.pmd.ant.PMDTask">
  -            <classpath location="${pmd.jar}"/>
  +        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
  +            <classpath refid="pmd.classpath"/>
           </taskdef>
  -        <pmd printToConsole="true" rulesetfiles="${pmd.rulesets}">
  -             <formatter type="html" toFile="${pmd.report}"/>
  +        <pmd printToConsole="true" rulesetfiles="${pmd.rulesets}" 
shortFilenames="true">
  +            <formatter type="html" toFile="${pmd.report}"  />
               <fileset dir="${src.share.dir}" includes="**/*.java"/>
           </pmd>
       </target>
  -
   
   <!--
           Compile Website documenation
  
  
  

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

Reply via email to