You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2017/07/18 08:53:11 UTC
svn commit: r1802255 - in /velocity/site/production/engine: 2.0/changes.html
2.0/configuration.html 2.0/developer-guide.html 2.0/upgrading.html
devel/changes.html devel/configuration.html devel/developer-guide.html
devel/upgrading.html
Author: cbrisson
Date: Tue Jul 18 08:53:11 2017
New Revision: 1802255
URL: http://svn.apache.org/viewvc?rev=1802255&view=rev
Log:
[site/engine] A few formatting and spelling fixes - into production
Modified:
velocity/site/production/engine/2.0/changes.html
velocity/site/production/engine/2.0/configuration.html
velocity/site/production/engine/2.0/developer-guide.html
velocity/site/production/engine/2.0/upgrading.html
velocity/site/production/engine/devel/changes.html
velocity/site/production/engine/devel/configuration.html
velocity/site/production/engine/devel/developer-guide.html
velocity/site/production/engine/devel/upgrading.html
Modified: velocity/site/production/engine/2.0/changes.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.0/changes.html?rev=1802255&r1=1802254&r2=1802255&view=diff
==============================================================================
--- velocity/site/production/engine/2.0/changes.html (original)
+++ velocity/site/production/engine/2.0/changes.html Tue Jul 18 08:53:11 2017
@@ -315,6 +315,13 @@ h2:hover > .headerlink, h3:hover > .head
<tbody>
<tr>
<td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> Fix DataSourceResourceLoader for UTF-8 correct handling in VARCHAR/CLOB columns, and for connection / statement / result set life cycle. . </td>
+ <td>cbrisson</td>
+ </tr>
+ <tr>
+ <td>
<img src="images/add.png"/>
</td>
<td> Allow expressions inside []: <code> $foo[$bar + 1] </code> . </td>
Modified: velocity/site/production/engine/2.0/configuration.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.0/configuration.html?rev=1802255&r1=1802254&r2=1802255&view=diff
==============================================================================
--- velocity/site/production/engine/2.0/configuration.html (original)
+++ velocity/site/production/engine/2.0/configuration.html Tue Jul 18 08:53:11 2017
@@ -339,7 +339,7 @@ h2:hover > .headerlink, h3:hover > .head
<p>Used to turn on the automatic provision of the $template scope control during #parse calls and template.merge(...) calls. The default is false. Set it to true if you want a secure namespace for your template variables or more advanced #break control.</p>
</blockquote>
<h2 id="resource-management">Resource Management<a class="headerlink" href="#resource-management" title="Permanent link">¶</a></h2>
-<p>**<code>resource.manager.instance = null</code></p>
+<p><strong><code>resource.manager.instance = null</code></strong></p>
<blockquote>
<p>Living Java instance, that must implement the interface org.apache.velocity.runtime.resource.ResourceManager. This property can only be set programmatically, and takes precedence over the next property. It is otherwise used by Velocity to store its actual resource manager once instanciated.</p>
</blockquote>
Modified: velocity/site/production/engine/2.0/developer-guide.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.0/developer-guide.html?rev=1802255&r1=1802254&r2=1802255&view=diff
==============================================================================
--- velocity/site/production/engine/2.0/developer-guide.html (original)
+++ velocity/site/production/engine/2.0/developer-guide.html Tue Jul 18 08:53:11 2017
@@ -1018,9 +1018,9 @@ see the Javadoc API documentation.</p>
<li>
<p><strong>FileResourceLoader :</strong> This loader gets resources from the filesystem. Its configuration properties include:</p>
<ul>
-<li><code>file.resource.loader.path</code> = <path to root of templates></li>
+<li><code>file.resource.loader.path</code> = <path to root of templates> [ , <path to root of templates> ... ]</li>
<li><code>file.resource.loader.cache</code> = true/false</li>
-<li><code>file.resource.loader.modificationCheckInterval</code> = <seconds between checks></li>
+<li><code>file.resource.loader.modificationCheckInterval</code> = <seconds between checks></li>
</ul>
<p>This is the default loader (except when using VelocityTools, see below), and is configured, by default to get templates from the 'current directory'. In the case of using Velocity with servlets, this can be a problem as you don't want to have to keep your templates in the directory from which you start your servlet engine. See the documentation for your servlet or web framework (for example <a href="/tools/devel/view-servlet.html">VelocityViewServlet</a>) for more info on how to configure the location of the Velocity templates.</p>
</li>
@@ -1033,9 +1033,9 @@ see the Javadoc API documentation.</p>
<li>
<p><strong>URLResourceLoader :</strong> This loader gets resources from a URL connection. Its configuration properties include:</p>
<ul>
-<li><code>url.resource.loader.root</code> = <root URL path of templates></li>
+<li><code>url.resource.loader.root</code> = <root URL path of templates> [ , <root URL path of templates> ... ]</li>
<li><code>url.resource.loader.cache</code> = true/false</li>
-<li><code>url.resource.loader.modificationCheckInterval</code> = <seconds between checks></li>
+<li><code>url.resource.loader.modificationCheckInterval</code> = <seconds between checks></li>
</ul>
<p>This loader simply downloads resources from configured URLs. It works much like the FileResourceLoader, however, it can pull templates down from any valid URL to which the application can create a connection.</p>
</li>
Modified: velocity/site/production/engine/2.0/upgrading.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.0/upgrading.html?rev=1802255&r1=1802254&r2=1802255&view=diff
==============================================================================
--- velocity/site/production/engine/2.0/upgrading.html (original)
+++ velocity/site/production/engine/2.0/upgrading.html Tue Jul 18 08:53:11 2017
@@ -232,7 +232,7 @@ space.gobbling = bc
</pre></div>
-<p>and check the <a href="#dependencies-changes">Dependencies change</a> below.</p>
+<p>and check the <a href="#dependencies-changes">Dependency changes</a> below.</p>
<p>Read below for futher details.</p>
<h3 id="behavior-api-changes">Behavior / API changes:<a class="headerlink" href="#behavior-api-changes" title="Permanent link">¶</a></h3>
<ul>
@@ -260,7 +260,7 @@ space.gobbling = bc
<li>method arguments are now converted as needed between all main basic Java standard types (booleans, numbers and strings). If you want to revert to the 1.x behavior, set the property <code>runtime.conversion.handler = none</code>.</li>
<li>space gobbling (to control the indentation of generated code) is now configurable via the <code>space.gobbing</code> configuration key, which can take the following values: <code>none</code>, <code>bc</code> (aka. backward compatible), <code>lines</code> and <code>structured</code>. See the related documentation section for details. To maximize backward compatibility with 1.x, set it to <code>bc</code>.</li>
</ul>
-<h3 id="dependencies-changes">Dependencies changes:<a class="headerlink" href="#dependencies-changes" title="Permanent link">¶</a></h3>
+<h3 id="dependency-changes">Dependency changes:<a class="headerlink" href="#dependency-changes" title="Permanent link">¶</a></h3>
<ul>
<li>Velocity now requires a JDK version of 1.7 or higher.</li>
<li>commons-collections and commons-logging aren't needed any more at runtime.</li>
Modified: velocity/site/production/engine/devel/changes.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/changes.html?rev=1802255&r1=1802254&r2=1802255&view=diff
==============================================================================
--- velocity/site/production/engine/devel/changes.html (original)
+++ velocity/site/production/engine/devel/changes.html Tue Jul 18 08:53:11 2017
@@ -315,6 +315,13 @@ h2:hover > .headerlink, h3:hover > .head
<tbody>
<tr>
<td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> Fix DataSourceResourceLoader for UTF-8 correct handling in VARCHAR/CLOB columns, and for connection / statement / result set life cycle. . </td>
+ <td>cbrisson</td>
+ </tr>
+ <tr>
+ <td>
<img src="images/add.png"/>
</td>
<td> Allow expressions inside []: <code> $foo[$bar + 1] </code> . </td>
Modified: velocity/site/production/engine/devel/configuration.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/configuration.html?rev=1802255&r1=1802254&r2=1802255&view=diff
==============================================================================
--- velocity/site/production/engine/devel/configuration.html (original)
+++ velocity/site/production/engine/devel/configuration.html Tue Jul 18 08:53:11 2017
@@ -339,7 +339,7 @@ h2:hover > .headerlink, h3:hover > .head
<p>Used to turn on the automatic provision of the $template scope control during #parse calls and template.merge(...) calls. The default is false. Set it to true if you want a secure namespace for your template variables or more advanced #break control.</p>
</blockquote>
<h2 id="resource-management">Resource Management<a class="headerlink" href="#resource-management" title="Permanent link">¶</a></h2>
-<p>**<code>resource.manager.instance = null</code></p>
+<p><strong><code>resource.manager.instance = null</code></strong></p>
<blockquote>
<p>Living Java instance, that must implement the interface org.apache.velocity.runtime.resource.ResourceManager. This property can only be set programmatically, and takes precedence over the next property. It is otherwise used by Velocity to store its actual resource manager once instanciated.</p>
</blockquote>
Modified: velocity/site/production/engine/devel/developer-guide.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/developer-guide.html?rev=1802255&r1=1802254&r2=1802255&view=diff
==============================================================================
--- velocity/site/production/engine/devel/developer-guide.html (original)
+++ velocity/site/production/engine/devel/developer-guide.html Tue Jul 18 08:53:11 2017
@@ -1018,9 +1018,9 @@ see the Javadoc API documentation.</p>
<li>
<p><strong>FileResourceLoader :</strong> This loader gets resources from the filesystem. Its configuration properties include:</p>
<ul>
-<li><code>file.resource.loader.path</code> = <path to root of templates></li>
+<li><code>file.resource.loader.path</code> = <path to root of templates> [ , <path to root of templates> ... ]</li>
<li><code>file.resource.loader.cache</code> = true/false</li>
-<li><code>file.resource.loader.modificationCheckInterval</code> = <seconds between checks></li>
+<li><code>file.resource.loader.modificationCheckInterval</code> = <seconds between checks></li>
</ul>
<p>This is the default loader (except when using VelocityTools, see below), and is configured, by default to get templates from the 'current directory'. In the case of using Velocity with servlets, this can be a problem as you don't want to have to keep your templates in the directory from which you start your servlet engine. See the documentation for your servlet or web framework (for example <a href="/tools/devel/view-servlet.html">VelocityViewServlet</a>) for more info on how to configure the location of the Velocity templates.</p>
</li>
@@ -1033,9 +1033,9 @@ see the Javadoc API documentation.</p>
<li>
<p><strong>URLResourceLoader :</strong> This loader gets resources from a URL connection. Its configuration properties include:</p>
<ul>
-<li><code>url.resource.loader.root</code> = <root URL path of templates></li>
+<li><code>url.resource.loader.root</code> = <root URL path of templates> [ , <root URL path of templates> ... ]</li>
<li><code>url.resource.loader.cache</code> = true/false</li>
-<li><code>url.resource.loader.modificationCheckInterval</code> = <seconds between checks></li>
+<li><code>url.resource.loader.modificationCheckInterval</code> = <seconds between checks></li>
</ul>
<p>This loader simply downloads resources from configured URLs. It works much like the FileResourceLoader, however, it can pull templates down from any valid URL to which the application can create a connection.</p>
</li>
Modified: velocity/site/production/engine/devel/upgrading.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/upgrading.html?rev=1802255&r1=1802254&r2=1802255&view=diff
==============================================================================
--- velocity/site/production/engine/devel/upgrading.html (original)
+++ velocity/site/production/engine/devel/upgrading.html Tue Jul 18 08:53:11 2017
@@ -232,7 +232,7 @@ space.gobbling = bc
</pre></div>
-<p>and check the <a href="#dependencies-changes">Dependencies change</a> below.</p>
+<p>and check the <a href="#dependencies-changes">Dependency changes</a> below.</p>
<p>Read below for futher details.</p>
<h3 id="behavior-api-changes">Behavior / API changes:<a class="headerlink" href="#behavior-api-changes" title="Permanent link">¶</a></h3>
<ul>
@@ -260,7 +260,7 @@ space.gobbling = bc
<li>method arguments are now converted as needed between all main basic Java standard types (booleans, numbers and strings). If you want to revert to the 1.x behavior, set the property <code>runtime.conversion.handler = none</code>.</li>
<li>space gobbling (to control the indentation of generated code) is now configurable via the <code>space.gobbing</code> configuration key, which can take the following values: <code>none</code>, <code>bc</code> (aka. backward compatible), <code>lines</code> and <code>structured</code>. See the related documentation section for details. To maximize backward compatibility with 1.x, set it to <code>bc</code>.</li>
</ul>
-<h3 id="dependencies-changes">Dependencies changes:<a class="headerlink" href="#dependencies-changes" title="Permanent link">¶</a></h3>
+<h3 id="dependency-changes">Dependency changes:<a class="headerlink" href="#dependency-changes" title="Permanent link">¶</a></h3>
<ul>
<li>Velocity now requires a JDK version of 1.7 or higher.</li>
<li>commons-collections and commons-logging aren't needed any more at runtime.</li>