Merge pull request #970 from apache/feature/WW-5430-freemarker-jakarta

WW-5430 Uses Freemarker native support for JakartaEE instead of manually transforming the artifacts
apache · Jun 24, 2024 · 6cebeac · 6cebeac
2 parents 28a6867 + a7145d6
commit 6cebeac
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 107 deletions.
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
@@ -166,11 +166,6 @@
                   <configuration>
                     <outputDirectory>${project.build.directory}/extraclasspath</outputDirectory>
                     <artifactItems>
-                      <artifactItem>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-freemarker-jakarta</artifactId>
-                        <destFileName>struts2-freemarker-jakarta.jar</destFileName>
-                      </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.struts</groupId>
                         <artifactId>struts2-sitemesh2-jakarta</artifactId>
@@ -241,7 +236,6 @@
                     <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
                     <webApp>
                       <extraClasspath>
-                        ${project.build.directory}/extraclasspath/struts2-freemarker-jakarta.jar,
                         ${project.build.directory}/extraclasspath/struts2-sitemesh2-jakarta.jar,
                         ${project.build.directory}/extraclasspath/struts2-velocity-tools-view-jakarta.jar,
                         ${project.build.directory}/extraclasspath/struts2-velocity-tools-jsp-jakarta

diff --git a/core/pom.xml b/core/pom.xml
@@ -136,8 +136,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-freemarker-jakarta</artifactId>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
         </dependency>
 
         <dependency>

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
@@ -28,14 +28,14 @@
 import freemarker.cache.FileTemplateLoader;
 import freemarker.cache.MultiTemplateLoader;
 import freemarker.cache.TemplateLoader;
-import freemarker.cache.WebappTemplateLoader;
+import freemarker.ext.jakarta.servlet.WebappTemplateLoader;
 import freemarker.core.HTMLOutputFormat;
 import freemarker.core.TemplateClassResolver;
-import freemarker.ext.jsp.TaglibFactory;
-import freemarker.ext.servlet.HttpRequestHashModel;
-import freemarker.ext.servlet.HttpRequestParametersHashModel;
-import freemarker.ext.servlet.HttpSessionHashModel;
-import freemarker.ext.servlet.ServletContextHashModel;
+import freemarker.ext.jakarta.jsp.TaglibFactory;
+import freemarker.ext.jakarta.servlet.HttpRequestHashModel;
+import freemarker.ext.jakarta.servlet.HttpRequestParametersHashModel;
+import freemarker.ext.jakarta.servlet.HttpSessionHashModel;
+import freemarker.ext.jakarta.servlet.ServletContextHashModel;
 import freemarker.template.Configuration;
 import freemarker.template.ObjectWrapper;
 import freemarker.template.TemplateException;

diff --git a/jakarta/freemarker-jakarta/README.md b/jakarta/freemarker-jakarta/README.md
diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml
diff --git a/jakarta/pom.xml b/jakarta/pom.xml
@@ -37,7 +37,6 @@
     </properties>
 
     <modules>
-        <module>freemarker-jakarta</module>
         <module>sitemesh2-jakarta</module>
         <module>velocity-tools-view-jakarta</module>
         <module>velocity-tools-jsp-jakarta</module>

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
@@ -22,6 +22,7 @@
 import com.opensymphony.module.sitemesh.RequestConstants;
 import com.opensymphony.xwork2.ActionContext;
 import freemarker.core.InvalidReferenceException;
+import freemarker.ext.jakarta.servlet.FreemarkerServlet;
 import freemarker.template.Configuration;
 import freemarker.template.ObjectWrapper;
 import freemarker.template.SimpleHash;
@@ -54,10 +55,9 @@
  * Freemarker Manager in Struts instead of creating it's
  * own manager</p>
  */
-public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.FreemarkerServlet {
+public class FreemarkerDecoratorServlet extends FreemarkerServlet {
 
     private static final Logger LOG = LogManager.getLogger(FreemarkerDecoratorServlet.class);
-    public static final long serialVersionUID = -2440216393145762479L;
 
     protected FreemarkerManager freemarkerManager;
     protected String templatePath;
@@ -273,7 +273,7 @@ protected freemarker.template.Configuration createConfiguration() {
      * @param response the actual HTTP response
      * @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)
+     * @see 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);

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
@@ -20,7 +20,7 @@
 package org.apache.tiles.request.freemarker;
 
 import freemarker.core.Environment;
-import freemarker.ext.servlet.HttpRequestHashModel;
+import freemarker.ext.jakarta.servlet.HttpRequestHashModel;
 import org.apache.tiles.request.AbstractViewRequest;
 import org.apache.tiles.request.ApplicationContext;
 import org.apache.tiles.request.DispatchRequest;

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
@@ -19,9 +19,9 @@
 package org.apache.tiles.request.freemarker;
 
 import freemarker.core.Environment;
-import freemarker.ext.servlet.FreemarkerServlet;
-import freemarker.ext.servlet.HttpRequestHashModel;
-import freemarker.ext.servlet.ServletContextHashModel;
+import freemarker.ext.jakarta.servlet.FreemarkerServlet;
+import freemarker.ext.jakarta.servlet.HttpRequestHashModel;
+import freemarker.ext.jakarta.servlet.ServletContextHashModel;
 import freemarker.template.TemplateModelException;
 import org.apache.tiles.request.ApplicationContext;
 import org.apache.tiles.request.servlet.ServletUtil;

diff --git a/.../src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java b/.../src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java
@@ -21,7 +21,7 @@
 
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.TemplateLoader;
-import freemarker.cache.WebappTemplateLoader;
+import freemarker.ext.jakarta.servlet.WebappTemplateLoader;
 
 import jakarta.servlet.ServletContext;
 import java.io.IOException;

diff --git a/pom.xml b/pom.xml
@@ -506,19 +506,8 @@
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts-annotations</artifactId>
                 <version>1.0.8</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.freemarker</groupId>
-                        <artifactId>freemarker</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-freemarker-jakarta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-core</artifactId>