Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1075 from apache/feature/WW-5471-deprecate-sitemesh

Browse Source 
WW-5471 Marks Sitemesh plugin as deprecated
This commit is contained in:
Lukasz Lenart
2024-10-15 16:16:44 +02:00
committed by GitHub
parent 78451db87e 49ddf6130a
commit 9f2770b2c3
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/sitemesh/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-sitemesh-plugin</artifactId>
<packaging>jar</packaging>
<name>Struts 2 Sitemesh Plugin</name>
<name>DEPRECATED: Struts 2 Sitemesh Plugin</name>
<dependencies>
<dependency>
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java
+4
View File
@@ -53,7 +53,10 @@ import java.util.Locale;
* <p>It overrides the SiteMesh servlet to rely on the
* Freemarker Manager in Struts instead of creating it's
* own manager</p>
*
* @deprecated Sitemesh 2 based plugin is not supported anymore
*/
@Deprecated
public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.FreemarkerServlet {
private static final Logger LOG = LogManager.getLogger(FreemarkerDecoratorServlet.class);
@@ -69,6 +72,7 @@ public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.Freemarke
private boolean noCharsetInContentType;
public void init() throws ServletException {
LOG.warn("This plugin is deprecated. Please migrate to a plugin which bases on Sitemesh 3!");
try {
Dispatcher dispatcher = Dispatcher.getInstance(getServletContext());
if (dispatcher == null) {
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
+4
View File
@@ -53,7 +53,10 @@ import java.io.StringWriter;
* <p>It overrides the SiteMesh servlet to rely on the
* Velocity Manager in Struts instead of creating it's
* own manager</p>
*
* @deprecated Sitemesh 2 based plugin is not supported anymore
*/
@Deprecated
public class VelocityDecoratorServlet extends VelocityViewServlet {
private static final Logger LOG = LogManager.getLogger(VelocityDecoratorServlet.class);
@@ -76,6 +79,7 @@ public class VelocityDecoratorServlet extends VelocityViewServlet {
* @param config servlet configuration
*/
public void init(ServletConfig config) throws ServletException {
LOG.warn("This plugin is deprecated. Please migrate to a plugin which bases on Sitemesh 3!");
super.init(config);
Dispatcher dispatcher = Dispatcher.getInstance(getServletContext());
if (dispatcher == null) {