From 3144c23f3fb9914c3e427fef80752958c62a3e4a Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 21 May 2005 11:08:50 +0000
Subject: [PATCH] Removed the <code>maven.clover.jar</code> property that was
 used to override the default Clover jar. This property was not working (it
 requires Ant 1.6) and is no needed anymore as Cenqua has cleanly separated
 the Clover jar from the Clover license. You only need to point
 <code>maven.clover.license.path</code> to your license file.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@171202 13f79535-47bb-0310-9956-ffa450edef68
---
 clover/plugin.jelly                           | 18 ++-------
 clover/plugin.properties                      |  5 ---
 .../testCustomCloverLicense/maven.xml         | 38 +++++++++++++++++++
 .../project.properties                        | 17 +++++++++
 .../testCustomCloverLicense/project.xml       | 25 ++++++++++++
 clover/xdocs/changes.xml                      |  7 ++++
 clover/xdocs/faq.fml                          | 14 +++----
 clover/xdocs/properties.xml                   | 13 -------
 8 files changed, 96 insertions(+), 41 deletions(-)
 create mode 100644 clover/src/plugin-test/testCustomCloverLicense/maven.xml
 create mode 100644 clover/src/plugin-test/testCustomCloverLicense/project.properties
 create mode 100644 clover/src/plugin-test/testCustomCloverLicense/project.xml

diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index ecaee0c7..8acf427a 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -35,19 +35,8 @@
   -->
   <goal name="clover:init-internal">
 
-    <!-- Create an Ant <path> id that contains the Clover jar. If the user has
-         defined the maven.clover.jar property then this path will contain his
-         version of the clover jar. Otherwise use the version defined as a 
-         dependency in this plugin's project.xml. -->
     <ant:path id="clover.classpath">
-      <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:clover')}"/>
-        </j:otherwise>
-      </j:choose>
+      <ant:pathelement path="${plugin.getDependencyPath('clover:clover')}"/>
     </ant:path>
 
     <ant:taskdef resource="clovertasks" classpathref="clover.classpath"/>
@@ -65,9 +54,10 @@
       </j:otherwise>
     </j:choose>
 
-    <!-- Allow users to override the version of the Clover jar to use  -->
+    <!-- Add the Clover jar to the CP so that it is systematically there. This is required
+         for example for running unit tests on Clovered code. -->
     <maven:addPath id="maven.dependency.classpath" refid="clover.classpath"/>
-
+    
     <ant:mkdir dir="${maven.clover.build.classes}"/>
     <ant:mkdir dir="${maven.clover.database.dir}"/>
 
diff --git a/clover/plugin.properties b/clover/plugin.properties
index 4e90f4e7..7650eba1 100644
--- a/clover/plugin.properties
+++ b/clover/plugin.properties
@@ -34,11 +34,6 @@ 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 some 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.local}/clover/jars/clover-myproject-1.2.3.jar
-
 # Location of the Clover license. Users can override this property to point to
 # their own Clover license. By default uses an eval license valid for open 
 # source projects. Set it to an empty value if you wish to use Clover's other
diff --git a/clover/src/plugin-test/testCustomCloverLicense/maven.xml b/clover/src/plugin-test/testCustomCloverLicense/maven.xml
new file mode 100644
index 00000000..c51d4e53
--- /dev/null
+++ b/clover/src/plugin-test/testCustomCloverLicense/maven.xml
@@ -0,0 +1,38 @@
+<!-- 
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project default="testPlugin"
+  xmlns:util="jelly:util"
+  xmlns:j="jelly:core"
+  xmlns:ant="jelly:ant"
+  xmlns:x="jelly:xml"
+  xmlns:maven="jelly:maven"
+  xmlns:assert="assert">
+
+  <goal name="testPlugin" prereqs="clean">
+
+  	<ant:copy tofile="${maven.build.dir}/clover-test.license"
+  	    file="${pom.getPluginContext('maven-clover-plugin').getVariable('plugin.resources')}/clover.license"/>
+  	
+  	<attainGoal name="clover:on"/>
+    <attainGoal name="clover:off"/>
+
+  	<!-- If the license is not found, the build will fail here -->
+  	
+  </goal>
+
+</project>
\ No newline at end of file
diff --git a/clover/src/plugin-test/testCustomCloverLicense/project.properties b/clover/src/plugin-test/testCustomCloverLicense/project.properties
new file mode 100644
index 00000000..915375e2
--- /dev/null
+++ b/clover/src/plugin-test/testCustomCloverLicense/project.properties
@@ -0,0 +1,17 @@
+# -------------------------------------------------------------------
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+maven.clover.license.path = ${maven.build.dir}/clover-test.license
diff --git a/clover/src/plugin-test/testCustomCloverLicense/project.xml b/clover/src/plugin-test/testCustomCloverLicense/project.xml
new file mode 100644
index 00000000..52b6e92f
--- /dev/null
+++ b/clover/src/plugin-test/testCustomCloverLicense/project.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<project>
+  <extend>${basedir}/../project.xml</extend>
+  <id>testCustomCloverLicense</id>
+  <name>testCustomCloverLicense</name>
+</project>
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index ab4d9894..f5aa0e3b 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -26,6 +26,13 @@
   </properties>
   <body>
     <release version="1.9-SNAPSHOT" date="in SVN">
+      <action dev="vmassol" type="remove">
+        Removed the <code>maven.clover.jar</code> property that was used to 
+        override the default Clover jar. This property was not working
+        (it requires Ant 1.6) and is no needed anymore as Cenqua has cleanly
+        separated the Clover jar from the Clover license. You only need to
+        point <code>maven.clover.license.path</code> to your license file.
+      </action>
       <action dev="vmassol" type="add">
         Added a quick usage guide in the documentation.
       </action>
diff --git a/clover/xdocs/faq.fml b/clover/xdocs/faq.fml
index 1c18131d..73dfda06 100644
--- a/clover/xdocs/faq.fml
+++ b/clover/xdocs/faq.fml
@@ -28,15 +28,11 @@
       </question>
       <answer>
         <p>
-          If you have a licensed clover JAR, or you want to upgrade the version used by the plugin, you will
-          need to use a jar override to force the clover plugin to use the updated JAR.
-        </p>
-        <p>eg: To use a local copy of clover-1.2.4-registered.jar, add this to project.properties:</p>
-          <source>maven.jar.override=on
-maven.jar.clover=lib/clover-1.2.4-registered.jar</source>
-        <p>eg: To use version 1.2.5 from the repository, add this to project.properties:</p>
-          <source>maven.jar.override=on
-maven.jar.clover=1.2.5</source>
+          You don't! Clover has now separated the Clover jar from it's license and thus 
+          there's now no need to provide a custom jar. However you'll still need to provide
+          your own license (unless you're using this plugin on an open source project). You
+          specify your own license using the <code>maven.clover.license.path</code> property.
+          <source>maven.clover.license.path = /some/path/to/my/clover.license</source>
       </answer>
     </faq>
 
diff --git a/clover/xdocs/properties.xml b/clover/xdocs/properties.xml
index 70a56add..786921ed 100644
--- a/clover/xdocs/properties.xml
+++ b/clover/xdocs/properties.xml
@@ -106,19 +106,6 @@
             <code>${maven.clover.build}/database/clover_coverage.db</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 some Clover jars are license-signed for a specific project so you 
-            might want to use different jars for different projects.
-          </td>
-          <td>
-            If not defined, the plugin uses a 30 day eval Clover jar which is 
-            valid for open source projects.
-          </td>
-        </tr>
         <tr>
           <td>maven.clover.license.path</td>
           <td>Yes</td>