|
 |
aa86a4 |
From da397953bd73068c4ab8d219ec91e312fd3d5d55 Mon Sep 17 00:00:00 2001
|
|
|
aa86a4 |
From: Michael Simacek <msimacek@redhat.com>
|
|
|
aa86a4 |
Date: Mon, 6 Feb 2017 14:27:53 +0100
|
|
|
aa86a4 |
Subject: [PATCH 2/2] Remove dependency on velocity-tools
|
|
|
aa86a4 |
|
|
|
aa86a4 |
---
|
|
|
aa86a4 |
.../doxia/siterenderer/DefaultSiteRenderer.java | 58 +---------------------
|
|
|
aa86a4 |
1 file changed, 2 insertions(+), 56 deletions(-)
|
|
|
aa86a4 |
|
|
|
aa86a4 |
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
|
|
|
aa86a4 |
index c31688d..58058b3 100644
|
|
|
aa86a4 |
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
|
|
|
aa86a4 |
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
|
|
|
aa86a4 |
@@ -76,31 +76,11 @@ import org.apache.maven.doxia.parser.module.ParserModuleNotFoundException;
|
|
|
aa86a4 |
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
|
|
|
aa86a4 |
import org.apache.maven.doxia.util.XmlValidator;
|
|
|
aa86a4 |
import org.apache.velocity.Template;
|
|
|
aa86a4 |
+import org.apache.velocity.VelocityContext;
|
|
|
aa86a4 |
import org.apache.velocity.context.Context;
|
|
|
aa86a4 |
import org.apache.velocity.exception.ParseErrorException;
|
|
|
aa86a4 |
import org.apache.velocity.exception.ResourceNotFoundException;
|
|
|
aa86a4 |
import org.apache.velocity.exception.VelocityException;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.Scope;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.ToolManager;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.config.ConfigurationUtils;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.config.EasyFactoryConfiguration;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.config.FactoryConfiguration;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.AlternatorTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.ClassTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.ComparisonDateTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.ContextTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.ConversionTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.DisplayTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.EscapeTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.FieldTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.LinkTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.LoopTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.MathTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.NumberTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.RenderTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.ResourceTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.SortTool;
|
|
|
aa86a4 |
-import org.apache.velocity.tools.generic.XmlTool;
|
|
|
aa86a4 |
import org.codehaus.plexus.PlexusContainer;
|
|
|
aa86a4 |
import org.codehaus.plexus.component.annotations.Component;
|
|
|
aa86a4 |
import org.codehaus.plexus.component.annotations.Requirement;
|
|
|
aa86a4 |
@@ -490,41 +469,7 @@ public class DefaultSiteRenderer
|
|
|
aa86a4 |
*/
|
|
|
aa86a4 |
protected Context createToolManagedVelocityContext( SiteRenderingContext siteRenderingContext )
|
|
|
aa86a4 |
{
|
|
|
aa86a4 |
- Locale locale = siteRenderingContext.getLocale();
|
|
|
aa86a4 |
- String dateFormat = siteRenderingContext.getDecoration().getPublishDate().getFormat();
|
|
|
aa86a4 |
-
|
|
|
aa86a4 |
- EasyFactoryConfiguration config = new EasyFactoryConfiguration( false );
|
|
|
aa86a4 |
- config.property( "safeMode", Boolean.FALSE );
|
|
|
aa86a4 |
- config.toolbox( Scope.REQUEST )
|
|
|
aa86a4 |
- .tool( ContextTool.class )
|
|
|
aa86a4 |
- .tool( LinkTool.class )
|
|
|
aa86a4 |
- .tool( LoopTool.class )
|
|
|
aa86a4 |
- .tool( RenderTool.class );
|
|
|
aa86a4 |
- config.toolbox( Scope.APPLICATION ).property( "locale", locale )
|
|
|
aa86a4 |
- .tool( AlternatorTool.class )
|
|
|
aa86a4 |
- .tool( ClassTool.class )
|
|
|
aa86a4 |
- .tool( ComparisonDateTool.class ).property( "format", dateFormat )
|
|
|
aa86a4 |
- .tool( ConversionTool.class ).property( "dateFormat", dateFormat )
|
|
|
aa86a4 |
- .tool( DisplayTool.class )
|
|
|
aa86a4 |
- .tool( EscapeTool.class )
|
|
|
aa86a4 |
- .tool( FieldTool.class )
|
|
|
aa86a4 |
- .tool( MathTool.class )
|
|
|
aa86a4 |
- .tool( NumberTool.class )
|
|
|
aa86a4 |
- .tool( ResourceTool.class ).property( "bundles", new String[] { "site-renderer" } )
|
|
|
aa86a4 |
- .tool( SortTool.class )
|
|
|
aa86a4 |
- .tool( XmlTool.class );
|
|
|
aa86a4 |
-
|
|
|
aa86a4 |
- FactoryConfiguration customConfig = ConfigurationUtils.findInClasspath( TOOLS_LOCATION );
|
|
|
aa86a4 |
-
|
|
|
aa86a4 |
- if ( customConfig != null )
|
|
|
aa86a4 |
- {
|
|
|
aa86a4 |
- config.addConfiguration( customConfig );
|
|
|
aa86a4 |
- }
|
|
|
aa86a4 |
-
|
|
|
aa86a4 |
- ToolManager manager = new ToolManager( false, false );
|
|
|
aa86a4 |
- manager.configure( config );
|
|
|
aa86a4 |
-
|
|
|
aa86a4 |
- return manager.createContext();
|
|
|
aa86a4 |
+ return new VelocityContext();
|
|
|
aa86a4 |
}
|
|
|
aa86a4 |
|
|
|
aa86a4 |
/**
|
|
|
aa86a4 |
--
|
|
|
aa86a4 |
2.9.3
|
|
|
aa86a4 |
|