You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vm...@apache.org on 2007/03/24 19:18:40 UTC
svn commit: r522080 - in /maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover: CloverReportMojo.java internal/AbstractCloverMojo.java

Author: vmassol
Date: Sat Mar 24 11:18:39 2007
New Revision: 522080

URL: http://svn.apache.org/viewvc?view=rev&rev=522080
Log:
* MCLOVER-66: The report goal doesn't support a user-provided Clover license

Fixed bug introduced by previous commit which prevented the default license to be found.

Modified:
    maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java
    maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/internal/AbstractCloverMojo.java

Modified: maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java?view=diff&rev=522080&r1=522079&r2=522080
==============================================================================
--- maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java (original)
+++ maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java Sat Mar 24 11:18:39 2007
@@ -185,7 +185,8 @@
         // Register the Clover license
         try
         {
-            AbstractCloverMojo.registerLicenseFile(this.resourceManager, this.licenseLocation, getLog());
+            AbstractCloverMojo.registerLicenseFile(this.resourceManager, this.licenseLocation, getLog(),
+                this.getClass().getClassLoader());
         }
         catch (MojoExecutionException e)
         {

Modified: maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/internal/AbstractCloverMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/internal/AbstractCloverMojo.java?view=diff&rev=522080&r1=522079&r2=522080
==============================================================================
--- maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/internal/AbstractCloverMojo.java (original)
+++ maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/internal/AbstractCloverMojo.java Sat Mar 24 11:18:39 2007
@@ -131,7 +131,8 @@
 
     protected void registerLicenseFile() throws MojoExecutionException
     {
-        AbstractCloverMojo.registerLicenseFile(getResourceManager(), this.licenseLocation, getLog());
+        AbstractCloverMojo.registerLicenseFile(getResourceManager(), this.licenseLocation, getLog(),
+            this.getClass().getClassLoader());
     }
 
     /**
@@ -146,8 +147,8 @@
      *
      * @throws MojoExecutionException when the license file cannot be found
      */
-    public static void registerLicenseFile(ResourceManager resourceManager, String licenseLocation, Log logger)
-        throws MojoExecutionException
+    public static void registerLicenseFile(ResourceManager resourceManager, String licenseLocation, Log logger,
+        ClassLoader classloader) throws MojoExecutionException
     {
         String license;
 
@@ -165,7 +166,7 @@
         }
         else
         {
-            license = Log.class.getResource("/clover.license").getFile();
+            license = classloader.getResource("/clover.license").getFile();
         }
 
         logger.debug("Using license file [" + license + "]");