Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WW-5471 Marks Sitemesh plugin as deprecated #1075

Merged
merged 1 commit into from
Oct 15, 2024
Merged

WW-5471 Marks Sitemesh plugin as deprecated #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/sitemesh/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@
* <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);
Expand All @@ -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) {
Expand Down
4 changes: 4 additions & 0 deletions plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@
* <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);
Expand All @@ -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) {
Expand Down