DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-08-07 07:00:39 +0200 (Mon, 07 Aug 2006)
New Revision: 1720

Modified:
   trunk/main/build.xml
   
trunk/main/depot/plugins/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
Log:
fix checkstyle task to properly handle main and test resources

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml        2006-08-07 04:25:28 UTC (rev 1719)
+++ trunk/main/build.xml        2006-08-07 05:00:39 UTC (rev 1720)
@@ -233,6 +233,7 @@
   </target>
 
   <target name="checkstyle" depends="prepare">
+    <echo message="Checkstyle" />
     <property name="checkstyle.dir" 
location="${basedir}/target/reports/checkstyle"/>
     <property name="checkstyle.data" 
location="${checkstyle.dir}/checkstyle.xml"/>
     <x:plugin uri="link:part:dpml/depot/dpml-depot-checkstyle">
@@ -241,11 +242,6 @@
     <mkdir dir="${checkstyle.dir}"/>
     <checkstyle>
       <formatter type="xml" toFile="${checkstyle.data}"/>
-      <fileset dir=".">
-        <include name="**/target/build/main/**/*.java"/>
-        <include name="**/target/build/test/**/*.java"/>
-        <exclude name="target/**/*.*"/>
-      </fileset>
     </checkstyle>
     <xslt style="${dpml.prefs}/dpml/tools/xsls/checkstyle-frames.xsl"
         in="${checkstyle.data}" 

Modified: 
trunk/main/depot/plugins/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
===================================================================
--- 
trunk/main/depot/plugins/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
  2006-08-07 04:25:28 UTC (rev 1719)
+++ 
trunk/main/depot/plugins/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
  2006-08-07 05:00:39 UTC (rev 1720)
@@ -116,8 +116,16 @@
             fileset.setIncludes( "**/*.java" );
             super.addFileset( fileset );
         }
-        if( resource instanceof Module )    
+        File test = new File( file, "target/build/test" );
+        if( test.exists() )
         {
+            FileSet fileset = new FileSet();
+            fileset.setDir( test );
+            fileset.setIncludes( "**/*.java" );
+            super.addFileset( fileset );
+        }
+        if( resource instanceof Module )
+        {
             Module module = (Module) resource;
             Resource[] children = module.getResources();
             for( int i=0; i < children.length; i++ )