You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ni...@apache.org on 2009/05/31 12:04:33 UTC
svn commit: r780399 -
/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Author: nicolas
Date: Sun May 31 10:04:33 2009
New Revision: 780399
URL: http://svn.apache.org/viewvc?rev=780399&view=rev
Log:
[MCHECKSTYLE-101] velocity get intialized even with skip=true
o Use Serviceable ServiceLocator to lookup the VelocityComponent just in time
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=780399&r1=780398&r2=780399&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java Sun May 31 10:04:33 2009
@@ -45,6 +45,9 @@
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.VelocityException;
import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.ServiceLocator;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Serviceable;
import org.codehaus.plexus.resource.ResourceManager;
import org.codehaus.plexus.resource.loader.FileResourceCreationException;
import org.codehaus.plexus.resource.loader.FileResourceLoader;
@@ -86,6 +89,7 @@
*/
public class CheckstyleReport
extends AbstractMavenReport
+ implements Serviceable
{
private static final String PLUGIN_RESOURCES = "org/apache/maven/plugin/checkstyle";
@@ -485,7 +489,7 @@
* The file encoding to use when reading the source files. If the property <code>project.build.sourceEncoding</code>
* is not set, the platform default encoding is used. <strong>Note:</strong> This parameter always overrides the
* property <code>charset</code> from Checkstyle's <code>TreeWalker</code> module.
- *
+ *
* @parameter expression="${encoding}" default-value="${project.build.sourceEncoding}"
* @since 2.2
*/
@@ -500,12 +504,25 @@
/**
* Velocity Component.
- *
- * @component role="org.codehaus.plexus.velocity.VelocityComponent"
- * @required
*/
private VelocityComponent velocityComponent;
+ /**
+ * ServiceLocator used to lookup VelocityComponent
+ * Fix for MCHECKSTYLE-101 to avoid VelocityComponent beeing initialized when skip=true
+ */
+ private ServiceLocator serviceLocator;
+
+ /**
+ * ${inheritDoc}
+ *
+ * @see org.codehaus.plexus.personality.plexus.lifecycle.phase.Serviceable#service(org.codehaus.plexus.personality.plexus.lifecycle.phase.ServiceLocator)
+ */
+ public void service( ServiceLocator locator )
+ {
+ this.serviceLocator = locator;
+ }
+
private static final File[] EMPTY_FILE_ARRAY = new File[0];
private StringOutputStream stringOutputStream;
@@ -672,6 +689,18 @@
private void generateRSS( CheckstyleResults results )
throws MavenReportException
{
+ if ( velocityComponent == null )
+ {
+ try
+ {
+ velocityComponent = (VelocityComponent) serviceLocator.lookup( VelocityComponent.ROLE );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new MavenReportException( "Failed to setup Velocity", e );
+ }
+ }
+
VelocityTemplate vtemplate = new VelocityTemplate( velocityComponent, PLUGIN_RESOURCES );
vtemplate.setLog( getLog() );