ww-3940 change
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f4d5305b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f4d5305b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f4d5305b Branch: refs/heads/master Commit: f4d5305b19d186c7780b3f8e0976816a15f7ec7e Parents: 8d6c3b6 8b426cf Author: Victor Sosa <victorns...@gmail.com> Authored: Wed Jan 20 18:54:22 2016 -0400 Committer: Victor Sosa <victorns...@gmail.com> Committed: Wed Jan 20 19:41:48 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/f4d5305b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java ---------------------------------------------------------------------- diff --cc plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java index e832b2f,bcbfb72..4b1b088 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java @@@ -88,14 -78,13 +88,14 @@@ public class VelocityDecoratorServlet e velocityManager.init(config.getServletContext()); // do whatever we have to do to init Velocity - setVelocityEngine(velocityManager.getVelocityEngine()); - toolboxManager = velocityManager.getToolboxManager(); + getVelocityView().setVelocityEngine(velocityManager.getVelocityEngine()); - //getVelocityView().getToolboxFactory(). toolboxManager = velocityManager.getToolboxManager(); ++ // toolboxManager = velocityManager.getToolboxManager(); + // we can get these now that velocity is initialized - defaultContentType = getVelocityProperty(CONTENT_TYPE, DEFAULT_CONTENT_TYPE); + defaultContentType = getVelocityProperty(VelocityView.CONTENT_TYPE_KEY, VelocityView.DEFAULT_CONTENT_TYPE); - String encoding = getVelocityProperty(RuntimeConstants.OUTPUT_ENCODING, DEFAULT_OUTPUT_ENCODING); + String encoding = getVelocityProperty(RuntimeConstants.OUTPUT_ENCODING, VelocityView.DEFAULT_OUTPUT_ENCODING); // For non Latin-1 encodings, ensure that the charset is // included in the Content-Type header.
