Author: cbrisson
Date: Tue Nov  8 13:32:04 2016
New Revision: 1768690

URL: http://svn.apache.org/viewvc?rev=1768690&view=rev
Log:
[site] push last change into production

Modified:
    velocity/site/production/css/site.css
    velocity/site/production/engine/2.0/developer-guide.html
    velocity/site/production/engine/devel/developer-guide.html
    velocity/site/production/tools/devel/generic.html
    velocity/site/production/tools/devel/struts.html
    velocity/site/production/tools/devel/view.html

Modified: velocity/site/production/css/site.css
URL: 
http://svn.apache.org/viewvc/velocity/site/production/css/site.css?rev=1768690&r1=1768689&r2=1768690&view=diff
==============================================================================
--- velocity/site/production/css/site.css (original)
+++ velocity/site/production/css/site.css Tue Nov  8 13:32:04 2016
@@ -406,6 +406,40 @@ table.standard tr:nth-child(even), table
 #breadcrumb ul li a:hover { background: hsla(239,47%,25%,1); }
 #breadcrumb ul li a:hover:after { border-left-color: hsla(239,47%,25%,1) 
!important; }
 
+/* conversion matrix */
+
+table.conversions
+{
+    border: solid 1px black;
+    border-collapse: collapse;
+    margin-left: auto;
+    margin-right: auto;
+}
+table.conversions td,
+table.conversions th
+{
+    border: solid 1px black;
+    padding: 0.1em;
+    text-align: center;
+}
+.conversions .strict
+{
+    color: green;
+}
+.conversions .implicit
+{
+    color: blue;
+}
+.conversions .explicit
+{
+    color: magenta;
+}
+.conversions .none
+{
+    color: red;
+}
+
+
 /* Style adjustments for mobile devices */
 
 @media screen and (max-width: 800px)

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=1768690&r1=1768689&r2=1768690&view=diff
==============================================================================
--- velocity/site/production/engine/2.0/developer-guide.html (original)
+++ velocity/site/production/engine/2.0/developer-guide.html Tue Nov  8 
13:32:04 2016
@@ -1262,6 +1262,297 @@ eventhandler.escape.sql.match = /sql.*/
 <li>narrowing number conversion: if the number doesn't fit into the expected 
number type, an exception is thrown</li>
 <li>string to enum constant: will throw if the string doesn't represent a 
constant of the expected enum</li>
 </ul>
+<p><span class="conversions">The following table resumes the possible 
conversions between a provided argument type (which is never a primary type) 
and an expected argument type, which can be <span class="strict">strict</span> 
when the expected type is assignable from the provided type without unboxing, 
<span class="implicit">implicit</span> when Java will take care of the 
necessary conversion or unboxing, <span class="explicit">explicit</span> when 
the conversion is provided by the default 2.0 conversion handler, and <span 
class="none">none</span> when no default conversion is possible.</span></p>
+<table class="conversions">
+  <thead>
+    <tr>
+      <th>
+        provided &rarr;<br/>
+        expected &darr;
+      </th>
+      <th>Boolean</th>
+      <th>Character</th>
+      <th>Byte</th>
+      <th>Short</th>
+      <th>Integer</th>
+      <th>Long</th>
+      <th>Float</th>
+      <th>Double</th>
+      <th>String</th>
+      <th>Object</th>
+      <th>null</th>
+    </tr>
+    <tr>
+      <th>boolean</th>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>char</th>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>byte</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>short</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>int</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>long</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>float</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>double</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>Boolean</th>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Character</th>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Byte</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Short</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Integer</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Long</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Float</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Double</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Number</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>String</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Object</th>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+  </thead>
+  <tbody>
+  </tbody>
+</table>
+
 <p>You can provide a custom conversion handler class by use of the 
<code>runtime.conversion.handler</code> property. The class must implement the 
<a 
href="apidocs/org/apache/velocity/util/introspection/ConversionHandler.html"><code>org.apache.Velocity.util.introspection.ConversionHandler</code></a>
 interface. Set it to <code>none</code> to only accept default Java 
conversions, as for Velocity 1.x.</p>
 <p>You can also provide custom <a 
href="apidocs/org/apache/velocity/util/introspection/Converter.html"><code>Converter&lt;T&gt;</code></a>
 objects that handle a conversion towards a specific type:</p>
 <div class="codehilite"><pre><span class="n">package</span> <span 
class="n">mypackage</span><span class="p">;</span>

