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 2006/12/19 01:19:30 UTC

svn commit: r488468 - /velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java

Author: nbubna
Date: Mon Dec 18 16:19:30 2006
New Revision: 488468

URL: http://svn.apache.org/viewvc?view=rev&rev=488468
Log:
update javadoc to tell about default locations for toolbox.xml and velocity.properties

Modified:
    velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java

Modified: velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java?view=diff&rev=488468&r1=488467&r2=488468
==============================================================================
--- velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java (original)
+++ velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java Mon Dec 18 16:19:30 2006
@@ -70,11 +70,15 @@
  *   <dt>org.apache.velocity.toolbox</dt>
  *   <dd>Path and name of the toolbox configuration file. The path must be
  *     relative to the web application root directory. If this parameter is
- *     not found, no toolbox is instantiated.</dd>
+ *     not found, the servlet will check for a toolbox file at
+ *     '/WEB-INF/toolbox.xml'.</dd>
  *   <dt>org.apache.velocity.properties</dt>
  *   <dd>Path and name of the Velocity configuration file. The path must be
  *     relative to the web application root directory. If this parameter
- *     is not present, Velocity is initialized with default settings.</dd>
+ *     is not present, Velocity will check for a properties file at
+ *     '/WEB-INF/velocity.properties'.  If no file is found there, then
+ *     Velocity is initialized with the settings in the classpath at
+ *     'org.apache.velocity.tools.view.servlet.velocity.properties'.</dd>
  * </dl>
  *
  * <p>There are methods you may wish to override to access, alter or control