From 586924c6b9db3a40952161cd374f43986f079999 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 5 Dec 2003 17:38:39 +0000
Subject: [PATCH] Allows the user to override the Clover jar. This is
 especially useful as the Clover jars are license-signed for a specific
 project so you might want to use different jars for different projects.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114451 13f79535-47bb-0310-9956-ffa450edef68
---
 clover/plugin.jelly         | 11 +++++++++--
 clover/plugin.properties    |  5 +++++
 clover/xdocs/changes.xml    |  5 +++++
 clover/xdocs/properties.xml | 13 +++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 889e4f67..21623536 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -16,7 +16,14 @@
   <j:set var="testPlugin" value="${pom.getPluginContext('maven-test-plugin')}"/>
   
   <ant:path id="clover.classpath">
-    <ant:pathelement path="${plugin.getDependencyPath('clover')}"/>
+    <j:choose>
+      <j:when test="${context.getVariable('maven.clover.jar') != null}">
+        <ant:pathelement path="${maven.clover.jar}"/>
+      </j:when>
+      <j:otherwise>
+        <ant:pathelement path="${plugin.getDependencyPath('clover')}"/>
+      </j:otherwise>
+    </j:choose>
   </ant:path>
 
   <goal name="maven-clover-plugin:register">
@@ -218,7 +225,7 @@
         <ant:arg line="${clover.initstring}"/>
         <ant:classpath>
           <ant:path refid="maven-classpath"/>
-          <ant:pathelement path="${plugin.getDependencyPath('clover')}"/>
+          <ant:path refid="clover.classpath"/>
         </ant:classpath>
     </ant:java>
   </goal>
diff --git a/clover/plugin.properties b/clover/plugin.properties
index 9fa4c69b..3afe940e 100644
--- a/clover/plugin.properties
+++ b/clover/plugin.properties
@@ -13,6 +13,11 @@ maven.clover.orderBy=PcCoveredAsc
 # Whether tests should be instrumented by Clover or not
 maven.clover.instrument.tests = false
 
+# Allows the user to override the Clover jar. This is especially useful
+# as the Clover jars are license-signed for a specific project so you 
+# might want to use different jars for different projects.
+#maven.clover.jar = ${maven.repo.remote}/clover/jars/clover-myproject-1.2.3.jar
+
 # What are the reports that should be generated
 maven.clover.report.html=true
 maven.clover.report.xml=false
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index cddab1e2..e9bdc048 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -9,6 +9,11 @@
   <body>
 
 	<release version="1.4" date="in CVS">
+	  <action dev="vmassol" type="add" issue="MPCLOVER-11">
+        Allows the user to override the Clover jar. This is especially useful
+        as the Clover jars are license-signed for a specific project so you 
+        might want to use different jars for different projects.
+	  </action>
 	  <action dev="vmassol" type="add" issue="MPCLOVER-12">
         Conditionally instrument test classes too. To instrument test classes
         set the <code>maven.clover.instrument.tests</code> to 
diff --git a/clover/xdocs/properties.xml b/clover/xdocs/properties.xml
index cbbd532c..b950f4e7 100644
--- a/clover/xdocs/properties.xml
+++ b/clover/xdocs/properties.xml
@@ -37,6 +37,19 @@
             <code>false</code>
           </td>
         </tr>
+        <tr>
+          <td>maven.clover.jar</td>
+          <td>Yes</td>
+          <td>
+            Allows the user to override the Clover jar. This is especially 
+            useful as the Clover jars are license-signed for a specific 
+            project so you might want to use different jars for different 
+            projects.
+          </td>
+          <td>
+            Undefined
+          </td>
+        </tr>
         <tr>
           <td>maven.clover.report.html</td>
           <td>Yes</td>