diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java index 235680799..378f8dcea 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.sitemesh; -import com.opensymphony.module.sitemesh.HTMLPage; -import com.opensymphony.module.sitemesh.RequestConstants; +//import com.opensymphony.module.sitemesh.HTMLPage; +//import com.opensymphony.module.sitemesh.RequestConstants; import com.opensymphony.xwork2.ActionContext; import freemarker.core.InvalidReferenceException; import freemarker.template.Configuration; @@ -53,8 +53,11 @@ import java.util.Locale; *
It overrides the SiteMesh servlet to rely on the * Freemarker Manager in Struts instead of creating it's * own manager
+ * + * + * TODO: requires javax */ -public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.FreemarkerServlet { +public class FreemarkerDecoratorServlet { /*extends freemarker.ext.servlet.FreemarkerServlet { private static final Logger LOG = LogManager.getLogger(FreemarkerDecoratorServlet.class); public static final long serialVersionUID = -2440216393145762479L; @@ -226,10 +229,10 @@ public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.Freemarke * The base implementation simply returns the locale setting of the * configuration. Override this method to provide different behaviour, i.e. * to use the locale indicated in the request. - */ + protected Locale deduceLocale(String templatePath, HttpServletRequest request, HttpServletResponse response) { return config.getLocale(); - } + }*/ /** @@ -247,10 +250,10 @@ public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.Freemarke *@@ -274,7 +277,7 @@ public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.Freemarke * @param template the template that will get executed * @return true to process the template, false to suppress template processing. * @see freemarker.ext.servlet.FreemarkerServlet#preTemplateProcess(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, freemarker.template.Template, freemarker.template.TemplateModel) - */ + protected boolean preTemplateProcess(HttpServletRequest request, HttpServletResponse response, Template template, TemplateModel templateModel) throws ServletException, IOException { boolean result = super.preTemplateProcess(request, response, template, templateModel); @@ -307,19 +310,19 @@ public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.Freemarke hash.put("head", head); hash.put("base", request.getContextPath()); - /* - Factory factory = Factory.getInstance(new Config(getServletConfig())); - Decorator decorator = factory.getDecoratorMapper().getDecorator(request, htmlPage); - -> decorator.getPage() - */ + + // Factory factory = Factory.getInstance(new Config(getServletConfig())); + // Decorator decorator = factory.getDecoratorMapper().getDecorator(request, htmlPage); + // -> decorator.getPage() + return result; - } + }*/ /** * If the parameter "nocache" was set to true, generate a set of headers * that will advise the HTTP client not to cache the returned page. - */ + private void setBrowserCachingPolicy(HttpServletResponse res) { if (nocache) { // HTTP/1.1 + IE extensions @@ -329,5 +332,7 @@ public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.Freemarke // Last resort for those that ignore all of the above res.setHeader("Expires", FreemarkerManager.EXPIRATION_DATE); } - } + }*/ + + }