You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/02/06 19:15:25 UTC
svn commit: r1728864 - in
/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src:
main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
site/apt/index.apt.vm
Author: hboutemy
Date: Sat Feb 6 18:15:25 2016
New Revision: 1728864
URL: http://svn.apache.org/viewvc?rev=1728864&view=rev
Log:
[DOXIASITETOOLS-94] added plexus container to Velocity context
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm
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=1728864&r1=1728863&r2=1728864&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 Sat Feb 6 18:15:25 2016
@@ -70,6 +70,7 @@ import org.apache.maven.doxia.util.XmlVa
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.ToolManager;
+import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.i18n.I18N;
@@ -116,6 +117,9 @@ public class DefaultSiteRenderer
@Requirement
private I18N i18n;
+ @Requirement
+ private PlexusContainer plexus;
+
private static final String RESOURCE_DIR = "org/apache/maven/doxia/siterenderer/resources";
private static final String DEFAULT_TEMPLATE = RESOURCE_DIR + "/default-site.vm";
@@ -524,6 +528,7 @@ public class DefaultSiteRenderer
context.put( "i18n", i18n );
+ context.put( "plexus", plexus );
return context;
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm?rev=1728864&r1=1728863&r2=1728864&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm Sat Feb 6 18:15:25 2016
@@ -96,6 +96,8 @@ Doxia Site Tools - Site Renderer
*---------------------------------+------------------------------------------------------+-------------------------------+
| <<<StringUtils>>> | {{{$plexus/util/StringUtils.html}<<<StringUtils>>>}} | |
*---------------------------------+------------------------------------------------------+-------------------------------+
+| <<<plexus>>> | {{{http://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/tree/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusContainer.java}<<<PlexusContainer>>>}} | |
+*---------------------------------+------------------------------------------------------+-------------------------------+
And there are {{{http://velocity.apache.org/tools/releases/2.0/generic.html} Velocity Generic Tools}}: