You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2007/06/14 07:01:52 UTC

svn commit: r547125 - in /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view: VelocityView.java jsp/VelocityViewTag.java

Author: nbubna
Date: Wed Jun 13 22:01:51 2007
New Revision: 547125

URL: http://svn.apache.org/viewvc?view=rev&rev=547125
Log:
Veltag was missing crucial step in getting request & session toolbox access

Modified:
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/jsp/VelocityViewTag.java

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java?view=diff&rev=547125&r1=547124&r2=547125
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java Wed Jun 13 22:01:51 2007
@@ -765,7 +765,7 @@
     }
 
 
-    protected void prepareToolboxes(HttpServletRequest request)
+    public void prepareToolboxes(HttpServletRequest request)
     {
         // only set a new toolbox if we need one
         if (toolboxFactory.hasTools(ToolboxFactory.DEFAULT_SCOPE)

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/jsp/VelocityViewTag.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/jsp/VelocityViewTag.java?view=diff&rev=547125&r1=547124&r2=547125
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/jsp/VelocityViewTag.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/jsp/VelocityViewTag.java Wed Jun 13 22:01:51 2007
@@ -21,6 +21,7 @@
 
 import java.io.StringWriter;
 import java.io.Writer;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -184,6 +185,7 @@
         ViewToolContext context =
             new JspToolContext(view.getVelocityEngine(), this.pageContext);
 
+        view.prepareToolboxes((HttpServletRequest)this.pageContext.getRequest());
         view.prepareContext(context);
 
         setVelocityView(view);