From ec6c96e16c60f307ebd7a28d9df8642dd228b2eb Mon Sep 17 00:00:00 2001 From: jdyer1 Date: Mon, 13 Nov 2023 14:56:15 -0600 Subject: [PATCH] Revert "WN-5141" This reverts commit b8b9f8aa372adfdbbc72c3d71ffa204a93288fc0. --- .../struts2/views/freemarker/FreemarkerManager.java | 13 ++++--------- .../struts2/osgi/BundleFreemarkerManager.java | 7 ++----- .../tiles/request/freemarker/FreemarkerRequest.java | 8 ++------ .../request/freemarker/FreemarkerRequestUtil.java | 8 ++------ .../servlet/WebappClassTemplateLoader.java | 5 +---- 5 files changed, 11 insertions(+), 30 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java index 5684df6ff..2d76cd2ca 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java @@ -371,9 +371,7 @@ public class FreemarkerManager { protected ScopesHashModel buildScopesHashModel(ServletContext servletContext, HttpServletRequest request, HttpServletResponse response, ObjectWrapper wrapper, ValueStack stack) { ScopesHashModel model = new ScopesHashModel(wrapper, servletContext, request, stack); - - // TODO: HashModel's require javax -/* + // Create hash model wrapper for servlet context (the application). We need one thread, once per servlet context synchronized (servletContext) { ServletContextHashModel servletContextModel = (ServletContextHashModel) servletContext.getAttribute(ATTR_APPLICATION_MODEL); @@ -421,7 +419,7 @@ public class FreemarkerManager { } model.put(ATTR_REQUEST_PARAMETERS_MODEL, reqParametersModel); model.put(KEY_REQUEST_PARAMETERS_STRUTS,reqParametersModel); -*/ + return model; } @@ -461,17 +459,14 @@ public class FreemarkerManager { // presume that most apps will require the class and webapp template loader // if people wish to - - //TODO: WebappTemplateLoader requires javax - return templatePathLoader != null ? new MultiTemplateLoader(new TemplateLoader[]{ templatePathLoader, - // new WebappTemplateLoader(servletContext), + new WebappTemplateLoader(servletContext), new StrutsClassTemplateLoader() }) : new MultiTemplateLoader(new TemplateLoader[]{ - //new WebappTemplateLoader(servletContext), + new WebappTemplateLoader(servletContext), new StrutsClassTemplateLoader() }); } diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java index 72096b7bd..614cf2401 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java @@ -66,18 +66,15 @@ public class BundleFreemarkerManager extends FreemarkerManager { // presume that most apps will require the class and webapp template loader // if people wish to - - //TODO: WebAppTemplateLoader requires javax - return templatePathLoader != null ? new MultiTemplateLoader(new TemplateLoader[]{ templatePathLoader, - //new WebappTemplateLoader(servletContext), + new WebappTemplateLoader(servletContext), new StrutsClassTemplateLoader(), new FreeMarkerBundleResourceLoader() }) : new MultiTemplateLoader(new TemplateLoader[]{ - //new WebappTemplateLoader(servletContext), + new WebappTemplateLoader(servletContext), new StrutsClassTemplateLoader(), new FreeMarkerBundleResourceLoader() }); diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java index dfe99208b..fdb57458a 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java @@ -65,12 +65,8 @@ public class FreemarkerRequest extends AbstractViewRequest { */ public static FreemarkerRequest createServletFreemarkerRequest(ApplicationContext applicationContext, Environment env) { HttpRequestHashModel requestModel = FreemarkerRequestUtil.getRequestHashModel(env); - - //TODO: requires javax - - HttpServletRequest request = null; //requestModel.getRequest(); - HttpServletResponse response = null; //requestModel.getResponse(); - + HttpServletRequest request = requestModel.getRequest(); + HttpServletResponse response = requestModel.getResponse(); DispatchRequest enclosedRequest = new ServletRequest(applicationContext, request, response); return new FreemarkerRequest(enclosedRequest, env); } diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java index acc7d7a64..6c43f231e 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java @@ -74,13 +74,9 @@ public final class FreemarkerRequestUtil { * @return The */ public static ApplicationContext getApplicationContext(Environment env) { - return null; - - // TODO: requies javax - - /* return ServletUtil.getApplicationContext( + return ServletUtil.getApplicationContext( getServletContextHashModel(env).getServlet().getServletContext() - );*/ + ); } } diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java index 343443108..f3bbbb881 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java @@ -50,10 +50,7 @@ public class WebappClassTemplateLoader implements TemplateLoader { * @param servletContext The servlet context. */ public WebappClassTemplateLoader(ServletContext servletContext) { - - // TODO: requires javax - - webappTemplateLoader = null; //new WebappTemplateLoader(servletContext); + webappTemplateLoader = new WebappTemplateLoader(servletContext); classTemplateLoader = new ClassTemplateLoader(getClass(), "/"); }