(ofbiz-framework) branch release24.09 updated: Improved: FreeMarkerViewHandler should load templates via the FreeMarkerWorker (OFBIZ-3546) (#1257)

[mridulpathak]

This is an automated email from the ASF dual-hosted git repository.

mridulpathak pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release24.09 by this push:
     new 51474b7c9b Improved: FreeMarkerViewHandler should load templates via 
the FreeMarkerWorker (OFBIZ-3546) (#1257)
51474b7c9b is described below

commit 51474b7c9b4b26b7e61c30e7506bcefb6724bea4
Author: Mridul Pathak <mridul...@gmail.com>
AuthorDate: Fri May 29 15:54:16 2026 +0530

    Improved: FreeMarkerViewHandler should load templates via the 
FreeMarkerWorker (OFBIZ-3546) (#1257)
    
    Improved: FreeMarkerViewHandler should load templates via the
    FreeMarkerWorker
    (OFBIZ-3546)
    
    Used MultiTemplateLoader to combine FlexibleTemplateLoader in
    FreemarkerWorker config with WebappTemplateLoader to allow for both
    component templates and webapp templates.
---
 .../ofbiz/webapp/ftl/FreeMarkerViewHandler.java    | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
index 680d830afc..25aee74faa 100644
--- 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
+++ 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
@@ -35,6 +35,9 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader;
 import org.apache.ofbiz.webapp.view.AbstractViewHandler;
 import org.apache.ofbiz.webapp.view.ViewHandlerException;
 
+import freemarker.cache.MultiTemplateLoader;
+import freemarker.cache.TemplateLoader;
+import freemarker.cache.WebappTemplateLoader;
 import freemarker.ext.jsp.TaglibFactory;
 import freemarker.ext.servlet.HttpRequestHashModel;
 import freemarker.ext.servlet.HttpSessionHashModel;
@@ -51,7 +54,15 @@ public class FreeMarkerViewHandler extends 
AbstractViewHandler {
     @Override
     public void init(ServletContext context) throws ViewHandlerException {
         config.setCacheStorage(new OfbizCacheStorage("unknown"));
-        config.setServletContextForTemplateLoading(context, "/");
+        TemplateLoader webappLoader = new WebappTemplateLoader(context, "/");
+        TemplateLoader defaultLoader = config.getTemplateLoader();
+        TemplateLoader[] loaders;
+        if (defaultLoader != null) {
+            loaders = new TemplateLoader[] {defaultLoader, webappLoader};
+        } else {
+            loaders = new TemplateLoader[] {webappLoader};
+        }
+        config.setTemplateLoader(new MultiTemplateLoader(loaders));
     }
 
     @Override
@@ -106,13 +117,8 @@ public class FreeMarkerViewHandler extends 
AbstractViewHandler {
 
         // process the template & flush the output
         try {
-            if (page.startsWith("component://")) {
-                FreeMarkerWorker.renderTemplate(page, context, 
response.getWriter());
-            } else {
-                // backwards compatibility
-                Template template = config.getTemplate(page);
-                FreeMarkerWorker.renderTemplate(template, context, 
response.getWriter());
-            }
+            Template template = config.getTemplate(page);
+            FreeMarkerWorker.renderTemplate(template, context, 
response.getWriter());
             response.flushBuffer();
         } catch (TemplateException te) {
             throw new ViewHandlerException("Problems processing Freemarker 
template", te);