Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "WN-5141"

Browse Source 
This reverts commit 1fc70af56b.
This commit is contained in:
jdyer1
2023-11-20 14:50:04 -06:00
parent c66f2a2a9b
commit 5d19c73351
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
+2 -4
View File
@@ -27,15 +27,13 @@ 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.
*/
plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java
+3 -5
View File
@@ -36,9 +36,7 @@ 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*/ {
// TODO: Velocity-tools requires javax
public class VelocityRenderer implements Renderer {
/**
* The VelocityView object to use.
@@ -54,7 +52,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");
@@ -69,7 +67,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");