From 1fc70af56ba1e7f2062fc957336c8321401eed39 Mon Sep 17 00:00:00 2001 From: jdyer1 Date: Mon, 30 Oct 2023 12:26:59 -0500 Subject: [PATCH] WN-5141 - TODO: temporary comment-out velocity dependencies --- .../velocity/render/ApplicationContextJeeConfig.java | 6 ++++-- .../tiles/request/velocity/render/VelocityRenderer.java | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java index aff6c64f8..6ac3244fb 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java @@ -27,13 +27,15 @@ import jakarta.servlet.ServletContext; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.servlet.ServletUtil; -import org.apache.velocity.tools.view.JeeConfig; +// import org.apache.velocity.tools.view.JeeConfig; /** * Implements JeeConfig to use parameters set through */ -public class ApplicationContextJeeConfig implements JeeConfig { +public class ApplicationContextJeeConfig /*implements JeeConfig*/ { + // TODO: Velocity-tools requires javax + /** * The application context. */ diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java index 780a28569..14db64c31 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java @@ -36,7 +36,9 @@ import org.apache.velocity.tools.view.VelocityView; * the response. To initialize it correctly, call #setParameter(String, String) * for all the parameters that you want to set, and then call #commit(). */ -public class VelocityRenderer implements Renderer { +public class VelocityRenderer /*implements Renderer*/ { + + // TODO: Velocity-tools requires javax /** * The VelocityView object to use. @@ -52,7 +54,7 @@ public class VelocityRenderer implements Renderer { this.velocityView = velocityView; } - @Override + /* @Override public void render(String path, Request request) throws IOException { if (path == null) { throw new CannotRenderException("Cannot dispatch a null path"); @@ -67,7 +69,7 @@ public class VelocityRenderer implements Renderer { // merge the template and context into the writer velocityView.merge(template, context, request.getWriter()); - } + }*/ public boolean isRenderable(String path, Request request) { return path != null && path.startsWith("/") && path.endsWith(".vm");