(struts) branch WW-5429-param-anno-log updated (b96cf2c07 -> ba46c18f0)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5429-param-anno-log in repository https://gitbox.apache.org/repos/asf/struts.git from b96cf2c07 WW-5429 Log parameter annotation issues at ERROR level when in DevMode add ba46c18f0 WW-5429 Make DebugUtils final and remove @author JavaDoc tag No new revisions were added by this update. Summary of changes: .../main/java/com/opensymphony/xwork2/interceptor/ValidationAware.java | 2 -- core/src/main/java/com/opensymphony/xwork2/util/DebugUtils.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
(struts) branch fix/WW-5310-fragment deleted (was 13916c8b8)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5310-fragment in repository https://gitbox.apache.org/repos/asf/struts.git was 13916c8b8 WW-5310 Fixes broken support for Fragments in tag The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch master updated (444e4d4c0 -> a8954508c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from 444e4d4c0 Merge pull request #957 from apache/fix/WW-5250-todo add 13916c8b8 WW-5310 Fixes broken support for Fragments in tag new a8954508c Merge pull request #968 from apache/fix/WW-5310-fragment The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../struts2/components/ServletUrlRenderer.java | 18 ++- .../struts2/url/StrutsQueryStringParserTest.java | 8 + .../org/apache/struts2/views/jsp/URLTagTest.java | 36 ++ 3 files changed, 55 insertions(+), 7 deletions(-)
(struts) 01/01: Merge pull request #968 from apache/fix/WW-5310-fragment
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit a8954508c662f0dac9af0c79cea41a71bb1b304c Merge: 444e4d4c0 13916c8b8 Author: Lukasz Lenart AuthorDate: Fri Jun 21 07:28:17 2024 +0200 Merge pull request #968 from apache/fix/WW-5310-fragment WW-5310 Fixes broken support for Fragments in tag .../struts2/components/ServletUrlRenderer.java | 18 ++- .../struts2/url/StrutsQueryStringParserTest.java | 8 + .../org/apache/struts2/views/jsp/URLTagTest.java | 36 ++ 3 files changed, 55 insertions(+), 7 deletions(-)
(struts) 01/01: WW-5430 Uses Freemarker native support for JakartaEE instead of manually transforming the artifacts
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5430-freemarker-jakarta
in repository https://gitbox.apache.org/repos/asf/struts.git
commit a7145d695e134e7b3191f9895bf259a95039e41a
Author: Lukasz Lenart
AuthorDate: Fri Jun 21 08:13:07 2024 +0200
WW-5430 Uses Freemarker native support for JakartaEE instead of manually
transforming the artifacts
---
apps/showcase/pom.xml | 6 --
core/pom.xml | 4 +-
.../views/freemarker/FreemarkerManager.java| 12 ++--
jakarta/freemarker-jakarta/README.md | 4 --
jakarta/freemarker-jakarta/pom.xml | 69 --
jakarta/pom.xml| 1 -
.../sitemesh/FreemarkerDecoratorServlet.java | 6 +-
.../request/freemarker/FreemarkerRequest.java | 2 +-
.../request/freemarker/FreemarkerRequestUtil.java | 6 +-
.../servlet/WebappClassTemplateLoader.java | 2 +-
pom.xml| 11
11 files changed, 16 insertions(+), 107 deletions(-)
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 877cf124a..3f4e4fcdd 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -166,11 +166,6 @@
${project.build.directory}/extraclasspath
-
-org.apache.struts
-struts2-freemarker-jakarta
-
struts2-freemarker-jakarta.jar
-
org.apache.struts
struts2-sitemesh2-jakarta
@@ -241,7 +236,6 @@
${basedir}/src/main/webapp/
-
${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
index d84b7770e..778cf2605 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -136,8 +136,8 @@
-org.apache.struts
-struts2-freemarker-jakarta
+org.freemarker
+freemarker
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 2d76cd2ca..567417174 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
@@ -28,14 +28,14 @@ import freemarker.cache.ClassTemplateLoader;
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
deleted file mode 100644
index b3bf61124..0
--- a/jakarta/freemarker-jakarta/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Struts 2 Freemarker Jakarta
-
-This uses the eclipse transformer maven plugin to make the Freemarker
dependency Jakarta EE 9+ compatible.
-
diff --git a/jakarta/freemarker-jakarta/pom.xml
b/jakarta/freemarker-jakarta/pom.xml
deleted file mode 100644
index 3bf9f5aa7..0
--- a/jakarta/freemarker-jakarta/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-4.0.0
-
-org.apache.struts
-struts2-jakarta
-7.0.0-M8-SNAPSHOT
-
-struts2-freemarker-jakarta
-jar
-Struts 2 Jakarta EE Com
(struts) branch feature/WW-5430-freemarker-jakarta created (now a7145d695)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5430-freemarker-jakarta in repository https://gitbox.apache.org/repos/asf/struts.git at a7145d695 WW-5430 Uses Freemarker native support for JakartaEE instead of manually transforming the artifacts This branch includes the following new commits: new a7145d695 WW-5430 Uses Freemarker native support for JakartaEE instead of manually transforming the artifacts The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts) 01/01: WW-5431 Marks unused constants as deprecated To be removed in Struts 7
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5431-deprecated
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 75ebbf4367aba11f4934a61527c5b6b2e821e0e9
Author: Lukasz Lenart
AuthorDate: Fri Jun 21 08:24:54 2024 +0200
WW-5431 Marks unused constants as deprecated
To be removed in Struts 7
---
.../views/freemarker/FreemarkerManager.java| 26 +-
1 file changed, 21 insertions(+), 5 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 62c7cc9ae..987306c5a 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
@@ -118,9 +118,6 @@ public class FreemarkerManager {
public static final String INITPARAM_DEBUG = "Debug";
public static final String KEY_REQUEST = "Request";
- public static final String KEY_INCLUDE = "include_page";
- public static final String KEY_REQUEST_PRIVATE =
"__FreeMarkerServlet.Request__";
- public static final String KEY_REQUEST_PARAMETERS = "RequestParameters";
public static final String KEY_SESSION = "Session";
public static final String KEY_APPLICATION = "Application";
public static final String KEY_APPLICATION_PRIVATE =
"__FreeMarkerServlet.Application__";
@@ -138,10 +135,29 @@ public class FreemarkerManager {
// for Struts
public static final String KEY_REQUEST_PARAMETERS_STRUTS = "Parameters";
-public static final String KEY_HASHMODEL_PRIVATE =
"__FreeMarkerManager.Request__";
-
public static final String EXPIRATION_DATE;
+/**
+ * @deprecated since Struts 6.5.0, do not use as it will be removed in
Struts 7.0.0
+ */
+@Deprecated
+public static final String KEY_INCLUDE = "include_page";
+/**
+ * @deprecated since Struts 6.5.0, do not use as it will be removed in
Struts 7.0.0
+ */
+@Deprecated
+public static final String KEY_REQUEST_PRIVATE =
"__FreeMarkerServlet.Request__";
+/**
+ * @deprecated since Struts 6.5.0, do not use as it will be removed in
Struts 7.0.0
+ */
+@Deprecated
+public static final String KEY_REQUEST_PARAMETERS = "RequestParameters";
+/**
+ * @deprecated since Struts 6.5.0, do not use as it will be removed in
Struts 7.0.0
+ */
+@Deprecated
+public static final String KEY_HASHMODEL_PRIVATE =
"__FreeMarkerManager.Request__";
+
/**
* Adds individual settings.
*
(struts) branch feature/WW-5431-deprecated created (now 75ebbf436)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5431-deprecated in repository https://gitbox.apache.org/repos/asf/struts.git at 75ebbf436 WW-5431 Marks unused constants as deprecated To be removed in Struts 7 This branch includes the following new commits: new 75ebbf436 WW-5431 Marks unused constants as deprecated To be removed in Struts 7 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
