velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbris...@apache.org
Subject svn commit: r1833909 [2/2] - in /velocity/tools/trunk: ./ velocity-tools-generic/src/main/java/org/apache/velocity/tools/ velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ velocity-tools-generic/src/main/java/org/apache/velocity/to...
Date Wed, 20 Jun 2018 12:28:20 GMT
Modified: velocity/tools/trunk/velocity-tools-view-jsp/pom.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view-jsp/pom.xml?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view-jsp/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-view-jsp/pom.xml Wed Jun 20 12:28:19 2018
@@ -45,19 +45,25 @@
   	<dependency>
   		<groupId>javax.servlet.jsp</groupId>
   		<artifactId>jsp-api</artifactId>
-  		<version>2.1</version>
+  		<version>2.2</version>
+  		<scope>provided</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>javax.el</groupId>
+  		<artifactId>el-api</artifactId>
+  		<version>2.2</version>
   		<scope>provided</scope>
   	</dependency>
   	<dependency>
   		<groupId>junit</groupId>
   		<artifactId>junit</artifactId>
-  		<version>4.8.2</version>
+  		<version>${junit.version}</version>
   		<scope>test</scope>
   	</dependency>
   	<dependency>
   		<groupId>org.easymock</groupId>
   		<artifactId>easymock</artifactId>
-  		<version>3.4</version>
+  		<version>3.6</version>
   		<scope>test</scope>
   	</dependency>
   </dependencies>

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
Wed Jun 20 12:28:19 2018
@@ -94,21 +94,21 @@ import org.apache.velocity.tools.config.
  *   #end
  * </pre>
  *
- * The output of this might look like:<br><br>
- *   <form method="get" action="">
- *    <input type="text" value="foo">
- *    <input type="submit" value="Find">
- *   </form>
- *   Showing 1-5 of 8<br>
- *   1. foo<br>
- *   2. bar<br>
- *   3. blah<br>
- *   4. woogie<br>
- *   5. baz<br><br>
- *   <b>1</b> <a href="">2</a> <a href="">Next</a>
- * </p>
- * <p>
- * <b>Example tools.xml configuration:</b>
+ * <p>The output of this might look like:</p>
+ * <pre>
+ *   &lt;form method="get" action=""&gt;
+ *    &lt;input type="text" value="foo"&gt;
+ *    &lt;input type="submit" value="Find"&gt;
+ *   &lt;/form&gt;
+ *   Showing 1-5 of 8&lt;br&gt;
+ *   1. foo&lt;br&gt;
+ *   2. bar&lt;br&gt;
+ *   3. blah&lt;br&gt;
+ *   4. woogie&lt;br&gt;
+ *   5. baz&lt;br&gt;&lt;br&gt;
+ *   &lt;b&gt;1&lt;/b&gt; &lt;a href=""&gt;2&lt;/a&gt; &lt;a
href=""&gt;Next&lt;/a&gt;
+ * </pre>
+ * <p>Example tools.xml configuration:</p>
  * <pre>
  * &lt;tools&gt;
  *   &lt;toolbox scope="request"&gt;
@@ -116,7 +116,6 @@ import org.apache.velocity.tools.config.
  *   &lt;/toolbox&gt;
  * &lt;/tools&gt;
  * </pre>
- * </p>
  *
  * @author Nathan Bubna
  * @since VelocityTools 2.0

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
Wed Jun 20 12:28:19 2018
@@ -57,18 +57,16 @@ import javax.servlet.http.HttpServletReq
  * matching language, the tools defaut locale (or the first value of languagesFilter) is
returned.
  * Their value is guarantied to belong to the set provided in languagesFilter, if any.</p>
  *
- * <p>
- *     Notes on implementation:
- *     <ul>
- *         <li>The parsing algorithm is mainly empirical. Used rules are rather generic,
so shouldn't need recent updates to be accurate, but accuracy remains far from guaranteed
for new devices.</li>
- *         <li>Parsing should be fast, as the parser only uses a single regex iteration
on the user agent string.</li>
- *         <li>Game consoles, e-readers, etc... are for now classified as <i>mobile</i>
devices (but can sometimes be identified by their operating system).</li>
- *         <li>Needless to say, the frontier between different device types can be
very thin...</li>
- *     </ul>
- * </p>
+ * <p>Notes on implementation:</p>
+ * <ul>
+ *     <li>The parsing algorithm is mainly empirical. Used rules are rather generic,
so shouldn't need recent updates to be accurate, but accuracy remains far from guaranteed
for new devices.</li>
+ *     <li>Parsing should be fast, as the parser only uses a single regex iteration
on the user agent string.</li>
+ *     <li>Game consoles, e-readers, etc... are for now classified as <i>mobile</i>
devices (but can sometimes be identified by their operating system).</li>
+ *     <li>Needless to say, the frontier between different device types can be very
thin...</li>
+ * </ul>
  *
  * <p>Thanks to Lee Semel (lee@semel.net), the author of the HTTP::BrowserDetect Perl