Modified: velocity/site/production/engine/devel/developer-guide.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/engine/devel/developer-guide.html?rev=1768690&r1=1768689&r2=1768690&view=diff
==============================================================================
--- velocity/site/production/engine/devel/developer-guide.html (original)
+++ velocity/site/production/engine/devel/developer-guide.html Tue Nov  8 
13:32:04 2016
@@ -1262,6 +1262,297 @@ eventhandler.escape.sql.match = /sql.*/
 <li>narrowing number conversion: if the number doesn't fit into the expected 
number type, an exception is thrown</li>
 <li>string to enum constant: will throw if the string doesn't represent a 
constant of the expected enum</li>
 </ul>
+<p><span class="conversions">The following table resumes the possible 
conversions between a provided argument type (which is never a primary type) 
and an expected argument type, which can be <span class="strict">strict</span> 
when the expected type is assignable from the provided type without unboxing, 
<span class="implicit">implicit</span> when Java will take care of the 
necessary conversion or unboxing, <span class="explicit">explicit</span> when 
the conversion is provided by the default 2.0 conversion handler, and <span 
class="none">none</span> when no default conversion is possible.</span></p>
+<table class="conversions">
+  <thead>
+    <tr>
+      <th>
+        provided &rarr;<br/>
+        expected &darr;
+      </th>
+      <th>Boolean</th>
+      <th>Character</th>
+      <th>Byte</th>
+      <th>Short</th>
+      <th>Integer</th>
+      <th>Long</th>
+      <th>Float</th>
+      <th>Double</th>
+      <th>String</th>
+      <th>Object</th>
+      <th>null</th>
+    </tr>
+    <tr>
+      <th>boolean</th>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>char</th>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>byte</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>short</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>int</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>long</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>float</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>double</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="implicit">implicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+    </tr>
+    <tr>
+      <th>Boolean</th>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Character</th>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Byte</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Short</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Integer</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Long</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Float</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Double</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Number</th>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="none">none</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>String</th>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="explicit">explicit</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+    <tr>
+      <th>Object</th>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+      <td><span class="strict">strict</span></td>
+    </tr>
+  </thead>
+  <tbody>
+  </tbody>
+</table>
+
 <p>You can provide a custom conversion handler class by use of the 
<code>runtime.conversion.handler</code> property. The class must implement the 
<a 
href="apidocs/org/apache/velocity/util/introspection/ConversionHandler.html"><code>org.apache.Velocity.util.introspection.ConversionHandler</code></a>
 interface. Set it to <code>none</code> to only accept default Java 
conversions, as for Velocity 1.x.</p>
 <p>You can also provide custom <a 
href="apidocs/org/apache/velocity/util/introspection/Converter.html"><code>Converter&lt;T&gt;</code></a>
 objects that handle a conversion towards a specific type:</p>
 <div class="codehilite"><pre><span class="n">package</span> <span 
class="n">mypackage</span><span class="p">;</span>

Modified: velocity/site/production/tools/devel/generic.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/generic.html?rev=1768690&r1=1768689&r2=1768690&view=diff
==============================================================================
--- velocity/site/production/tools/devel/generic.html (original)
+++ velocity/site/production/tools/devel/generic.html Tue Nov  8 13:32:04 2016
@@ -216,8 +216,63 @@ h2:hover > .headerlink, h3:hover > .head
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
 <h2 id="overview">Overview<a class="headerlink" href="#overview" 
title="Permanent link">&para;</a></h2>
 <p>GenericTools is the set of classes that provide basic infrastructure for 
using tools in standard Java SE Velocity projects, as well as a set of tools 
for use in generic Velocity templates. These tools have no Java EE dependencies 
and are often safe to use as "singletons".  Some of them are not thread-safe to 
allow both a no-arg constructor and configurability, but the state-changing 
methods are declared protected with the exception of configure(Map) which 
is--by default--rendered useless after being used just once.  If you require 
strict thread-safety, be cautious in using any configurable tools and consider 
<a 
href="http://wiki.apache.org/velocity/BuildingSecureWebApplications";>restricting
 the abilities of template authors</a> to prevent circumvention of the lockdown 
