I don't like the plugin.jelly patch. If project is configure correctly,
jcoverage plugin doesn't use unit test source.
Could you revert plugin.jelly changes.
I think the problem describe by Gilles Dodinet is due to another problem.
Thanks.
Emmanuel
----- Original Message -----
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Monday, September 08, 2003 4:26 AM
Subject: cvs commit: maven/src/plugins-build/jcoverage plugin.jelly
> dion 2003/09/07 19:26:30
>
> Modified:
src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport
> CoverageReport.java
> src/plugins-build/jcoverage plugin.jelly
> Log:
> Applied MAVEN-795
> Fix files existing in the coverage report that don't exist in source
>
> Revision Changes Path
> 1.2 +15 -2
maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/
CoverageReport.java
>
> Index: CoverageReport.java
> ===================================================================
> RCS file:
/home/cvs/maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcover
agereport/CoverageReport.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- CoverageReport.java 3 Sep 2003 16:27:14 -0000 1.1
> +++ CoverageReport.java 8 Sep 2003 02:26:30 -0000 1.2
> @@ -185,6 +185,10 @@
> urlDirectory = ".";
> }
> File fsFile = new File(dir, filename);
> + if (!fsFile.exists())
> + {
> + return;
> + }
> PrintWriter pw = new PrintWriter(new BufferedWriter(new
FileWriter(fsFile)));
> pw.println("<html>");
> pw.println("<head>");
> @@ -243,6 +247,10 @@
> rootRef = "";
> }
> File fsFile = new File(dir, filename);
> + if (!fsFile.exists())
> + {
> + return;
> + }
> PrintWriter pw = new PrintWriter(new BufferedWriter(new
FileWriter(fsFile)));
> pw.println("<html>");
> pw.println("<head>");
>
> @@ -371,7 +379,12 @@
> {
> for (Iterator iter = coverage.getClasses().iterator();
iter.hasNext(); )
> {
> - generateSourceFile(dir, (Clazz) iter.next());
> + Clazz theClass = (Clazz) iter.next();
> + File file = new File(coverage.getSrcDirectory(),
theClass.getFile());
> + if (file.exists())
> + {
> + generateSourceFile(dir, theClass);
> + }
> }
> }
>
>
>
>
> 1.2 +15 -2 maven/src/plugins-build/jcoverage/plugin.jelly
>
> Index: plugin.jelly
> ===================================================================
> RCS file: /home/cvs/maven/src/plugins-build/jcoverage/plugin.jelly,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- plugin.jelly 3 Sep 2003 16:27:14 -0000 1.1
> +++ plugin.jelly 8 Sep 2003 02:26:30 -0000 1.2
> @@ -95,6 +95,8 @@
>
> <maven:addPath id="maven.dependency.classpath"
refid="jcoverage.classpath"/>
> <maven:addPath id="maven.dependency.classpath"
refid="${pom.getDependencyClasspath()}"/>
> +
> +
>
> <instrument todir="${maven.jcoverage.instrumentation}">
> <ant:fileset dir="${maven.build.dest}">
> @@ -136,9 +138,19 @@
> <j:catch var="ex">
>
> <j:set var="template"
value="${maven.jcoverage.report.template}"/>
> +
> + <ant:copy todir="${maven.jcoverage.sourceDirectory}">
> + <ant:fileset dir="${pom.build.sourceDirectory}">
> + <ant:include name="**/*.java" />
> + </ant:fileset>
> + <ant:fileset dir="${pom.build.unitTestSourceDirectory}">
> + <ant:include name="**/*.java" />
> + </ant:fileset>
> + </ant:copy>
> +
> <j:choose>
> <j:when test="${template == 'jcoverage'}">
> - <report srcdir="${pom.build.sourceDirectory}"
destdir="${maven.coverage.dir}">
> + <report srcdir="${maven.jcoverage.sourceDirectory}"
destdir="${maven.coverage.dir}">
> <ant:classpath>
> <ant:path refid="jcoverage.classpath"/>
> </ant:classpath>
> @@ -148,13 +160,14 @@
> <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}"
> + <report srcdir="${maven.jcoverage.sourceDirectory}"
destdir="${maven.jcoverage.dir}"
> format="xml">
> <ant:classpath>
> <ant:path refid="jcoverage.classpath"/>
> </ant:classpath>
> </report>
> <ant:copy file="${plugin.resources}/style.css"
todir="${maven.coverage.dir}"/>
> + <ant:echo>jcoverage:report params : {dataFile,
ouputDir}={${maven.jcoverage.dir}/coverage.xml,
${maven.coverage.dir}}</ant:echo>
> <jcoverage:report
> dataFile="${maven.jcoverage.dir}/coverage.xml"
> outputDir="${maven.coverage.dir}"/>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
> _____________________________________________________________________
> Envie de discuter en "live" avec vos amis ? T�l�charger MSN Messenger
> http://www.ifrance.com/_reloc/m la 1�re messagerie instantan�e de France
_____________________________________________________________________
Envie de discuter en "live" avec vos amis ? T�l�charger MSN Messenger
http://www.ifrance.com/_reloc/m la 1�re messagerie instantan�e de France
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
