Added ability for users to specify their own Clover license file by overriding the new <code>maven.clover.license.path</code> property.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115950 13f79535-47bb-0310-9956-ffa450edef68

clover/plugin.jelly

@@ -65,10 +65,12 @@
     <ant:mkdir dir="${cloverReportDirectory}"/>
 
     <!-- Add the Clover license to the classpath. -->
-    <j:invokeStatic className="java.lang.System" method="setProperty">
-      <j:arg type="java.lang.String" value="clover.license.path"/>
-      <j:arg type="java.lang.String" value="${plugin.getDependencyPath('clover:clover-30day-eval')}"/>
-    </j:invokeStatic>
+    <j:if test="${!empty(context.getVariable('maven.clover.license.path'))}">
+      <j:invokeStatic className="java.lang.System" method="setProperty">
+        <j:arg type="java.lang.String" value="clover.license.path"/>
+        <j:arg type="java.lang.String" value="${maven.clover.license.path}"/>
+      </j:invokeStatic>
+    </j:if>
 
   </goal>
 

clover/plugin.properties

@@ -35,9 +35,16 @@ maven.clover.orderBy = PcCoveredAsc
 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 
+# 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.remote}/clover/jars/clover-myproject-1.2.3.jar
+#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 a 30 day eval license valid for
+# open source projects. Set it to an empty value if you wish to use Clover's
+# other license loading mechanisms (Clover looks next to clover.jar on the 
+# filesystem and in the classpath).
+maven.clover.license.path = ${plugin.getDependencyPath('clover:clover-30day-eval')}
 
 # What are the reports that should be generated
 maven.clover.report.html=true

clover/xdocs/changes.xml

@@ -26,6 +26,11 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="add">
+        Added ability for users to specify their own Clover license
+        file by overriding the new
+        <code>maven.clover.license.path</code> property.
+      </action>
       <action dev="vmassol" type="update">
         Made the following goals public by documenting them:
         <code>clover:report</code>, <code>clover:on</code>,

clover/xdocs/properties.xml

@@ -96,6 +96,33 @@
             <code>${maven.build.clover}/database</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>
+          <td>
+            Location of the Clover license. Users can override this property to
+            point to their own Clover license. By default uses a 30 day eval 
+            license valid for open source projects. Set it to an empty value if 
+            you wish to use Clover's other license loading mechanisms (Clover 
+            looks next to clover.jar on the filesystem and in the classpath).
+          </td>
+          <td>
+            <code>${plugin.getDependencyPath('clover:clover-30day-eval')}</code>
+          </td>
+        </tr>
       </table>
     </section>
   </body>