brett 2004/05/26 16:51:31 Modified: jcoverage plugin.jelly project.xml jcoverage/xdocs changes.xml Log: PR: MPJCOVERAGE-1 copy multiple source directories into one Revision Changes Path 1.11 +15 -3 maven-plugins/jcoverage/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/maven-plugins/jcoverage/plugin.jelly,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plugin.jelly 26 Apr 2004 12:12:14 -0000 1.10 +++ plugin.jelly 26 May 2004 23:51:31 -0000 1.11 @@ -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> 1.23 +11 -1 maven-plugins/jcoverage/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/maven-plugins/jcoverage/project.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- project.xml 16 May 2004 02:08:39 -0000 1.22 +++ project.xml 26 May 2004 23:51:31 -0000 1.23 @@ -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> @@ -71,6 +71,16 @@ <role>Java Developer</role> </roles> <timezone>+1</timezone> + </developer> + <developer> + <name>Brett Porter</name> + <id>brett</id> + <email>[EMAIL PROTECTED]</email> + <organization>f2 network</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>+10</timezone> </developer> </developers> <dependencies> 1.14 +3 -0 maven-plugins/jcoverage/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/maven-plugins/jcoverage/xdocs/changes.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- changes.xml 16 May 2004 02:08:39 -0000 1.13 +++ changes.xml 26 May 2004 23:51:31 -0000 1.14 @@ -24,6 +24,9 @@ <author email="[EMAIL PROTECTED]">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>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]