Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/pmd/plugin.jelly,v
retrieving revision 1.15
diff -u -r1.15 plugin.jelly
--- plugin.jelly	29 Jul 2004 14:31:30 -0000	1.15
+++ plugin.jelly	19 Oct 2004 16:22:01 -0000
@@ -95,6 +95,7 @@
       <pathelement path="${plugin.getDependencyPath('jaxen:jaxen')}" />
       <pathelement path="${plugin.getDependencyPath('saxpath:saxpath')}" />
       <pathelement path="${pom.getDependencyClasspath()}" />
+      <pathelement path="${plugin.resources}" />
       <path refid="maven.dependency.classpath" />
     </path>
 
@@ -106,40 +107,61 @@
         
     <!-- Run the PMD task - need a way to define the rulesets dynamically -->
     <echo>Running the PMD task with ${maven.pmd.rulesetfiles} ...</echo>
+    
 
     <!-- Prepare empty raw report because no file is generated if no rule is 
          violated and that causes the report generation to fail later on -->
     <echo file="${maven.build.dir}/pmd-raw-report.xml" 
         message="&lt;?xml version='1.0'?&gt;&lt;pmd/&gt;"/>
+    
+    
+    <available file="${pom.build.unitTestSourceDirectory}" type="dir" property="pom.build.unitTestSourceDirectory.present"/>
+    
+    
+    <pmd rulesetfiles="${maven.pmd.rulesetfiles}">
+      <formatter type="xml" toFile="${maven.build.dir}/pmd-raw-report.xml"/>
+      <fileset dir="${pom.build.sourceDirectory}" 
+        includes="${maven.pmd.includes}"
+        excludes="${maven.pmd.excludes}">
 
-    <j:choose>
-      <j:when test="${sourcesPresent == 'true'}">
-        <pmd rulesetfiles="${maven.pmd.rulesetfiles}">
-          <formatter type="xml" toFile="${maven.build.dir}/pmd-raw-report.xml"/>
-          <fileset dir="${pom.build.sourceDirectory}" 
-            includes="${maven.pmd.includes}"
-            excludes="${maven.pmd.excludes}">
-
-            <!-- FIXME: This is a bad cut and paste -->
-            <!-- handle source modifications -->
-            <j:forEach var="sm" items="${pom.build.sourceModifications}">
-              <available property="classPresent" classname="${sm.className}"/>
-              <j:if test="${classPresent != 'true'}">
-                <j:forEach var="exclude" items="${sm.excludes}">
-                  <exclude name="${exclude}"/>
-                </j:forEach>
-                <j:forEach var="include" items="${sm.includes}">
-                  <include name="${include}"/>
-                </j:forEach>
-              </j:if>
+        <!-- FIXME: This is a bad cut and paste -->
+        <!-- handle source modifications -->
+        <j:forEach var="sm" items="${pom.build.sourceModifications}">
+          <available property="classPresent" classname="${sm.className}"/>
+          <j:if test="${classPresent != 'true'}">
+            <j:forEach var="exclude" items="${sm.excludes}">
+              <exclude name="${exclude}"/>
             </j:forEach>
-          </fileset>
-        </pmd>
-      </j:when>
-      <j:otherwise>
-        <ant:echo>No java source files to process.</ant:echo>
-      </j:otherwise>
-    </j:choose>
+            <j:forEach var="include" items="${sm.includes}">
+              <include name="${include}"/>
+            </j:forEach>
+          </j:if>
+        </j:forEach>
+      </fileset>
+      
+      <j:if test="${pom.build.unitTestSourceDirectory.present}">      
+	      <fileset dir="${pom.build.unitTestSourceDirectory}" 
+		      includes="${maven.pmd.includes}"
+		      excludes="${maven.pmd.excludes}">
+		      
+		      <!-- FIXME: This is a bad cut and paste -->
+        	      <!-- handle source modifications -->
+
+		      <j:forEach var="sm" items="${pom.build.sourceModifications}">
+			<available property="classPresent" classname="${sm.className}"/>
+			<j:if test="${classPresent != 'true'}">
+			  <j:forEach var="exclude" items="${sm.excludes}">
+			    <exclude name="${exclude}"/>
+			  </j:forEach>
+			  <j:forEach var="include" items="${sm.includes}">
+			    <include name="${include}"/>
+			  </j:forEach>
+			</j:if>
+		      </j:forEach>
+	      </fileset>
+      </j:if>
+      
+    </pmd>
     
     <!-- Run JSL to transform the report into XDOC -->
           
@@ -156,7 +178,7 @@
     <!-- Generate CPD report if it is enabled -->
     <j:set var="enable" value="${maven.pmd.cpd.enable}"/>
 
-    <j:if test="${enable == 'true' and sourcesPresent == 'true'}">
+    <j:if test="${enable == 'true'}">
       <attainGoal name="pmd:cpd-report"/>
     </j:if>
   </goal>
@@ -178,6 +200,7 @@
     <echo>Running the CPD task with minimumTokenCount = ${maven.pmd.cpd.minimumtokencount} ...</echo>
 
     <ant:mkdir dir="${maven.build.dir}" />
+    
 
     <cpd minimumTokenCount="${maven.pmd.cpd.minimumtokencount}"
       outputFile="${maven.build.dir}/cpd-raw-report.txt">
@@ -200,6 +223,7 @@
           </j:if>
         </j:forEach>
       </fileset>
+      
     </cpd>
 
     <!-- Convert raw text report into XDOC -->