Author: cbrisson
Date: Wed Jul 13 10:38:47 2016
New Revision: 1752390
URL: http://svn.apache.org/viewvc?rev=1752390&view=rev
Log:
[site] push site fixes and last changelog updates onto production
Modified:
velocity/site/production/css/site.css
velocity/site/production/engine/1.7/developer-guide.html
velocity/site/production/engine/devel/changes.html
velocity/site/production/engine/devel/developer-guide.html
Modified: velocity/site/production/css/site.css
URL:
http://svn.apache.org/viewvc/velocity/site/production/css/site.css?rev=1752390&r1=1752389&r2=1752390&view=diff
==============================================================================
--- velocity/site/production/css/site.css (original)
+++ velocity/site/production/css/site.css Wed Jul 13 10:38:47 2016
@@ -90,6 +90,12 @@ section, div.section
margin: 1em 0;
}
+blockquote
+{
+ margin-left: 1em;
+ margin-right: 1em;
+}
+
body
{
/* font-family: "Droid Serif",Georgia,"Times New Roman",Times,serif; */
Modified: velocity/site/production/engine/1.7/developer-guide.html
URL:
http://svn.apache.org/viewvc/velocity/site/production/engine/1.7/developer-guide.html?rev=1752390&r1=1752389&r2=1752390&view=diff
==============================================================================
--- velocity/site/production/engine/1.7/developer-guide.html (original)
+++ velocity/site/production/engine/1.7/developer-guide.html Wed Jul 13
10:38:47 2016
@@ -259,6 +259,11 @@ h2:hover > .headerlink, h3:hover > .head
</li>
<li><a href="#application-attributes">Application Attributes</a></li>
<li><a href="#configuring-event-handlers">Configuring Event Handlers</a><ul>
+<li><a
href="#orgapachevelocityappeventincludeeventhandler">org.apache.velocity.app.event.IncludeEventHandler</a></li>
+<li><a
href="#orgapachevelocityappeventinvalidreferenceeventhandler">org.apache.velocity.app.event.InvalidReferenceEventHandler</a></li>
+<li><a
href="#orgapachevelocityappeventmethodexceptioneventhandler">org.apache.velocity.app.event.MethodExceptionEventHandler</a></li>
+<li><a
href="#orgapachevelocityappeventnullseteventhandler">org.apache.velocity.app.event.NullSetEventHandler</a></li>
+<li><a
href="#orgapachevelocityappeventreferenceinsertioneventhandler">org.apache.velocity.app.event.ReferenceInsertionEventHandler</a></li>
<li><a href="#registering-event-handlers">Registering Event Handlers</a></li>
</ul>
</li>
@@ -757,7 +762,7 @@ velocityEngine.init();
<h2 id="configuring-event-handlers">Configuring Event Handlers<a
class="headerlink" href="#configuring-event-handlers" title="Permanent
link">¶</a></h2>
<p>Velocity contains a fine-grained event handling system that allows you to
customize the operation of the engine. For example, you may change the text of
references that are inserted into a page, modify which templates are actually
included with <code>#include</code> or <code>#parse</code>, or capture all
invalid references.</p>
<p>All event handler interfaces available in Velocity are in the package
<code>org.apache.velocity.app.event</code>. You may create your own
implementation or use one of the sample implementations in the package
<code>org.apache.velocity.app.event.implement</code>. (See the javadocs for
more details on the provided implementations).</p>
-<p><em><code>org.apache.velocity.app.event.IncludeEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventincludeeventhandler"><code>org.apache.velocity.app.event.IncludeEventHandler</code><a
class="headerlink" href="#orgapachevelocityappeventincludeeventhandler"
title="Permanent link">¶</a></h3>
<blockquote>
<p>The <code>IncludeEventHandler</code> can be used to modify the template
that is included in a page with <code>#include</code> or <code>#parse</code>.
For example, this may be used to make all includes relative to the current
directory or to prevent access to unauthorized resources. Multiple
<code>IncludeEventHandler</code>'s may be chained, with the return value of the
final call used as the name of the template to retrieve.</p>
<div class="codehilite"><pre>public IncludeEventHandler extends EventHandler
@@ -769,11 +774,13 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+ <code>org.apache.velocity.app.event.implement.IncludeNotFound</code>
-+ <code>org.apache.velocity.app.event.implement.IncludeRelativePath</code></p>
+<p>Available implementations include:</p>
+<ul>
+<li><code>org.apache.velocity.app.event.implement.IncludeNotFound</code></li>
+<li><code>org.apache.velocity.app.event.implement.IncludeRelativePath</code></li>
+</ul>
</blockquote>
-<p><em><code>org.apache.velocity.app.event.InvalidReferenceEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventinvalidreferenceeventhandler"><code>org.apache.velocity.app.event.InvalidReferenceEventHandler</code><a
class="headerlink"
href="#orgapachevelocityappeventinvalidreferenceeventhandler" title="Permanent
link">¶</a></h3>
<blockquote>
<p>Normally, when a template contains a bad reference an error message is
logged and (unless it is part of a <code>#set</code> or <code>#if</code>), the
reference is included verbatim in a page. With the
<code>InvalidReferenceEventHandler</code> this behavior can be changed.
Substitute values can be inserted, invalid references may be logged, or an
exception can be thrown. Multiple <code>InvalidReferenceEventHandler</code>'s
may be chained. The exact manner in which chained method calls behave will
differ per method. (See the javadoc for the details).</p>
<div class="codehilite"><pre>public InvalidReferenceEventHandler extends
EventHandler
@@ -798,10 +805,12 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+
<code>org.apache.velocity.app.event.implement.ReportInvalidReferences</code></p>
+<p>Available implementations include:</p>
+<ul>
+<li><code>org.apache.velocity.app.event.implement.ReportInvalidReferences</code></li>
+</ul>
</blockquote>
-<p><em><code>org.apache.velocity.app.event.MethodExceptionEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventmethodexceptioneventhandler"><code>org.apache.velocity.app.event.MethodExceptionEventHandler</code><a
class="headerlink"
href="#orgapachevelocityappeventmethodexceptioneventhandler" title="Permanent
link">¶</a></h3>
<blockquote>
<p>When a user-supplied method throws an exception, the
<code>MethodExceptionEventHandler</code> is invoked with the Class, method name
and thrown Exception. The handler can either return a valid Object to be used
as the return value of the method call or throw the passed-in or new Exception,
which will be wrapped and propogated to the user as a
<code>MethodInvocationException</code>. While
<code>MethodExceptionEventHandler</code>'s can be chained only the first
handler is actually called -- all others are ignored.</p>
<div class="codehilite"><pre>public interface MethodExceptionEventHandler
extends EventHandler
@@ -814,10 +823,12 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+ <code>org.apache.velocity.app.event.implement.PrintExceptions</code></p>
+<p>Available implementations include:</p>
+<ul>
+<li><code>org.apache.velocity.app.event.implement.PrintExceptions</code></li>
+</ul>
</blockquote>
-<p><em><code>org.apache.velocity.app.event.NullSetEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventnullseteventhandler"><code>org.apache.velocity.app.event.NullSetEventHandler</code><a
class="headerlink" href="#orgapachevelocityappeventnullseteventhandler"
title="Permanent link">¶</a></h3>
<blockquote>
<p>When a #set() rejects an assignment due to the right hand side being an
invalid or null reference, this is normally logged. The
<code>NullSetEventHandler</code> allows you to 'veto' the logging of this
condition. Multiple <code>NullSetEventHandler</code>'s can be chained; each
event handler is called in sequence until a false is returned.</p>
<div class="codehilite"><pre>public interface NullSetEventHandler extends
EventHandler
@@ -828,10 +839,12 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+ <em>none provided</em></p>
+<p>Available implementations include:</p>
+<ul>
+<li><em>none provided</em></li>
+</ul>
</blockquote>
-<p><em><code>org.apache.velocity.app.event.ReferenceInsertionEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventreferenceinsertioneventhandler"><code>org.apache.velocity.app.event.ReferenceInsertionEventHandler</code><a
class="headerlink"
href="#orgapachevelocityappeventreferenceinsertioneventhandler"
title="Permanent link">¶</a></h3>
<blockquote>
<p>A <code>ReferenceInsertionEventHandler</code> allows the developer to
intercept each write of a reference ($foo) value to the output stream and
modify that output. Multiple <code>ReferenceInsertionEventHandler</code>'s may
be chained with each step potentially altering the inserted reference.</p>
<div class="codehilite"><pre>public interface ReferenceInsertionEventHandler
extends EventHandler
@@ -842,11 +855,13 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+ <code>org.apache.velocity.app.event.implement.EscapeHtmlReference</code>
-+
<code>org.apache.velocity.app.event.implement.EscapeJavascriptReference</code>
-+ <code>org.apache.velocity.app.event.implement.EscapeSqlReference</code>
-+ <code>org.apache.velocity.app.event.implement.EscapeXmlReference</code></p>
+<p>Available implementations include:</p>
+<ul>
+<li><code>org.apache.velocity.app.event.implement.EscapeHtmlReference</code></li>
+<li><code>org.apache.velocity.app.event.implement.EscapeJavascriptReference</code></li>
+<li><code>org.apache.velocity.app.event.implement.EscapeSqlReference</code></li>
+<li><code>org.apache.velocity.app.event.implement.EscapeXmlReference</code></li>
+</ul>
</blockquote>
<h3 id="registering-event-handlers">Registering Event Handlers<a
class="headerlink" href="#registering-event-handlers" title="Permanent
link">¶</a></h3>
<p>You may register event handlers in either of two manners. The easiest way
to register event handlers is to specify them in velocity.properties. (Event
handlers configured in this manner are referred to as "global" event handlers).
For example, the following property will escape HTML entities in any inserted
reference.</p>
Modified: velocity/site/production/engine/devel/changes.html
URL:
http://svn.apache.org/viewvc/velocity/site/production/engine/devel/changes.html?rev=1752390&r1=1752389&r2=1752390&view=diff
==============================================================================
--- velocity/site/production/engine/devel/changes.html (original)
+++ velocity/site/production/engine/devel/changes.html Wed Jul 13 10:38:47 2016
@@ -314,6 +314,69 @@ h2:hover > .headerlink, h3:hover > .head
<tbody>
<tr>
<td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> Take advantage of the major version jump to enforce String keys
in internal Context API . Fixes <a
href="https://issues.apache.org/jira/browse/VELOCITY-266";>VELOCITY-266</a>.
</td>
+ <td>cbrisson</td>
+ </tr>
+ <tr>
+ <td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> Fix regression: #set<tab>left-paren no longer valid grammar
Patch from Mike Kienenberger applied + added test . Fixes <a
href="https://issues.apache.org/jira/browse/VELOCITY-863";>VELOCITY-863</a>.
Thanks to Mike Kienenberger.</td>
+ <td>sdimitriu</td>
+ </tr>
+ <tr>
+ <td>
+ <img src="images/add.png"/>
+ </td>
+ <td> switch to slf4j logging facade . </td>
+ <td>cbrisson</td>
+ </tr>
+ <tr>
+ <td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> fix parser for '$map{key}' text rendering (StackOverflow
32805217) . </td>
+ <td>cbrisson</td>
+ </tr>
+ <tr>
+ <td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> Vulnerability in dependency: commons-collections: 3.2.1 . Fixes
<a href="https://issues.apache.org/jira/browse/VELOCITY-869";>VELOCITY-869</a>.
</td>
+ <td>sdimitriu</td>
+ </tr>
+ <tr>
+ <td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> Exception displayed when trying to loop over an Iterable private
class . Fixes <a
href="https://issues.apache.org/jira/browse/VELOCITY-870";>VELOCITY-870</a>.
</td>
+ <td>sdimitriu</td>
+ </tr>
+ <tr>
+ <td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> #foreach should work over any Iterable class . Fixes <a
href="https://issues.apache.org/jira/browse/VELOCITY-871";>VELOCITY-871</a>.
</td>
+ <td>sdimitriu</td>
+ </tr>
+ <tr>
+ <td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> Catch exceptions raised during chainable uberspector
initialization . </td>
+ <td>sdimitriu</td>
+ </tr>
+ <tr>
+ <td>
+ <img src="images/fix.png"/>
+ </td>
+ <td> Hypen is no more allowed in variable names . Fixes <a
href="https://issues.apache.org/jira/browse/VELOCITY-542";>VELOCITY-542</a>.
</td>
+ <td>cbrisson</td>
+ </tr>
+ <tr>
+ <td>
<img src="images/add.png"/>
</td>
<td> Method arguments can now be expressions . Fixes <a
href="https://issues.apache.org/jira/browse/VELOCITY-706";>VELOCITY-706</a>.
</td>
Modified: velocity/site/production/engine/devel/developer-guide.html
URL:
http://svn.apache.org/viewvc/velocity/site/production/engine/devel/developer-guide.html?rev=1752390&r1=1752389&r2=1752390&view=diff
==============================================================================
--- velocity/site/production/engine/devel/developer-guide.html (original)
+++ velocity/site/production/engine/devel/developer-guide.html Wed Jul 13
10:38:47 2016
@@ -259,6 +259,11 @@ h2:hover > .headerlink, h3:hover > .head
</li>
<li><a href="#application-attributes">Application Attributes</a></li>
<li><a href="#configuring-event-handlers">Configuring Event Handlers</a><ul>
+<li><a
href="#orgapachevelocityappeventincludeeventhandler">org.apache.velocity.app.event.IncludeEventHandler</a></li>
+<li><a
href="#orgapachevelocityappeventinvalidreferenceeventhandler">org.apache.velocity.app.event.InvalidReferenceEventHandler</a></li>
+<li><a
href="#orgapachevelocityappeventmethodexceptioneventhandler">org.apache.velocity.app.event.MethodExceptionEventHandler</a></li>
+<li><a
href="#orgapachevelocityappeventnullseteventhandler">org.apache.velocity.app.event.NullSetEventHandler</a></li>
+<li><a
href="#orgapachevelocityappeventreferenceinsertioneventhandler">org.apache.velocity.app.event.ReferenceInsertionEventHandler</a></li>
<li><a href="#registering-event-handlers">Registering Event Handlers</a></li>
</ul>
</li>
@@ -760,7 +765,7 @@ velocityEngine.init();
<h2 id="configuring-event-handlers">Configuring Event Handlers<a
class="headerlink" href="#configuring-event-handlers" title="Permanent
link">¶</a></h2>
<p>Velocity contains a fine-grained event handling system that allows you to
customize the operation of the engine. For example, you may change the text of
references that are inserted into a page, modify which templates are actually
included with <code>#include</code> or <code>#parse</code>, or capture all
invalid references.</p>
<p>All event handler interfaces available in Velocity are in the package
<code>org.apache.velocity.app.event</code>. You may create your own
implementation or use one of the sample implementations in the package
<code>org.apache.velocity.app.event.implement</code>. (See the javadocs for
more details on the provided implementations).</p>
-<p><em><code>org.apache.velocity.app.event.IncludeEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventincludeeventhandler"><code>org.apache.velocity.app.event.IncludeEventHandler</code><a
class="headerlink" href="#orgapachevelocityappeventincludeeventhandler"
title="Permanent link">¶</a></h3>
<blockquote>
<p>The <code>IncludeEventHandler</code> can be used to modify the template
that is included in a page with <code>#include</code> or <code>#parse</code>.
For example, this may be used to make all includes relative to the current
directory or to prevent access to unauthorized resources. Multiple
<code>IncludeEventHandler</code>'s may be chained, with the return value of the
final call used as the name of the template to retrieve.</p>
<div class="codehilite"><pre>public IncludeEventHandler extends EventHandler
@@ -772,11 +777,13 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+ <code>org.apache.velocity.app.event.implement.IncludeNotFound</code>
-+ <code>org.apache.velocity.app.event.implement.IncludeRelativePath</code></p>
+<p>Available implementations include:</p>
+<ul>
+<li><code>org.apache.velocity.app.event.implement.IncludeNotFound</code></li>
+<li><code>org.apache.velocity.app.event.implement.IncludeRelativePath</code></li>
+</ul>
</blockquote>
-<p><em><code>org.apache.velocity.app.event.InvalidReferenceEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventinvalidreferenceeventhandler"><code>org.apache.velocity.app.event.InvalidReferenceEventHandler</code><a
class="headerlink"
href="#orgapachevelocityappeventinvalidreferenceeventhandler" title="Permanent
link">¶</a></h3>
<blockquote>
<p>Normally, when a template contains a bad reference an error message is
logged and (unless it is part of a <code>#set</code> or <code>#if</code>), the
reference is included verbatim in a page. With the
<code>InvalidReferenceEventHandler</code> this behavior can be changed.
Substitute values can be inserted, invalid references may be logged, or an
exception can be thrown. Multiple <code>InvalidReferenceEventHandler</code>'s
may be chained. The exact manner in which chained method calls behave will
differ per method. (See the javadoc for the details).</p>
<div class="codehilite"><pre>public InvalidReferenceEventHandler extends
EventHandler
@@ -801,10 +808,12 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+
<code>org.apache.velocity.app.event.implement.ReportInvalidReferences</code></p>
+<p>Available implementations include:</p>
+<ul>
+<li><code>org.apache.velocity.app.event.implement.ReportInvalidReferences</code></li>
+</ul>
</blockquote>
-<p><em><code>org.apache.velocity.app.event.MethodExceptionEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventmethodexceptioneventhandler"><code>org.apache.velocity.app.event.MethodExceptionEventHandler</code><a
class="headerlink"
href="#orgapachevelocityappeventmethodexceptioneventhandler" title="Permanent
link">¶</a></h3>
<blockquote>
<p>When a user-supplied method throws an exception, the
<code>MethodExceptionEventHandler</code> is invoked with the Class, method name
and thrown Exception. The handler can either return a valid Object to be used
as the return value of the method call or throw the passed-in or new Exception,
which will be wrapped and propogated to the user as a
<code>MethodInvocationException</code>. While
<code>MethodExceptionEventHandler</code>'s can be chained only the first
handler is actually called -- all others are ignored.</p>
<div class="codehilite"><pre>public interface MethodExceptionEventHandler
extends EventHandler
@@ -817,10 +826,12 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+ <code>org.apache.velocity.app.event.implement.PrintExceptions</code></p>
+<p>Available implementations include:</p>
+<ul>
+<li><code>org.apache.velocity.app.event.implement.PrintExceptions</code></li>
+</ul>
</blockquote>
-<p><em><code>org.apache.velocity.app.event.NullSetEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventnullseteventhandler"><code>org.apache.velocity.app.event.NullSetEventHandler</code><a
class="headerlink" href="#orgapachevelocityappeventnullseteventhandler"
title="Permanent link">¶</a></h3>
<blockquote>
<p>When a #set() rejects an assignment due to the right hand side being an
invalid or null reference, this is normally logged. The
<code>NullSetEventHandler</code> allows you to 'veto' the logging of this
condition. Multiple <code>NullSetEventHandler</code>'s can be chained; each
event handler is called in sequence until a false is returned.</p>
<div class="codehilite"><pre>public interface NullSetEventHandler extends
EventHandler
@@ -831,10 +842,12 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+ <em>none provided</em></p>
+<p>Available implementations include:</p>
+<ul>
+<li><em>none provided</em></li>
+</ul>
</blockquote>
-<p><em><code>org.apache.velocity.app.event.ReferenceInsertionEventHandler</code></em></p>
+<h3
id="orgapachevelocityappeventreferenceinsertioneventhandler"><code>org.apache.velocity.app.event.ReferenceInsertionEventHandler</code><a
class="headerlink"
href="#orgapachevelocityappeventreferenceinsertioneventhandler"
title="Permanent link">¶</a></h3>
<blockquote>
<p>A <code>ReferenceInsertionEventHandler</code> allows the developer to
intercept each write of a reference ($foo) value to the output stream and
modify that output. Multiple <code>ReferenceInsertionEventHandler</code>'s may
be chained with each step potentially altering the inserted reference.</p>
<div class="codehilite"><pre>public interface ReferenceInsertionEventHandler
extends EventHandler
@@ -845,11 +858,13 @@ velocityEngine.init();
</pre></div>
-<p>Available implementations include:
-+ <code>org.apache.velocity.app.event.implement.EscapeHtmlReference</code>
-+
<code>org.apache.velocity.app.event.implement.EscapeJavascriptReference</code>
-+ <code>org.apache.velocity.app.event.implement.EscapeSqlReference</code>
-+ <code>org.apache.velocity.app.event.implement.EscapeXmlReference</code></p>
+<p>Available implementations include:</p>
+<ul>
+<li><code>org.apache.velocity.app.event.implement.EscapeHtmlReference</code></li>
+<li><code>org.apache.velocity.app.event.implement.EscapeJavascriptReference</code></li>
+<li><code>org.apache.velocity.app.event.implement.EscapeSqlReference</code></li>
+<li><code>org.apache.velocity.app.event.implement.EscapeXmlReference</code></li>
+</ul>
</blockquote>
<h3 id="registering-event-handlers">Registering Event Handlers<a
class="headerlink" href="#registering-event-handlers" title="Permanent
link">¶</a></h3>
<p>You may register event handlers in either of two manners. The easiest way
to register event handlers is to specify them in velocity.properties. (Event
handlers configured in this manner are referred to as "global" event handlers).
For example, the following property will escape HTML entities in any inserted
reference.</p>
