|
 |
5924ab |
From fee413e27bf8d8c85a7e03ba6f92621ad6455cab Mon Sep 17 00:00:00 2001
|
|
|
5924ab |
From: Michal Srb <msrb@redhat.com>
|
|
|
5924ab |
Date: Mon, 29 Apr 2013 11:02:31 +0200
|
|
|
5924ab |
Subject: [PATCH] Remove dependency on velocity-tools
|
|
|
5924ab |
|
|
|
5924ab |
---
|
|
|
5924ab |
.../org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 5 ++---
|
|
|
5924ab |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
5924ab |
|
|
|
5924ab |
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
|
|
|
5924ab |
index d57d308..a8bb759 100644
|
|
|
5924ab |
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
|
|
|
5924ab |
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
|
|
|
5924ab |
@@ -70,8 +70,8 @@ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
|
|
|
5924ab |
import org.apache.maven.doxia.util.XmlValidator;
|
|
|
5924ab |
|
|
|
5924ab |
import org.apache.velocity.Template;
|
|
|
5924ab |
+import org.apache.velocity.VelocityContext;
|
|
|
5924ab |
import org.apache.velocity.context.Context;
|
|
|
5924ab |
-import org.apache.velocity.tools.ToolManager;
|
|
|
5924ab |
|
|
|
5924ab |
import org.codehaus.plexus.component.annotations.Component;
|
|
|
5924ab |
import org.codehaus.plexus.component.annotations.Requirement;
|
|
|
5924ab |
@@ -432,8 +432,7 @@ public class DefaultSiteRenderer
|
|
|
5924ab |
|
|
|
5924ab |
private Context createVelocityContext( SiteRendererSink sink, SiteRenderingContext siteRenderingContext )
|
|
|
5924ab |
{
|
|
|
5924ab |
- ToolManager toolManager = new ToolManager( true );
|
|
|
5924ab |
- Context context = toolManager.createContext();
|
|
|
5924ab |
+ Context context = new VelocityContext();
|
|
|
5924ab |
|
|
|
5924ab |
// ----------------------------------------------------------------------
|
|
|
5924ab |
// Data objects
|
|
|
5924ab |
--
|
|
|
5924ab |
1.8.1.4
|
|
|
5924ab |
|