From 71c2fe0ef9dc5bf8adb5b42e0fea110be3fa6efe Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Mon, 20 Nov 2023 11:55:16 -0600
Subject: [PATCH] Revert "WN-5141"

This reverts commit d5e766e43a14b6d4fcebd11fc7411c111e003fa6.
---
 .../sitemesh/VelocityDecoratorServlet.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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 efaf08219..56af9c61a 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
@@ -19,8 +19,8 @@
 package org.apache.struts2.sitemesh;
 
 
-//import com.opensymphony.module.sitemesh.*;
-//import com.opensymphony.module.sitemesh.util.OutputConverter;
+import com.opensymphony.module.sitemesh.*;
+import com.opensymphony.module.sitemesh.util.OutputConverter;
 import com.opensymphony.xwork2.ActionContext;
 
 import org.apache.logging.log4j.LogManager;
@@ -51,7 +51,7 @@ import java.io.StringWriter;
  * Velocity Manager in Struts instead of creating it's
  * own manager</p>
  */
-public class VelocityDecoratorServlet { /*extends VelocityViewServlet {
+public class VelocityDecoratorServlet extends VelocityViewServlet {
 
     private static final Logger LOG = LogManager.getLogger(VelocityDecoratorServlet.class);
             
@@ -59,7 +59,7 @@ public class VelocityDecoratorServlet { /*extends VelocityViewServlet {
     
     protected VelocityManager velocityManager;
     protected String defaultContentType;
-*/
+
     /**
      * <p>Initializes servlet, toolbox and Velocity template engine.
      * Called by the servlet container on loading.</p>
@@ -71,7 +71,7 @@ public class VelocityDecoratorServlet { /*extends VelocityViewServlet {
      * servlet.</p>
      *
      * @param config servlet configuration
-     
+     */
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
         Dispatcher dispatcher = Dispatcher.getInstance(getServletContext());
@@ -151,14 +151,14 @@ public class VelocityDecoratorServlet { /*extends VelocityViewServlet {
     private DecoratorMapper getDecoratorMapper() {
         Factory factory = Factory.getInstance(new Config(getServletConfig()));
         return factory.getDecoratorMapper();
-    }*/
+    }
 
     /**
      * <p>Creates and returns an initialized Velocity context.</p>
      *
      * @param request  servlet request from client
      * @param response servlet reponse to client
-     
+     */
     protected Context createContext(HttpServletRequest request, HttpServletResponse response) {
         Context context = (Context) request.getAttribute(VelocityManager.KEY_VELOCITY_STRUTS_CONTEXT);
         if (context == null) {
@@ -166,7 +166,7 @@ public class VelocityDecoratorServlet { /*extends VelocityViewServlet {
             context = velocityManager.createContext(ctx.getValueStack(), request, response);
         }
         return context;
-    }*/
+    }
 
     /**
      * <p>
@@ -185,9 +185,9 @@ public class VelocityDecoratorServlet { /*extends VelocityViewServlet {
      *
      * @param request  servlet request from client
      * @param response servlet reponse to client
-     
+     */
     protected void setContentType(HttpServletRequest request, HttpServletResponse response) {
         response.setContentType(defaultContentType);
-    }*/
+    }
 
 }