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

WN-5141

Browse Source 
- TODO:  TEMPARARY comment-out velocity-tools code
This commit is contained in:
jdyer1
2023-10-30 12:33:04 -05:00
committed by Lukasz Lenart
parent 54a9ef85e7
commit 0cee06f5ab
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
+10 -10
View File
@@ -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);
}
}*/
}