vmassol     2003/12/05 09:38:39

  Modified:    clover   plugin.jelly plugin.properties
               clover/xdocs properties.xml changes.xml
  Log:
  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.
  
  Revision  Changes    Path
  1.18      +9 -2      maven-plugins/clover/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/clover/plugin.jelly,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- plugin.jelly      5 Dec 2003 14:17:22 -0000       1.17
  +++ plugin.jelly      5 Dec 2003 17:38:39 -0000       1.18
  @@ -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>
  
  
  
  1.6       +5 -0      maven-plugins/clover/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/maven-plugins/clover/plugin.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- plugin.properties 4 Dec 2003 21:46:36 -0000       1.5
  +++ plugin.properties 5 Dec 2003 17:38:39 -0000       1.6
  @@ -13,6 +13,11 @@
   # 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
  
  
  
  1.7       +13 -0     maven-plugins/clover/xdocs/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/clover/xdocs/properties.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- properties.xml    4 Dec 2003 21:46:36 -0000       1.6
  +++ properties.xml    5 Dec 2003 17:38:39 -0000       1.7
  @@ -38,6 +38,19 @@
             </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>
             <td>
  
  
  
  1.19      +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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- changes.xml       5 Dec 2003 17:16:26 -0000       1.18
  +++ changes.xml       5 Dec 2003 17:38:39 -0000       1.19
  @@ -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 
  
  
  

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

Reply via email to