vmassol 2004/08/11 02:54:30
Modified: clover plugin.jelly plugin.properties
clover/xdocs properties.xml changes.xml
Log:
Added ability for users to specify their own Clover license file by overriding the
new <code>maven.clover.license.path</code> property.
Revision Changes Path
1.36 +6 -4 maven-plugins/clover/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/clover/plugin.jelly,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- plugin.jelly 18 Jul 2004 11:26:38 -0000 1.35
+++ plugin.jelly 11 Aug 2004 09:54:29 -0000 1.36
@@ -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>
1.9 +9 -2 maven-plugins/clover/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/clover/plugin.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.properties 2 Apr 2004 21:12:01 -0000 1.8
+++ plugin.properties 11 Aug 2004 09:54:29 -0000 1.9
@@ -35,9 +35,16 @@
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
1.11 +27 -0 maven-plugins/clover/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/clover/xdocs/properties.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- properties.xml 12 Jun 2004 05:36:18 -0000 1.10
+++ properties.xml 11 Aug 2004 09:54:29 -0000 1.11
@@ -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>
1.37 +5 -0 maven-plugins/clover/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/clover/xdocs/changes.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- changes.xml 16 Jul 2004 18:36:26 -0000 1.36
+++ changes.xml 11 Aug 2004 09:54:29 -0000 1.37
@@ -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>,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