placed on configuration methods.</p>
+<h2 id="usage">Usage<a class="headerlink" href="#usage" title="Permanent 
link">&para;</a></h2>
+<ul>
+<li>
+<p>Initialization with only standard generic tools, using the default 
configuration file:</p>
+<div class="codehilite"><pre><span class="cm">/* Create tools initialization 
properties */</span><span class="w"></span>
+Map<span class="o">&lt;</span>String<span class="o">,</span><span class="w"> 
</span>Object<span class="o">&gt;</span><span class="w"> </span>properties<span 
class="w"> </span><span class="o">=</span><span class="w"> </span>new<span 
class="w"> </span>HashMap<span class="o">&lt;</span>String<span 
class="o">,</span><span class="w"> </span>Object<span 
class="o">&gt;()</span><span class="err">;</span><span class="w"></span>
+<span class="cm">/* RenderTool needs to know the VelocityEngine. Setting the 
engine will also set the logger. */</span><span class="w"></span>
+properties<span class="o">.</span>put<span class="o">(</span><span 
class="s">&quot;engine&quot;</span><span class="o">,</span><span class="w"> 
</span>engine<span class="o">)</span><span class="err">;</span><span 
class="w"></span>
+<span class="cm">/* If the render tool is not to be used, you can instead just 
set the logger if needed as follow:</span>
+<span class="cm"> *</span>
+<span class="cm"> *   properties.put(&quot;log&quot;, logger);</span>
+<span class="cm"> *</span>
+<span class="cm"> * Otherwise, the engine logger will be used.</span>
+<span class="cm"> * </span>
+<span class="cm"> */</span><span class="w"></span>
+
+<span class="cm">/* Create the manager. autoConfigure and includeDefaults are 
both booleans which default to true. */</span><span class="w"></span>
+ToolManager<span class="w"> </span>manager<span class="w"> </span><span 
class="o">=</span><span class="w"> </span>new<span class="w"> 
</span>ToolManager<span class="o">(</span>autoConfigure<span 
class="o">,</span><span class="w"> </span>includeDefaults<span 
class="o">)</span><span class="err">;</span><span class="w"></span>
+</pre></div>
+
+
+</li>
+<li>
+<p>Initialization using a provided configuration file (to customize tools or 
tune standard tools configuration):</p>
+<div class="codehilite"><pre><span class="cm">/* Create tools initialization 
properties */</span><span class="w"></span>
+Map<span class="o">&lt;</span>String<span class="o">,</span><span class="w"> 
</span>Object<span class="o">&gt;</span><span class="w"> </span>properties<span 
class="w"> </span><span class="o">=</span><span class="w"> </span>new<span 
class="w"> </span>HashMap<span class="o">&lt;</span>String<span 
class="o">,</span><span class="w"> </span>Object<span 
class="o">&gt;()</span><span class="err">;</span><span class="w"></span>
+<span class="cm">/* RenderTool needs to know the VelocityEngine. Setting the 
engine will also set the logger. */</span><span class="w"></span>
+properties<span class="o">.</span>put<span class="o">(</span><span 
class="s">&quot;engine&quot;</span><span class="o">,</span><span class="w"> 
</span>engine<span class="o">)</span><span class="err">;</span><span 
class="w"></span>
+<span class="cm">/* If the render tool is not to be used, you can instead just 
set the logger if needed as follow:</span>
+<span class="cm"> *</span>
+<span class="cm"> *   properties.put(&quot;log&quot;, logger);</span>
+<span class="cm"> *</span>
+<span class="cm"> * Otherwise, the engine logger will be used.</span>
+<span class="cm"> * </span>
+<span class="cm"> */</span><span class="w"></span>
+
+<span class="cm">/* Create the manager. includeDefaults is a boolean which 
defaults to true. */</span><span class="w"></span>
+ToolManager<span class="w"> </span>manager<span class="w"> </span><span 
class="o">=</span><span class="w"> </span>new<span class="w"> 
</span>ToolManager<span class="o">(</span>false<span class="o">,</span><span 
class="w"> </span>includeDefaults<span class="o">)</span><span 
class="err">;</span><span class="w"></span>
+
+<span class="cm">/* Configure the manager</span>
+<span class="cm"> * toolsConfiguration is a filesystem- or class- path towards 
your tools configuration,</span>
+<span class="cm"> * which can be a .xml, a .properties, or a .class of a 
configuration factory which</span>
+<span class="cm"> * has a getConfiguration() method returning a 
FactoryConfiguration object.&quot;);</span>
+<span class="cm"> */</span><span class="w"></span>
+manager<span class="o">.</span>configure<span 
class="o">(</span>toolsConfiguration<span class="o">)</span><span 
class="err">;</span><span class="w"></span>
+</pre></div>
+
+
+</li>
+</ul>
+<p>You can then create Velocity contexts with:</p>
+<div class="codehilite"><pre>    Context context = manager.createContext();
+</pre></div>
+
+
 <h2 id="default-configuration">Default Configuration<a class="headerlink" 
