dion        2003/09/08 04:15:16

  Modified:    src/plugins-build/jcoverage plugin.jelly
  Log:
  Revert MAVEN-795
  
  Revision  Changes    Path
  1.3       +2 -15     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly      8 Sep 2003 02:26:30 -0000       1.2
  +++ plugin.jelly      8 Sep 2003 11:15:16 -0000       1.3
  @@ -95,8 +95,6 @@
   
         <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}">
  @@ -138,19 +136,9 @@
       <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="${maven.jcoverage.sourceDirectory}" 
destdir="${maven.coverage.dir}">
  +          <report srcdir="${pom.build.sourceDirectory}" 
destdir="${maven.coverage.dir}">
               <ant:classpath>
                 <ant:path refid="jcoverage.classpath"/>
               </ant:classpath>
  @@ -160,14 +148,13 @@
             <log:info>The HTML report is 
${maven.build.coverage.dir}/index.html</log:info>
           </j:when>
           <j:otherwise>
  -          <report srcdir="${maven.jcoverage.sourceDirectory}" 
destdir="${maven.jcoverage.dir}"
  +          <report srcdir="${pom.build.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]

Reply via email to