From 758ddc2deff8f178f5764dfb2bd0f05763fbde45 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 31 May 2005 12:34:23 +0000
Subject: [PATCH] MPCLOVER-30: When calling <code>clover:on</code> a second
 time, an updated <code>maven.compile.src.set</code> was ignored.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@179212 13f79535-47bb-0310-9956-ffa450edef68
---
 clover/plugin.jelly      |  8 ++++++++
 clover/xdocs/changes.xml | 10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index a07bc41f..d1d378a8 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -227,6 +227,14 @@
     <maven:set plugin="maven-test-plugin" property="maven.junit.fork"
         value="${junitForkOld}"/>
 
+    <!-- Reset Ant variables compileSrcSetString and testSrcSetString. This is
+         required because in Ant a variable is set forever. Setting them to 
+         null using the Jelly set tag seems to do the trick -->
+    <j:set var="compileSrcSetString" value="${null}" scope="parent"/>
+    <j:if test="${context.getVariable('maven.clover.instrument.tests') == 'true'}">
+      <j:set var="testSrcSetString" value="${null}" scope="parent"/>
+    </j:if>
+    
   </goal>
   <goal name="clover:off" description="Deactivates Clover">
   
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index 17126d24..b4bcff88 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -26,20 +26,24 @@
   </properties>
   <body>
     <release version="1.10-SNAPSHOT" date="in svn">
+      <action dev="vmassol" type="fix" issue="MPCLOVER-30" due-to="Eric Lapierre">
+        When calling <code>clover:on</code> a second time, an updated 
+        <code>maven.compile.src.set</code> was ignored.
+      </action>
     </release>
     <release version="1.9.1" date="2005-05-28">
-      <action dev="vmassol" type="fix" issues="MPCLOVER-40" due-to="Kristopher Brown">Fixed the
+      <action dev="vmassol" type="fix" issue="MPCLOVER-40" due-to="Kristopher Brown">Fixed the
         <code>clover:test-single</code>goal which was wrongly calling the
         <code>clover:swing-report-internal</code>(should have been
         <code>clover:swing-report</code>).
       </action>
-      <action dev="carlos" type="fix" issues="MPCLOVER-38">Fixed bug when
+      <action dev="carlos" type="fix" issue="MPCLOVER-38">Fixed bug when
         <code>maven.test.failure.ignore</code>is
         <code>null</code>.
       </action>
     </release>
     <release version="1.9" date="2005-05-22">
-      <action dev="vmassol" type="fix" issues="MPCLOVER-37" due-to="Carlos Sanchez">
+      <action dev="vmassol" type="fix" issue="MPCLOVER-37" due-to="Carlos Sanchez">
         <code>maven.test.failure.ignore</code>is now correctly reset when
         <code>clover:off</code>is called.
       </action>
