You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/03/06 21:29:30 UTC

svn commit: r1733840 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main: java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java resources/META-INF/

Author: michaelo
Date: Sun Mar  6 20:29:30 2016
New Revision: 1733840

URL: http://svn.apache.org/viewvc?rev=1733840&view=rev
Log:
[DOXIASITETOOLS-161] Remove custom components.xml because it dupliates the default config in Plexus Velocity 1.2

Removed:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/
Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1733840&r1=1733839&r2=1733840&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Sun Mar  6 20:29:30 2016
@@ -110,7 +110,6 @@ import org.codehaus.plexus.util.ReaderFa
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.WriterFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.codehaus.plexus.velocity.SiteResourceLoader;
 import org.codehaus.plexus.velocity.VelocityComponent;
 
 /**
@@ -130,8 +129,7 @@ public class DefaultSiteRenderer
     // Requirements
     // ----------------------------------------------------------------------
 
-    @Requirement( hint = "doxia-site-renderer" ) // DOXIA-147: dedicated component configuration hand-written
-                                                 // in component.xml
+    @Requirement
     private VelocityComponent velocity;
 
     @Requirement
@@ -368,8 +366,6 @@ public class DefaultSiteRenderer
                 getLogger().debug( "Processing Velocity for " + renderingContext.getInputName() );
                 try
                 {
-                    SiteResourceLoader.setResource( resource );
-
                     Context vc = createDocumentVelocityContext( renderingContext, siteContext );
 
                     StringWriter sw = new StringWriter();