diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 0c3d1a35a..11db635f4 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -29,7 +29,7 @@ struts2-sitemesh-plugin jar - Struts 2 Sitemesh Plugin + DEPRECATED: Struts 2 Sitemesh Plugin 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 b6bd1ac74..a63b7c0fa 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 @@ -53,7 +53,10 @@ import java.util.Locale; *

It overrides the SiteMesh servlet to rely on the * Freemarker Manager in Struts instead of creating it's * own manager

+ * + * @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) { diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java index b2079c2f2..32f202913 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java @@ -53,7 +53,10 @@ import java.io.StringWriter; *

It overrides the SiteMesh servlet to rely on the * Velocity Manager in Struts instead of creating it's * own manager

+ * + * @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) {