Author: vmassol
Date: Tue May 31 05:34:23 2005
New Revision: 179212

URL: http://svn.apache.org/viewcvs?rev=179212&view=rev
Log:
MPCLOVER-30: When calling <code>clover:on</code> a second time, an updated 
<code>maven.compile.src.set</code> was ignored.

Modified:
    maven/maven-1/plugins/trunk/clover/plugin.jelly
    maven/maven-1/plugins/trunk/clover/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/clover/plugin.jelly
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/plugin.jelly?rev=179212&r1=179211&r2=179212&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/clover/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/clover/plugin.jelly Tue May 31 05:34:23 2005
@@ -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">
   

Modified: maven/maven-1/plugins/trunk/clover/xdocs/changes.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/xdocs/changes.xml?rev=179212&r1=179211&r2=179212&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/clover/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/clover/xdocs/changes.xml Tue May 31 05:34:23 
2005
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to