Author: cbrisson Date: Mon Dec 5 14:30:12 2016 New Revision: 1772675 URL: http://svn.apache.org/viewvc?rev=1772675&view=rev Log: [site] push last changes into production
Modified: velocity/site/production/engine/2.0/configuration.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/upgrading.html Modified: velocity/site/production/engine/2.0/configuration.html URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.0/configuration.html?rev=1772675&r1=1772674&r2=1772675&view=diff ============================================================================== --- velocity/site/production/engine/2.0/configuration.html (original) +++ velocity/site/production/engine/2.0/configuration.html Mon Dec 5 14:30:12 2016 @@ -275,7 +275,7 @@ h2:hover > .headerlink, h3:hover > .head <h2 id="character-encoding">Character Encoding<a class="headerlink" href="#character-encoding" title="Permanent link">¶</a></h2> <p><strong><code>input.encoding = UTF-8</code></strong></p> <blockquote> -<p>Character encoding for input (templates). If not specified, Velocity relies on the 'file.encoding' system property.</p> +<p>Character encoding for input (templates). UTF-8 if not specified.</p> </blockquote> <h2 id="vtl-directives">VTL Directives<a class="headerlink" href="#vtl-directives" title="Permanent link">¶</a></h2> <h3 id="define-directive">#define() Directive<a class="headerlink" href="#define-directive" title="Permanent link">¶</a></h3> Modified: velocity/site/production/engine/2.0/upgrading.html URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.0/upgrading.html?rev=1772675&r1=1772674&r2=1772675&view=diff ============================================================================== --- velocity/site/production/engine/2.0/upgrading.html (original) +++ velocity/site/production/engine/2.0/upgrading.html Mon Dec 5 14:30:12 2016 @@ -245,8 +245,8 @@ space.gobbling = bc The 1.x behavior did send invalid reference events in all those cases.</li> </ul> </li> -<li>The <code>ResourceLoader</code> class has been deprecated in favor of a <code>ResourceLoader2</code> class, in which the <code>InputStream ResourceLoader.getResourceStream(String name)</code> has been replaced by a <code>Reader ResourceLoader.getResourceReader(String name, String encoding)</code>. Since <code>ResourceLoader</code> inherits from <code>ResourceLoader2</code>, the change remains backward compatible, but custom resource loaders should be upgraded to avoid deprecattion warnings.</li> -<li>the default encoding ('ISO-8859-1' in 1.x) is now read from the standard <code>file.encoding</code> Java system property.</li> +<li>The <code>ResourceLoader</code> class has been deprecated in favor of a <code>ResourceLoader2</code> class, in which the <code>InputStream ResourceLoader.getResourceStream(String name)</code> has been replaced by a <code>Reader ResourceLoader.getResourceReader(String name, String encoding)</code>. Since <code>ResourceLoader</code> inherits from <code>ResourceLoader2</code>, the change remains backward compatible, but custom resource loaders should be upgraded to avoid deprecation warnings.</li> +<li>the default encoding ('ISO-8859-1' in 1.x) is now UTF-8.</li> <li>the MethodException event handler now receives an additional argument providing template name and location infos.</li> <li>all occurences of the class org.apache.commons.collections.ExtendedProperties in the initialization API have been replaced by org.apache.velocity.util.ExtProperties.</li> <li>the macros are now using a 'call by sharing' convention (which means that all arguments are evaluated once at start, and that the macro receives a copy of the reference to each argument).</li> Modified: velocity/site/production/engine/devel/changes.html URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/changes.html?rev=1772675&r1=1772674&r2=1772675&view=diff ============================================================================== --- velocity/site/production/engine/devel/changes.html (original) +++ velocity/site/production/engine/devel/changes.html Mon Dec 5 14:30:12 2016 @@ -317,6 +317,13 @@ h2:hover > .headerlink, h3:hover > .head <td> <img src="images/add.png"/> </td> + <td> Default encoding is now UTF-8. . </td> + <td>cbrisson</td> + </tr> + <tr> + <td> + <img src="images/add.png"/> + </td> <td> Make Velocity use the base logger namespace 'org.apache.velocity' unless specified with runtime.log.name in the configuration, and have the runtime instance log with this base namespace, and other modules log with children namespaces: <ul> <li> directive, and velocity.directive.[directivename] </li> <li> parser </li> <li> loader and loader.[loadername] </li> <li> macro </li> <li> rendering </li> <li> event </li> </ul> Get rid of UberspectLoggable interface. . </td> <td>cbrisson</td> </tr> Modified: velocity/site/production/engine/devel/configuration.html URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/configuration.html?rev=1772675&r1=1772674&r2=1772675&view=diff ============================================================================== --- velocity/site/production/engine/devel/configuration.html (original) +++ velocity/site/production/engine/devel/configuration.html Mon Dec 5 14:30:12 2016 @@ -275,7 +275,7 @@ h2:hover > .headerlink, h3:hover > .head <h2 id="character-encoding">Character Encoding<a class="headerlink" href="#character-encoding" title="Permanent link">¶</a></h2> <p><strong><code>input.encoding = UTF-8</code></strong></p> <blockquote> -<p>Character encoding for input (templates). If not specified, Velocity relies on the 'file.encoding' system property.</p> +<p>Character encoding for input (templates). UTF-8 if not specified.</p> </blockquote> <h2 id="vtl-directives">VTL Directives<a class="headerlink" href="#vtl-directives" title="Permanent link">¶</a></h2> <h3 id="define-directive">#define() Directive<a class="headerlink" href="#define-directive" title="Permanent link">¶</a></h3> Modified: velocity/site/production/engine/devel/upgrading.html URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/upgrading.html?rev=1772675&r1=1772674&r2=1772675&view=diff ============================================================================== --- velocity/site/production/engine/devel/upgrading.html (original) +++ velocity/site/production/engine/devel/upgrading.html Mon Dec 5 14:30:12 2016 @@ -245,8 +245,8 @@ space.gobbling = bc The 1.x behavior did send invalid reference events in all those cases.</li> </ul> </li> -<li>The <code>ResourceLoader</code> class has been deprecated in favor of a <code>ResourceLoader2</code> class, in which the <code>InputStream ResourceLoader.getResourceStream(String name)</code> has been replaced by a <code>Reader ResourceLoader.getResourceReader(String name, String encoding)</code>. Since <code>ResourceLoader</code> inherits from <code>ResourceLoader2</code>, the change remains backward compatible, but custom resource loaders should be upgraded to avoid deprecattion warnings.</li> -<li>the default encoding ('ISO-8859-1' in 1.x) is now read from the standard <code>file.encoding</code> Java system property.</li> +<li>The <code>ResourceLoader</code> class has been deprecated in favor of a <code>ResourceLoader2</code> class, in which the <code>InputStream ResourceLoader.getResourceStream(String name)</code> has been replaced by a <code>Reader ResourceLoader.getResourceReader(String name, String encoding)</code>. Since <code>ResourceLoader</code> inherits from <code>ResourceLoader2</code>, the change remains backward compatible, but custom resource loaders should be upgraded to avoid deprecation warnings.</li> +<li>the default encoding ('ISO-8859-1' in 1.x) is now UTF-8.</li> <li>the MethodException event handler now receives an additional argument providing template name and location infos.</li> <li>all occurences of the class org.apache.commons.collections.ExtendedProperties in the initialization API have been replaced by org.apache.velocity.util.ExtProperties.</li> <li>the macros are now using a 'call by sharing' convention (which means that all arguments are evaluated once at start, and that the macro receives a copy of the reference to each argument).</li>