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/03/05 17:49:04 UTC

svn commit: r514727 - in /velocity/tools/branches/2.x: src/main/java/org/apache/velocity/tools/view/context/ChainedContext.java xdocs/generic/EscapeTool.xml

Author: nbubna
Date: Mon Mar  5 08:49:03 2007
New Revision: 514727

URL: http://svn.apache.org/viewvc?view=rev&rev=514727
Log:
merge from trunk r514723,514724

Modified:
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/context/ChainedContext.java
    velocity/tools/branches/2.x/xdocs/generic/EscapeTool.xml

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/context/ChainedContext.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/context/ChainedContext.java?view=diff&rev=514727&r1=514726&r2=514727
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/context/ChainedContext.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/context/ChainedContext.java Mon Mar  5 08:49:03 2007
@@ -83,18 +83,6 @@
     private VelocityEngine velocity;
 
 
-    /**
-     * @deprecated This will be removed after VelocityTools 1.3
-     */
-    public ChainedContext(Context ctx,
-                          HttpServletRequest request,
-                          HttpServletResponse response,
-                          ServletContext application)
-    {
-        this(ctx, null, request, response, application);
-    }
-
-
     public ChainedContext(VelocityEngine velocity,
                           HttpServletRequest request,
                           HttpServletResponse response,

Modified: velocity/tools/branches/2.x/xdocs/generic/EscapeTool.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/xdocs/generic/EscapeTool.xml?view=diff&rev=514727&r1=514726&r2=514727
==============================================================================
--- velocity/tools/branches/2.x/xdocs/generic/EscapeTool.xml (original)
+++ velocity/tools/branches/2.x/xdocs/generic/EscapeTool.xml Mon Mar  5 08:49:03 2007
@@ -173,13 +173,13 @@
     </section>
 
     <section>
-        <method name="http()">
+        <method name="url()">
             <abstract>
                 Escapes the characters in a <code>String</code> to be suitable to use as an HTTP parameter value.
             </abstract>
 
             <signature>
-                String http(Object string)
+                String url(Object string)
             </signature>
 
             <parameters>
@@ -196,10 +196,10 @@
                 <p>Delegates the process to
                 <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/URLEncoder.html">java.net.URLEncoder#encodeURL(String,"UTF-8")</a>.
                 </p>
-                <p>If <code>$http</code> had the following value:</p>
+                <p>If <code>$url</code> had the following value:</p>
                 <sourcecode>Hello here &amp; there</sourcecode>
                 <p>then the following Velocity script:</p>
-                <sourcecode>$esc.http($http)</sourcecode>
+                <sourcecode>$esc.url($url)</sourcecode>
 
                 <p>produces this output:</p>
                 <sourcecode>hello+here+%26+there</sourcecode>