href="#default-configuration" title="Permanent link">&para;</a></h2>
-<p>The default configuration provided for GenericTools is 
[here](http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/tools.xml?view=markup.
 It includes all of the tools listed <a href="#tools">below</a>.</p>
+<p>The default configuration provided for GenericTools is <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/tools.xml?view=markup";>here</a>.
 It includes all of the tools listed <a href="#tools">below</a>.</p>
 <h2 id="dependencies">Dependencies<a class="headerlink" href="#dependencies" 
title="Permanent link">&para;</a></h2>
 <p>The dependencies required for GenericTools vary somewhat depending on which 
tools you use, whether you will rely on core tool management infrastructure, 
and if so, how you choose to configure your toolbox.  More details can be found 
on the <a href="dependencies.html#GenericTools">dependencies chart</a>.</p>
 <h2 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent 
link">&para;</a></h2>

Modified: velocity/site/production/tools/devel/struts.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/struts.html?rev=1768690&r1=1768689&r2=1768690&view=diff
==============================================================================
--- velocity/site/production/tools/devel/struts.html (original)
+++ velocity/site/production/tools/devel/struts.html Tue Nov  8 13:32:04 2016
@@ -224,7 +224,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>We're convinced that once you give Velocity a try, you'll really like 
it.</p>
 <h2 id="default-configuration">Default Configuration<a class="headerlink" 
href="#default-configuration" title="Permanent link">&para;</a></h2>
 <p>VelocityStruts includes both the <a href="generic.html">GenericTools</a> 
and <a href="view.html">VelocityView</a> and adds tools for use in Struts 1.x 
applications. These tools match the functions of the key Struts taglibs and 
provide access to Struts resources, messages, tiles, validation functions and 
more.</p>
-<p>The default configuration provided for <a 
href="struts.html">VelocityStruts</a> is <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/tools.xml?view=markup";>here</a>,
 <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools.xml?view=markup";>here</a>
 and <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/struts/tools.xml?view=markup";>here</a>.</p>
+<p>The default configuration provided for <a 
href="struts.html">VelocityStruts</a> is <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-struts/src/main/resources/org/apache/velocity/tools/generic/tools.xml?view=markup";>here</a>,
 <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml?view=markup";>here</a>
 and <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-struts/src/main/resources/org/apache/velocity/tools/struts/tools.xml?view=markup";>here</a>.</p>
 <h2 id="dependencies">Dependencies<a class="headerlink" href="#dependencies" 
title="Permanent link">&para;</a></h2>
 <p>The dependencies required for VelocityStruts can be found on our <a 
href="dependencies.html#VelocityStruts">dependencies chart</a>.</p>
 <h2 id="tools">Tools<a class="headerlink" href="#tools" title="Permanent 
link">&para;</a></h2>

Modified: velocity/site/production/tools/devel/view.html
URL: 
http://svn.apache.org/viewvc/velocity/site/production/tools/devel/view.html?rev=1768690&r1=1768689&r2=1768690&view=diff
==============================================================================
--- velocity/site/production/tools/devel/view.html (original)
+++ velocity/site/production/tools/devel/view.html Tue Nov  8 13:32:04 2016
@@ -225,7 +225,7 @@ h2:hover > .headerlink, h3:hover > .head
 <li>Logging is made through the SLF4J logging facade. It can be directed to 
the log infrastructure of the Web application (using the logging facility 
provided by the Servlet API) by addind the <a 
href="https://github.com/arkanovicz/webapp-slf4j-logger";>webapp slf4j 
logger</a> into the classpath. </li>
 </ul>
 <h2 id="default-configuration">Default Configuration<a class="headerlink" 
href="#default-configuration" title="Permanent link">&para;</a></h2>
-<p>The default configuration provided for VelocityView is <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/tools.xml?view=markup&quot;";>here</a>
 and <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools.xml";>here</a>.</p>
+<p>The default configuration provided for VelocityView is <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/tools.xml?view=markup&quot;";>here</a>
 and <a 
href="http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml?view=markup";>here</a>.</p>
 <h2 id="dependencies">Dependencies<a class="headerlink" href="#dependencies" 
title="Permanent link">&para;</a></h2>
 <p>The dependencies required for VelocityView can be found on our <a 
href="dependencies.html#VelocityView">dependencies chart</a>.</p>
 <h2 id="velocityview-object">VelocityView Object<a class="headerlink" 
href="#velocityview-object" title="Permanent link">&para;</a></h2>



Reply via email to