PR: MPJCOVERAGE-1

copy multiple source directories into one


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115407 13f79535-47bb-0310-9956-ffa450edef68

jcoverage/plugin.jelly

@@ -160,10 +160,23 @@
 
     <j:catch var="ex">
 
+      <j:set var="sourceDir" value="${context.getAntProject().getReferences().get('maven.compile.src.set')}" />
+      <u:tokenize var="sourceDirList" delim="${path.separator}">${sourceDir}</u:tokenize>
+      <j:if test="${size(sourceDirList) != 1}">
+        <!-- Copy multiple source directories to one: jcoverage doesn't handle multiple source directories -->
+        <echo>Copying ${size(sourceDirList)} source directories into one for jcoverage</echo>
+        <j:set var="sourceDir" value="${maven.jcoverage.dir}/sources" />
+        <ant:copy todir="${sourceDir}">
+          <j:forEach var="dir" items="${sourceDirList}">
+            <ant:fileset dir="${dir}" />
+          </j:forEach>
+        </ant:copy>
+      </j:if>
+          
       <j:set var="template" value="${maven.jcoverage.report.template}"/>
       <j:choose>
         <j:when test="${template == 'jcoverage'}">
-          <report srcdir="${pom.build.sourceDirectory}" destdir="${maven.coverage.dir}">
+          <report srcdir="${sourceDir}" destdir="${maven.coverage.dir}">
             <ant:classpath>
               <ant:path refid="jcoverage.classpath"/>
             </ant:classpath>
@@ -173,8 +186,7 @@
           <log:info>The HTML report is ${maven.build.coverage.dir}/index.html</log:info>
         </j:when>
         <j:otherwise>
-          <report srcdir="${pom.build.sourceDirectory}" destdir="${maven.jcoverage.dir}"
-                  format="xml">
+          <report srcdir="${sourceDir}" destdir="${maven.jcoverage.dir}" format="xml">
             <ant:classpath>
               <ant:path refid="jcoverage.classpath"/>
             </ant:classpath>

jcoverage/project.xml

@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jcoverage-plugin</id>
   <name>Maven JCoverage plugin</name>
-  <currentVersion>1.0.4</currentVersion>
+  <currentVersion>1.0.5-SNAPSHOT</currentVersion>
   <package>org.apache.maven.jcoveragereport</package>
   <description>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</description>
   <shortDescription>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</shortDescription>
@@ -72,6 +72,16 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
+    <developer>
+      <name>Brett Porter</name>
+      <id>brett</id>
+      <email>brett@apache.org</email>
+      <organization>f2 network</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+10</timezone>
+    </developer>
   </developers>
   <dependencies>
     <dependency>

jcoverage/xdocs/changes.xml

@@ -24,6 +24,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.0.5-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPJCOVERAGE-1">Handle multiple source directories correctly</action>
+    </release>
     <release version="1.0.4" date="2004-05-15">
       <action dev="evenisse" type="add" issue="MPJCOVERAGE-7">Custom stylesheet for jcoverage plugin.</action>
       <action dev="evenisse" type="fix" issue="MPJCOVERAGE-6">Fix the report generation after a rmic generation.</action>