module.</p>
- * <p>See also:
+ * <p>See also:</p>
  * <ul>
  *   <li>http://www.zytrax.com/tech/web/browser_ids.htm</li>
  *   <li>http://en.wikipedia.org/wiki/User_agent</li>
@@ -81,14 +79,11 @@ import javax.servlet.http.HttpServletReq
  *   <li>http://www.webapps-online.com/online-tools/user-agent-strings</li>
  *   <li>https://whichbrowser.net/data/</li>
  * </ul>
- * </p>
- * <p>
- *     TODO:
- *     <ul>
- *         <li>parse X-Wap-Profile header if present</li>
- *         <li>parse X-Requested-With header if present</li>
- *     </ul>
- * </p>
+ * <p>TODO:</p>
+ * <ul>
+ *     <li>parse X-Wap-Profile header if present</li>
+ *     <li>parse X-Requested-With header if present</li>
+ * </ul>
  *
  * @author <a href="mailto:claude@renegat.net">Claude Brisson</a>
  * @since VelocityTools 2.0
@@ -244,7 +239,7 @@ public class BrowserTool extends Browser
      *   Please note that the result may be null.
      * </p>
      * @return the IP address as a string
-     * @Since VelocityTools 3.0
+     * @since VelocityTools 3.0
      */
     public String getIPAddress()
     {
@@ -254,7 +249,7 @@ public class BrowserTool extends Browser
     /* device type */
 
     /**
-     * @Since VelocityTools 3.0
+     * @since VelocityTools 3.0
      */
     public String getDevice()
     {
@@ -267,7 +262,7 @@ public class BrowserTool extends Browser
     }
 
     /**
-     * @Since VelocityTools 3.0
+     * @since VelocityTools 3.0
      */
     public boolean isTablet()
     {
@@ -275,7 +270,7 @@ public class BrowserTool extends Browser
     }
 
     /**
-     * @Since VelocityTools 3.0
+     * @since VelocityTools 3.0
      */
     public boolean isMobile()
     {
@@ -283,7 +278,7 @@ public class BrowserTool extends Browser
     }
 
     /**
-     * @Since VelocityTools 3.0
+     * @since VelocityTools 3.0
      */
     public boolean isDesktop()
     {
@@ -291,7 +286,7 @@ public class BrowserTool extends Browser
     }
 
     /**
-     * @Since VelocityTools 3.0
+     * @since VelocityTools 3.0
      */
     public boolean isTV()
     {
@@ -299,7 +294,7 @@ public class BrowserTool extends Browser
     }
 
     /**
-     * @Since VelocityTools 3.0
+     * @since VelocityTools 3.0
      */
     public UAEntity getBrowser()
     {
@@ -307,7 +302,7 @@ public class BrowserTool extends Browser
     }
 
     /**
-     * @Since VelocityTools 3.0
+     * @since VelocityTools 3.0
      */
     public UAEntity getRenderingEngine()
     {
@@ -315,7 +310,7 @@ public class BrowserTool extends Browser
     }
 
     /**
-     * @Since VelocityTools 3.0
+     * @since VelocityTools 3.0
      */
     public UAEntity getOperatingSystem()
     {

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java
Wed Jun 20 12:28:19 2018
@@ -36,18 +36,19 @@ import org.apache.velocity.tools.Scope;
 
 /**
  * <p>View tool for convenient cookie access and creation.</p>
- * <p><pre>
- * Template example(s):
+ * <p>Template example(s):</p>
+ * <pre>
  *  $cookie.foo
  *  $cookie.add("bar",'woogie')
- *
- * tools.xml configuration:
+ * </pre>
+ * <p>tools.xml configuration:</p>
+ * <pre>
  * &lt;tools&gt;
  *   &lt;toolbox scope="request"&gt;
  *     &lt;tool class="org.apache.velocity.tools.view.CookieTool"/&gt;
  *   &lt;/toolbox&gt;
  * &lt;/tools&gt;
- * </pre></p>
+ * </pre>
  *
  * <p>This class is only designed for use as a request-scope tool.</p>
  *

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
Wed Jun 20 12:28:19 2018
@@ -26,18 +26,18 @@ import org.apache.velocity.tools.generic
 
 /**
  * General-purpose text-importing view tool for templates.
- * <p>Usage:<br />
+ * <p>Usage:<br>
  * Just call $import.read("http://www.foo.com/bleh.jsp?sneh=bar") to insert the contents
of the named
  * resource into the template.
  * </p>
- * <p><pre>
+ * <pre>
  * Toolbox configuration:
  * &lt;tools&gt;
  *   &lt;toolbox scope="request"&gt;
  *     &lt;tool class="org.apache.velocity.tools.view.ImportTool"/&gt;
  *   &lt;/toolbox&gt;
  * &lt;/tools&gt;
- * </pre></p>
+ * </pre>
  *
  * @author <a href="mailto:marinoj@centrum.is">Marino A. Jonsson</a>
  * @since VelocityTools 2.0

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
Wed Jun 20 12:28:19 2018
@@ -134,14 +134,14 @@ public class IncludeTool extends SafeCon
      * for the locale of the current request.  Use in conjuction with
      * Apache httpd's <code>MultiViews</code>, or by itself.</p>
      *
-     * <p>Usage from a template would be something like the following:
-     * <blockquote><code><pre>
+     * <p>Usage from a template would be something like the following:</p>
+     * <pre><code>
      * #parse( $include.find('header.vm', 'en') )
      * #include( $include.find('my_page.html', 'en') )
      * #parse( $include.find('footer.vm', 'en') )
-     * </pre></code></blockquote>
+     * </code></pre>
      *
-     * You might also wrap this method using another pull/view tool
+     * <p>You might also wrap this method using another pull/view tool
      * which does internationalization/localization/content negation
      * for a single point of access.</p>
      *
@@ -178,12 +178,12 @@ public class IncludeTool extends SafeCon
      * <p>Checks to see whether a #parse-able template or
      * #include-able resource exists under the specified name/path.</p>
      *
-     * <p>Usage from a template would be something like the following:
-     * <blockquote><code><pre>
+     * <p>Usage from a template would be something like the following:</p>
+     * <pre>
      * #if( $include.exists('header.vm') )
      *   #parse( 'header.vm' )
      * #end
-     * </pre></code></blockquote>
+     * </pre>
      *
      * @see VelocityEngine#resourceExists
      */

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/JeeConfig.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/JeeConfig.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/JeeConfig.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/JeeConfig.java
Wed Jun 20 12:28:19 2018
@@ -25,8 +25,7 @@ import javax.servlet.ServletContext;
 /**
  * <p>Because sometimes you don't care about the difference between a
  * servlet and a filter.  Why isn't there a common interface for
- * {@link FilterConfig} and {@link ServletConfig} already? Sheesh.</p>
- * </p>
+ * {@link JeeFilterConfig} and {@link JeeServletConfig} already? Sheesh.</p>
  * <p>
  * Anyway, this also adds the ability to fake everything if you don't have
  * either a FilterConfig or a ServletConfig handy. Just implement it and

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java
Wed Jun 20 12:28:19 2018
@@ -35,14 +35,14 @@ import org.apache.velocity.tools.view.Se
  *     <li>retrieve server, port and path info for the current request</li>
  *     <li>reconstruct or alter the current request URI</li>
  *     <li>and more..</li>
- * </ul></p>
+ * </ul>
  * 
  * <p>The LinkTool is somewhat special in that nearly all public methods return
  * a new instance of LinkTool. This facilitates greatly the repeated use
  * of the LinkTool in Velocity and leads to an elegant syntax.</p>
  * 
- * <p><pre>
- * Template example(s):
+ * <p>Template example(s):</p><pre>
+ * 
  *   #set( $base = $link.path('MyPage.vm').anchor('view') )
  *   &lt;a href="$base.param('select','this')"&gt;this&lt;/a&gt;
  *   &lt;a href="$base.param('select','that')"&gt;that&lt;/a&gt;
@@ -54,7 +54,7 @@ import org.apache.velocity.tools.view.Se
  *              forceRelative="true" includeRequestParams="true"/&gt;
  *   &lt;/toolbox&gt;
  * &lt;/tools&gt;
- * </pre></p>
+ * </pre>
  *
  * <p>This tool may only be used in the request scope.</p>
  *

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/PagerTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/PagerTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/PagerTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/PagerTool.java
Wed Jun 20 12:28:19 2018
@@ -75,17 +75,17 @@ import org.apache.velocity.tools.generic
  *   #end
  * </pre>
  *
- * The output of this might look like:<br><br>
- *   Showing 1-5 of 8<br>
- *   1. foo<br>
- *   2. bar<br>
- *   3. blah<br>
- *   4. woogie<br>
- *   5. baz<br><br>
- *   <b>1</b> <a href="">2</a> <a href="">Next</a>
- * </p>
- * <p>
- * <b>Example tools.xml configuration:</b>
+ * <p>The output of this might look like:</p>
+ * <pre>
+ *   Showing 1-5 of 8&lt;br&gt;
+ *   1. foo&lt;br&gt;
+ *   2. bar&lt;br&gt;
+ *   3. blah&lt;br&gt;
+ *   4. woogie&lt;br&gt;
+ *   5. baz&lt;br&gt;&lt;br&gt;
+ *   &lt;b&gt;1&lt;/b&gt; &lt;a href=""&gt;2&lt;/a&gt; &lt;a
href=""&gt;Next&lt;/a&gt;
+ * </pre>
+ * <p>Example tools.xml configuration:</p>
  * <pre>
  * &lt;tools&gt;
  *   &lt;toolbox scope="request"&gt;
@@ -93,7 +93,6 @@ import org.apache.velocity.tools.generic
  *   &lt;/toolbox&gt;
  * &lt;/tools&gt;
  * </pre>
- * </p>
  *
  * @author Nathan Bubna
  * @version $Revision$ $Date$

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
Wed Jun 20 12:28:19 2018
@@ -33,12 +33,12 @@ import org.apache.velocity.tools.generic
 
 /**
  * <p>Utility class for easy parsing of {@link ServletRequest} parameters.</p>
- * <p><pre>
+ * <pre>
  * Template example(s):
- *   $params.foo                ->  bar
- *   $params.getNumber('baz')   ->  12.6
- *   $params.getInt('baz')      ->  12
- *   $params.getNumbers('baz')  ->  [12.6]
+ *   $params.foo                -&gt;  bar
+ *   $params.getNumber('baz')   -&gt;  12.6
+ *   $params.getInt('baz')      -&gt;  12
+ *   $params.getNumbers('baz')  -&gt;  [12.6]
  *
  * Toolbox configuration:
  * &lt;tools&gt;
@@ -46,7 +46,7 @@ import org.apache.velocity.tools.generic
  *     &lt;tool class="org.apache.velocity.tools.view.ParameterTool"/&gt;
  *   &lt;/toolbox&gt;
  * &lt;/tools&gt;
- * </pre></p>
+ * </pre>
  *
  * <p>When used as a view tool, this should only be used in the request scope.
  * This class is, however, quite useful in your application's controller, filter,

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
Wed Jun 20 12:28:19 2018
@@ -85,15 +85,17 @@ import org.apache.velocity.tools.config.
  *      &lt;script type="text/javascript" src="js/profile.js"&gt;&lt;/script&gt;
  *    &lt;/head&gt;
  *  ...
- *
- * Example tools.xml:
+ * </pre>
+ * <p>Example tools.xml:</p>
+ * <pre>
  * &lt;tools&gt;
  *   &lt;toolbox scope="request"&gt;
  *     &lt;tool class="org.apache.velocity.tools.view.beta.UiDependencyTool"/&gt;
  *   &lt;/toolbox&gt;
  * &lt;/tools&gt;
- *
- * Example ui.xml:
+ * </pre>
+ * <p>Example ui.xml:</p>
+ * <pre>
  * &lt;ui&gt;
  *   &lt;type name="style"&gt;&lt;![CDATA[&lt;link rel="stylesheet" type="text/css"
href="/styles/{file}"&gt;]]&gt;&lt;/type&gt;
  *   &lt;group name="globals"&gt;
@@ -109,7 +111,6 @@ import org.apache.velocity.tools.config.
  *   &lt;/group&gt;
  * &lt;/ui&gt;
  * </pre>
- * </p>
  *
  * @author Nathan Bubna
  * @version $Revision: 16660 $

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Wed Jun 20 12:28:19 2018
@@ -741,9 +741,9 @@ public class VelocityView extends ViewTo
      * @param name The file name of the template to retrieve relative to the
      *             template root.
      * @return The requested template.
-     * @throws ResourceNotFoundException if template not found
+     * @throws org.apache.velocity.exception.ResourceNotFoundException if template not found
      *          from any available source.
-     * @throws ParseErrorException if template cannot be parsed due
+     * @throws org.apache.velocity.exception.ParseErrorException if template cannot be parsed
due
      *          to syntax (or other) error.
      */
     public Template getTemplate(String name)
@@ -759,9 +759,9 @@ public class VelocityView extends ViewTo
      *             template root.
      * @param encoding the character encoding of the template
      * @return The requested template.
-     * @throws ResourceNotFoundException if template not found
+     * @throws org.apache.velocity.exception.ResourceNotFoundException if template not found
      *          from any available source.
-     * @throws ParseErrorException if template cannot be parsed due
+     * @throws org.apache.velocity.exception.ParseErrorException if template cannot be parsed
due
      *          to syntax (or other) error.
      */
     public Template getTemplate(String name, String encoding)

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
Wed Jun 20 12:28:19 2018
@@ -95,7 +95,6 @@ import org.apache.commons.lang3.StringEs
  *     at least not return any of the failed request content. Essentially,
  *     setting this to {@code true} degrades performance in order to enable
  *     a more "correct" error response"</dd>
- *  </dd>
  * </dl>
  *
  * @version $Id$

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
Wed Jun 20 12:28:19 2018
@@ -32,19 +32,20 @@ import org.apache.velocity.tools.view.Vi
  * <p>Extension of {@link ContextTool} that includes keys and values
  * from the {@link HttpServletRequest}, {@link HttpSession} and
  * {@link ServletContext}.</p>
- * <p><pre>
- * Template example(s):
+ * <p>Template example(s):
+ * <pre>
  *  #foreach( $key in $context.keys )
  *    $key = $context.get($key)
  *  #end
- *
- * Toolbox configuration:
+ * </pre>
+ * <p>Toolbox configuration:</p>
+ * <pre>
  * &lt;tools&gt;
  *   &lt;toolbox scope="request"&gt;
  *     &lt;tool class="org.apache.velocity.tools.view.ViewContextTool"/&gt;
  *   &lt;/toolbox&gt;
  * &lt;/tools&gt;
- * </pre></p>
+ * </pre>
  *
  * <p>This class is only designed for use as a request-scope VelocityView tool.</p>
  *

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewImportSupport.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewImportSupport.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewImportSupport.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewImportSupport.java
Wed Jun 20 12:28:19 2018
@@ -167,7 +167,6 @@ public class ViewImportSupport extends I
      * @param url the local URL resource to return as string
      * @return the URL resource as string
      * @throws IOException
-     * @throws java.lang.Exception
      */
     protected String acquireLocalURLString(String url) throws IOException
     {
@@ -259,7 +258,6 @@ public class ViewImportSupport extends I
      * @param url the URL to read
      * @return a Reader for the InputStream created from the supplied URL
      * @throws IOException
-     * @throws java.lang.Exception
      */
     protected Reader acquireLocalURLReader(String url) throws IOException
     {

Modified: velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java?rev=1833909&r1=1833908&r2=1833909&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
(original)
+++ velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
Wed Jun 20 12:28:19 2018
@@ -37,12 +37,11 @@ import org.apache.velocity.runtime.parse
 /**
  * <p>This custom uberspector allows getAttribute() and setAttribute() as standard
  * getters and setters for the "request","session" and "application" keys.
- * <p>It allows VTL statements like:
+ * <p>It allows VTL statements like:</p>
  * <pre>
  * #set($session.foo = 'youpi')
  * session parameter 'foo' has value: $session.foo
  * </pre>
- * </p>
  * <p>This uberspector requires Velocity 1.6+ ; to use it, you must specify <code>org.apache.velocity.tools.view.WebappUberspector</code>
  * as the last uberspector to the <code>runtime.introspector.uberspect</code>
property in you <code>velocity.properties</code> file.</p>
  *
@@ -62,7 +61,6 @@ public class WebappUberspector extends A
      * @param identifier
      * @param i
      * @return A Velocity Getter Method.
-     * @throws Exception
      */
     public VelPropertyGet getPropertyGet(Object obj, String identifier, Info i)
     {
@@ -105,7 +103,6 @@ public class WebappUberspector extends A
      * @param arg
      * @param i
      * @return A Velocity Setter method.
-     * @throws Exception
      */
     public VelPropertySet getPropertySet(Object obj, String identifier,
                                          Object arg, Info i)



Mime
View raw message