velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbris...@apache.org
Subject svn commit: r1768927 [1/2] - in /velocity/site/production: engine/2.0/ engine/devel/ tools/devel/ tools/devel/maven-velocity-tools-plugin/
Date Wed, 09 Nov 2016 12:42:33 GMT
Author: cbrisson
Date: Wed Nov  9 12:42:33 2016
New Revision: 1768927

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

Modified:
    velocity/site/production/engine/2.0/dependencies.html
    velocity/site/production/engine/devel/dependencies.html
    velocity/site/production/tools/devel/changes.html
    velocity/site/production/tools/devel/config-java.html
    velocity/site/production/tools/devel/config-properties.html
    velocity/site/production/tools/devel/config-xml.html
    velocity/site/production/tools/devel/configuration.html
    velocity/site/production/tools/devel/creating-tools.html
    velocity/site/production/tools/devel/dependencies.html
    velocity/site/production/tools/devel/frameworks.html
    velocity/site/production/tools/devel/generic.html
    velocity/site/production/tools/devel/index.html
    velocity/site/production/tools/devel/left.nav
    velocity/site/production/tools/devel/maven-velocity-tools-plugin/dependency-convergence.html
    velocity/site/production/tools/devel/standalone.html
    velocity/site/production/tools/devel/tools-summary.html
    velocity/site/production/tools/devel/upgrading.html
    velocity/site/production/tools/devel/view-layoutservlet.html
    velocity/site/production/tools/devel/view-servlet.html
    velocity/site/production/tools/devel/view-tag.html
    velocity/site/production/tools/devel/view.html

Modified: velocity/site/production/engine/2.0/dependencies.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.0/dependencies.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/engine/2.0/dependencies.html (original)
+++ velocity/site/production/engine/2.0/dependencies.html Wed Nov  9 12:42:33 2016
@@ -225,9 +225,7 @@ 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="velocity-dependencies">Velocity Dependencies<a class="headerlink" href="#velocity-dependencies" title="Permanent link">&para;</a></h2>
 <p>When building from sources, Maven should fetch all needed dependencies. At runtime, velocity only needs slf4j-api, and one of the slf4j bindings (needed classes from commons-lang and commons-collections are incorporated using <a href="https://maven.apache.org/plugins/maven-shade-plugin/">"shading"</a>).</p>
-<p>The following table lists all needed jars
-Velocity has a number of external jar dependencies. However, not all of these are needed every time. This document should help you do decide which jars must also be present if you want to integrate Velocity into your application.</p>
-<p>All of these jars must be present when building Apache Velocity. The build process downloads all of them automatically from the Internet.</p>
+<p>The following table lists all needed jars.</p>
 <table class="table">
 <thead>
 <tr>
@@ -242,7 +240,7 @@ Velocity has a number of external jar de
 <tbody>
 <tr>
 <td>slf4j-api</td>
-<td>1.7.12</td>
+<td>1.7.21</td>
 <td>Yes</td>
 <td>Yes</td>
 <td>Yes</td>
@@ -254,11 +252,11 @@ Velocity has a number of external jar de
 <td>Yes</td>
 <td>No</td>
 <td>No</td>
-<td>Dependancy upon commons-collections-3.x is needed only by some deprecated classes and methods, so as to maintain backward compatibility, and will be dropped in a future version.</td>
+<td></td>
 </tr>
 <tr>
 <td>commons-lang</td>
-<td>3.4</td>
+<td>3.5</td>
 <td>Yes</td>
 <td>No</td>
 <td>No</td>
@@ -266,7 +264,7 @@ Velocity has a number of external jar de
 </tr>
 <tr>
 <td>junit</td>
-<td>3.8.1</td>
+<td>4.12</td>
 <td>No</td>
 <td>Yes</td>
 <td>No</td>
@@ -274,7 +272,7 @@ Velocity has a number of external jar de
 </tr>
 <tr>
 <td>hsqldb</td>
-<td>1.7.1</td>
+<td>2.3.4</td>
 <td>No</td>
 <td>Yes</td>
 <td>No</td>
@@ -282,7 +280,7 @@ Velocity has a number of external jar de
 </tr>
 <tr>
 <td>commons-io</td>
-<td>2.4</td>
+<td>2.5</td>
 <td>No</td>
 <td>Yes</td>
 <td>No</td>
@@ -290,31 +288,23 @@ Velocity has a number of external jar de
 </tr>
 <tr>
 <td>slf4j-simple</td>
-<td>1.7.12</td>
+<td>1.7.21</td>
 <td>No</td>
 <td>Yes</td>
 <td>No</td>
 <td>Your application will need <em>one</em> SLF4J binding, see below</td>
 </tr>
-<tr>
-<td>servlet-api</td>
-<td>2.5</td>
-<td>No</td>
-<td>No</td>
-<td>No</td>
-<td>Only needed in the context of a web application. Should normally be supplied by the servlet container.</td>
-</tr>
 </tbody>
 </table>
-<p>At runtime, Velocity will require an SLF4J binding to be present in the path. Typically, one of:</p>
+<p>At runtime, Velocity Engine only requires the SLF4J API jar, and will require an SLF4J binding to be present in the path. Typically, one of:</p>
 <ul>
-<li><a href="http://software.clapper.org/avsl/">AVSL</a></li>
-<li><a href="http://www.slf4j.org/api/org/slf4j/impl/JDK14LoggerAdapter.html">SLF4J JDK14 Adapter</a></li>
-<li><a href="http://www.slf4j.org/api/org/slf4j/impl/Log4jLoggerAdapter.html">SLF4J Log4J Adapter</a></li>
-<li><a href="http://www.slf4j.org/api/org/slf4j/impl/SimpleLogger.html">SLF4J Simple Logger</a></li>
-<li><a href="http://www.slf4j.org/android/">SLF4J Android</a></li>
-<li><a href="http://logback.qos.ch/">LOGBack</a></li>
-<li><a href="https://github.com/arkanovicz/webapp-slf4j-logger">WebApp SLF4J Logger</a></li>
+<li><a href="http://software.clapper.org/avsl/">AVSL</a> - “A Very Simple Logger”</li>
+<li><a href="http://www.slf4j.org/api/org/slf4j/impl/JDK14LoggerAdapter.html">SLF4J JDK14 Adapter</a> - redirect logs towards Java 1.4+ logging framework</li>
+<li><a href="http://www.slf4j.org/api/org/slf4j/impl/Log4jLoggerAdapter.html">SLF4J Log4J Adapter</a> - redirects logs towards Log4J</li>
+<li><a href="http://www.slf4j.org/api/org/slf4j/impl/SimpleLogger.html">SLF4J Simple Logger</a> - minimalistic logger</li>
+<li><a href="http://www.slf4j.org/android/">SLF4J Android</a> - logger for Android platforms</li>
+<li><a href="http://logback.qos.ch/">LogBack</a> - full featured logging framework</li>
+<li><a href="https://github.com/arkanovicz/webapp-slf4j-logger">WebApp SLF4J Logger</a> - redirects logs towards the J2EE container log</li>
 </ul></div></div>
         <hr/>
         <div id="copyright">

Modified: velocity/site/production/engine/devel/dependencies.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/dependencies.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/engine/devel/dependencies.html (original)
+++ velocity/site/production/engine/devel/dependencies.html Wed Nov  9 12:42:33 2016
@@ -225,9 +225,7 @@ 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="velocity-dependencies">Velocity Dependencies<a class="headerlink" href="#velocity-dependencies" title="Permanent link">&para;</a></h2>
 <p>When building from sources, Maven should fetch all needed dependencies. At runtime, velocity only needs slf4j-api, and one of the slf4j bindings (needed classes from commons-lang and commons-collections are incorporated using <a href="https://maven.apache.org/plugins/maven-shade-plugin/">"shading"</a>).</p>
-<p>The following table lists all needed jars
-Velocity has a number of external jar dependencies. However, not all of these are needed every time. This document should help you do decide which jars must also be present if you want to integrate Velocity into your application.</p>
-<p>All of these jars must be present when building Apache Velocity. The build process downloads all of them automatically from the Internet.</p>
+<p>The following table lists all needed jars.</p>
 <table class="table">
 <thead>
 <tr>
@@ -242,7 +240,7 @@ Velocity has a number of external jar de
 <tbody>
 <tr>
 <td>slf4j-api</td>
-<td>1.7.12</td>
+<td>1.7.21</td>
 <td>Yes</td>
 <td>Yes</td>
 <td>Yes</td>
@@ -254,11 +252,11 @@ Velocity has a number of external jar de
 <td>Yes</td>
 <td>No</td>
 <td>No</td>
-<td>Dependancy upon commons-collections-3.x is needed only by some deprecated classes and methods, so as to maintain backward compatibility, and will be dropped in a future version.</td>
+<td></td>
 </tr>
 <tr>
 <td>commons-lang</td>
-<td>3.4</td>
+<td>3.5</td>
 <td>Yes</td>
 <td>No</td>
 <td>No</td>
@@ -266,7 +264,7 @@ Velocity has a number of external jar de
 </tr>
 <tr>
 <td>junit</td>
-<td>3.8.1</td>
+<td>4.12</td>
 <td>No</td>
 <td>Yes</td>
 <td>No</td>
@@ -274,7 +272,7 @@ Velocity has a number of external jar de
 </tr>
 <tr>
 <td>hsqldb</td>
-<td>1.7.1</td>
+<td>2.3.4</td>
 <td>No</td>
 <td>Yes</td>
 <td>No</td>
@@ -282,7 +280,7 @@ Velocity has a number of external jar de
 </tr>
 <tr>
 <td>commons-io</td>
-<td>2.4</td>
+<td>2.5</td>
 <td>No</td>
 <td>Yes</td>
 <td>No</td>
@@ -290,31 +288,23 @@ Velocity has a number of external jar de
 </tr>
 <tr>
 <td>slf4j-simple</td>
-<td>1.7.12</td>
+<td>1.7.21</td>
 <td>No</td>
 <td>Yes</td>
 <td>No</td>
 <td>Your application will need <em>one</em> SLF4J binding, see below</td>
 </tr>
-<tr>
-<td>servlet-api</td>
-<td>2.5</td>
-<td>No</td>
-<td>No</td>
-<td>No</td>
-<td>Only needed in the context of a web application. Should normally be supplied by the servlet container.</td>
-</tr>
 </tbody>
 </table>
-<p>At runtime, Velocity will require an SLF4J binding to be present in the path. Typically, one of:</p>
+<p>At runtime, Velocity Engine only requires the SLF4J API jar, and will require an SLF4J binding to be present in the path. Typically, one of:</p>
 <ul>
-<li><a href="http://software.clapper.org/avsl/">AVSL</a></li>
-<li><a href="http://www.slf4j.org/api/org/slf4j/impl/JDK14LoggerAdapter.html">SLF4J JDK14 Adapter</a></li>
-<li><a href="http://www.slf4j.org/api/org/slf4j/impl/Log4jLoggerAdapter.html">SLF4J Log4J Adapter</a></li>
-<li><a href="http://www.slf4j.org/api/org/slf4j/impl/SimpleLogger.html">SLF4J Simple Logger</a></li>
-<li><a href="http://www.slf4j.org/android/">SLF4J Android</a></li>
-<li><a href="http://logback.qos.ch/">LOGBack</a></li>
-<li><a href="https://github.com/arkanovicz/webapp-slf4j-logger">WebApp SLF4J Logger</a></li>
+<li><a href="http://software.clapper.org/avsl/">AVSL</a> - “A Very Simple Logger”</li>
+<li><a href="http://www.slf4j.org/api/org/slf4j/impl/JDK14LoggerAdapter.html">SLF4J JDK14 Adapter</a> - redirect logs towards Java 1.4+ logging framework</li>
+<li><a href="http://www.slf4j.org/api/org/slf4j/impl/Log4jLoggerAdapter.html">SLF4J Log4J Adapter</a> - redirects logs towards Log4J</li>
+<li><a href="http://www.slf4j.org/api/org/slf4j/impl/SimpleLogger.html">SLF4J Simple Logger</a> - minimalistic logger</li>
+<li><a href="http://www.slf4j.org/android/">SLF4J Android</a> - logger for Android platforms</li>
+<li><a href="http://logback.qos.ch/">LogBack</a> - full featured logging framework</li>
+<li><a href="https://github.com/arkanovicz/webapp-slf4j-logger">WebApp SLF4J Logger</a> - redirects logs towards the J2EE container log</li>
 </ul></div></div>
         <hr/>
         <div id="copyright">

Modified: velocity/site/production/tools/devel/changes.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/changes.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/changes.html (original)
+++ velocity/site/production/tools/devel/changes.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>
@@ -232,11 +225,6 @@ h2:hover > .headerlink, h3:hover > .head
         <td/>
       </tr>
       <tr>
-        <td>2.0.1-SNAPSHOT</td>
-        <td>In Subversion</td>
-        <td/>
-      </tr>
-      <tr>
         <td>2.0</td>
         <td>2010-05-10</td>
         <td/>
@@ -293,6 +281,41 @@ h2:hover > .headerlink, h3:hover > .head
         <td>
           <img src="images/fix.png"/>
         </td>
+        <td> use static logging in Tools classes . </td>
+        <td>cbrisson</td>
+      </tr>
+      <tr>
+        <td>
+          <img src="images/add.png"/>
+        </td>
+        <td> new generic LogTool to emit logs from inside templates . </td>
+        <td>cbrisson</td>
+      </tr>
+      <tr>
+        <td>
+          <img src="images/add.png"/>
+        </td>
+        <td> drop unmaintained Struts tools . </td>
+        <td>cbrisson</td>
+      </tr>
+      <tr>
+        <td>
+          <img src="images/add.png"/>
+        </td>
+        <td> full review of BrowserTool implementation, update user-agents detection algorithm . </td>
+        <td>cbrisson</td>
+      </tr>
+      <tr>
+        <td>
+          <img src="images/add.png"/>
+        </td>
+        <td> upgraded to servlet API 3.0.1 . </td>
+        <td>cbrisson</td>
+      </tr>
+      <tr>
+        <td>
+          <img src="images/fix.png"/>
+        </td>
         <td> Removed deprecated 1.x configuration handling and depreacted 1.x tools initialization support . </td>
         <td>cbrisson</td>
       </tr>
@@ -338,24 +361,12 @@ h2:hover > .headerlink, h3:hover > .head
         <td> Switched log system facade to SLF4j . </td>
         <td>cbrisson</td>
       </tr>
-    </tbody>
-  </table>
-</p><h3>Release 2.0.1-SNAPSHOT - In Subversion</h3><p>
-  <table class="standard">
-    <thead>
-      <tr>
-        <th>Type</th>
-        <th>Changes</th>
-        <th>Bye</th>
-      </tr>
-    </thead>
-    <tbody>
       <tr>
         <td>
           <img src="images/add.png"/>
         </td>
-        <td> Upgraded to Dom4j 1.6.1 and Velocity Engine 1.6.4 . </td>
-        <td>nbubna</td>
+        <td> Upgraded to JUnit 4.12, Servlet API 3.0.1, Dom4j 1.6.1, commons-beanutils 1.9.3, commons-digester 3.2, and Velocity Engine 2.0. . </td>
+        <td>cbrisson</td>
       </tr>
       <tr>
         <td>
@@ -396,13 +407,6 @@ h2:hover > .headerlink, h3:hover > .head
         <td>
           <img src="images/fix.png"/>
         </td>
-        <td> changed StrutsLinkTool's parent class to restore API backward-compatibility . Fixes <a href="https://issues.apache.org/jira/browse/VELTOOLS-145">VELTOOLS-145</a>. </td>
-        <td>schultz</td>
-      </tr>
-      <tr>
-        <td>
-          <img src="images/fix.png"/>
-        </td>
         <td> fixed a LinkTool bug with parametersToIgnore management . Fixes <a href="https://issues.apache.org/jira/browse/VELTOOLS-148">VELTOOLS-148</a>. </td>
         <td>schultz</td>
       </tr>
@@ -414,13 +418,6 @@ h2:hover > .headerlink, h3:hover > .head
         <td>schultz</td>
       </tr>
       <tr>
-        <td>
-          <img src="images/add.png"/>
-        </td>
-        <td> Added StrutsLinkTool.action and StrutsLinkTool.forward methods as replacements for StrutsLinkTool.setAction and StrutsLinkTool.setForward to match other new LinkTool methods like LinkTool.relative and LinkTool.absolute . </td>
-        <td>schultz</td>
-      </tr>
-      <tr>
         <td>
           <img src="images/fix.png"/>
         </td>

Modified: velocity/site/production/tools/devel/config-java.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/config-java.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/config-java.html (original)
+++ velocity/site/production/tools/devel/config-java.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>

Modified: velocity/site/production/tools/devel/config-properties.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/config-properties.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/config-properties.html (original)
+++ velocity/site/production/tools/devel/config-properties.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>

Modified: velocity/site/production/tools/devel/config-xml.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/config-xml.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/config-xml.html (original)
+++ velocity/site/production/tools/devel/config-xml.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>
@@ -215,7 +208,7 @@ 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="configuration-using-xml">Configuration using XML<a class="headerlink" href="#configuration-using-xml" title="Permanent link">&para;</a></h2>
-<p>Providing an xml format configuration file is still the standard, but unlike VelocityTools 1.x, it is no longer necessary at all, thanks to the introduction of default configurations. The default configurations for <a href="generic.html">GenericTools</a>, <a href="view.html">VelocityView</a> and <a href="struts.html">VelocityStruts</a> are all defined via XML.</p>
+<p>Providing an xml format configuration file is still the standard, but unlike VelocityTools 1.x, it is no longer necessary at all, thanks to the introduction of default configurations. The default configurations for <a href="generic.html">GenericTools</a> and <a href="view.html">VelocityView</a> are all defined via XML.</p>
 <p>Here's a somewhat thorough example:</p>
 <div class="codehilite"><pre><span class="cp">&lt;?xml version=&quot;1.0&quot;?&gt;</span>
 <span class="nt">&lt;tools&gt;</span>

Modified: velocity/site/production/tools/devel/configuration.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/configuration.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/configuration.html (original)
+++ velocity/site/production/tools/devel/configuration.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>

Modified: velocity/site/production/tools/devel/creating-tools.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/creating-tools.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/creating-tools.html (original)
+++ velocity/site/production/tools/devel/creating-tools.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>
@@ -328,7 +321,7 @@ public class PagerTool
 </pre></div>
 
 
-<p>This, of course, assumes that quiet notation is not being used for that reference.  For this reason, it may be prudent to give your tool access to a logging facility in order to log exceptions and make sure important errors are not silently swallowed. Standard tool management for VelocityTools (even just GenericTools) makes the result of <code>velocityEngine.getLog()</code> available to tools as a property under the key "log".  So log access can be added as simply as adding a <code>public void setLog(org.slf4j.Logger log)</code> method and utilizing the provided Log instance.</p>
+<p>This, of course, assumes that quiet notation is not being used for that reference.  For this reason, it may be prudent to give your tool access to a logging facility in order to log exceptions and make sure important errors are not silently swallowed. Standard tool management for VelocityTools (even just GenericTools) makes the result of <code>velocityEngine.getLog()</code> available to tools as a property under the key "log".  So log access can be added as simply as adding a <code>public void setLog(org.slf4j.Logger log)</code> method and utilizing the provided Log instance. Or, simply call <code>LoggerFactory.getLogger(MyTool.class)</code> to get a static logger dedicated to your custom tool.</p>
 <p>If you wish to toggle the exception catching or, more importantly, if you prefer to catch exceptions globally with a Velocity Event Handler, then have your tool watch for the "catchExceptions" property.  This is <code>false</code> by default, but if the VelocityEngine has a MethodExceptionEventHandler configured, then it will be automatically set to <code>true</code>.  Again, just add a <code>public void setCatchExceptions(boolean catch)</code> method to your tool or watch for the "catchExceptions" property in your <code>public void configure(Map props)</code> method.  See <a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a> for an example of this.</p>
 <h3 id="be-flexible">Be Flexible<a class="headerlink" href="#be-flexible" title="Permanent link">&para;</a></h3>
 <p>Variables in templates are strongly, but dynamically typed.  As the current type (or whole subject of typing) is often not transparently obvious to the person working on the template, it is best to accept <code>Object</code> for most method parameters and handle any necessary conversions in your tool (either through overloading or actual conversion). This way template authors and maintainers don't have to worry about the variable being passed to tool methods.</p>

Modified: velocity/site/production/tools/devel/dependencies.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/dependencies.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/dependencies.html (original)
+++ velocity/site/production/tools/devel/dependencies.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>
@@ -216,7 +209,8 @@ 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="dependencies">Dependencies<a class="headerlink" href="#dependencies" title="Permanent link">&para;</a></h2>
 <p>VelocityTools requires certain external jar dependencies at different times. These charts should help you determine which jars you need and when.</p>
-<p class="note">Note: Java version 1.5+ is required for compilation, testing and use of VelocityTools 2.x.
+<p>Since VelocityTools relies on Velocity Engine, please also check <a href="/engine/2.0/dependencies.html">Engine dependencies</a>.</p>
+<p class="note">Note: Java version 1.7+ is required for compilation, testing and use of VelocityTools 3.x.
 </p>
 <h3 id="generictools">GenericTools<a class="headerlink" href="#generictools" title="Permanent link">&para;</a></h3>
 <table class="table">
@@ -225,6 +219,7 @@ h2:hover > .headerlink, h3:hover > .head
 <th>Jar Name</th>
 <th>Version</th>
 <th>Compile</th>
+<th>Tests</th>
 <th>Runtime</th>
 <th>Notes</th>
 </tr>
@@ -235,41 +230,47 @@ h2:hover > .headerlink, h3:hover > .head
 <td>1.7.0</td>
 <td>Yes</td>
 <td>Yes</td>
+<td>Yes</td>
 <td>Required for core infrastructure, <a href="apidocs/org/apache/velocity/tools/generic/MathTool.html">MathTool</a> and <a href="apidocs/org/apache/velocity/tools/generic/SortTool.html">SortTool</a></td>
 </tr>
 <tr>
 <td>commons-digester</td>
-<td>1.8</td>
+<td>3.2</td>
+<td>Yes</td>
 <td>Yes</td>
 <td>Yes</td>
 <td>Required for <a href="config-xml.html">xml configuration</a></td>
 </tr>
 <tr>
-<td>slf4j-api</td>
-<td>1.7.2+</td>
+<td>dom4j</td>
+<td>1.6.1+</td>
 <td>Yes</td>
+<td>No</td>
 <td>Yes</td>
-<td>Required for Velocity Engine and Velocity Tools</td>
+<td>Required only for <a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a></td>
 </tr>
 <tr>
-<td>jcl-over-slf4j</td>
-<td>1.7.12</td>
+<td>jaxen</td>
+<td>1.1.6+</td>
 <td>Yes</td>
+<td>No</td>
 <td>Yes</td>
-<td>Required for Digester</td>
+<td>Required only for <a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a> (dom4j dependency)</td>
 </tr>
 <tr>
-<td>dom4j</td>
-<td>1.1+</td>
+<td>junit</td>
+<td>4.12</td>
+<td>No</td>
 <td>Yes</td>
 <td>No</td>
-<td>Required only for <a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a></td>
+<td>Only required for tests.</td>
 </tr>
 <tr>
 <td>velocity</td>
 <td>2.0+</td>
 <td>Yes</td>
 <td>Yes</td>
+<td>Yes</td>
 <td>Required for core infrastructure, <a href="apidocs/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a>, <a href="apidocs/org/apache/velocity/tools/generic/LinkTool.html">LinkTool</a>, <a href="apidocs/org/apache/velocity/tools/generic/LoopTool.html">LoopTool</a>, <a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a> and <a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a></td>
 </tr>
 </tbody>
@@ -281,167 +282,57 @@ h2:hover > .headerlink, h3:hover > .head
 <th>Jar Name</th>
 <th>Version</th>
 <th>Compile</th>
+<th>Tests</th>
 <th>Runtime</th>
 <th>Notes</th>
 </tr>
 </thead>
 <tbody>
 <tr>
-<td>commons-beanutils</td>
-<td>1.7.0</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for core infrastructure, <a href="apidocs/org/apache/velocity/tools/generic/MathTool.html">MathTool</a> and <a href="apidocs/org/apache/velocity/tools/generic/SortTool.html">SortTool</a></td>
-</tr>
-<tr>
-<td>commons-digester</td>
-<td>1.8</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for <a href="config-xml.html">xml configuration</a></td>
-</tr>
-<tr>
-<td>slf4j-api</td>
-<td>1.7.2+</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for Velocity Engine and Velocity Tools</td>
-</tr>
-<tr>
-<td>jcl-over-slf4j</td>
-<td>1.7.12</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for Digester</td>
-</tr>
-<tr>
-<td>dom4j</td>
-<td>1.1+</td>
-<td>Yes</td>
+<td>junit</td>
+<td>4.12</td>
 <td>No</td>
-<td>Required only for <a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a></td>
-</tr>
-<tr>
-<td>servletapi</td>
-<td>2.3+</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for all <a href="apidocs/org/apache/velocity/tools/view/package-summary.html">VelocityView</a> tools except for <a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a></td>
-</tr>
-<tr>
-<td>velocity</td>
-<td>2.0+</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for core infrastructure, <a href="apidocs/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a>, <a href="apidocs/org/apache/velocity/tools/generic/LoopTool.html">LoopTool</a>, <a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a>, <a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a>, <a href="apidocs/org/apache/velocity/tools/view/AbstractSearchTool.html">AbstractSearchTool</a>, <a href="apidocs/org/apache/velocity/tools/view/ContextTool.html">ContextTool</a> and <a href="apidocs/org/apache/velocity/tools/view/LinkTool.html">LinkTool</a></td>
-</tr>
-</tbody>
-</table>
-<h3 id="velocitystruts">VelocityStruts<a class="headerlink" href="#velocitystruts" title="Permanent link">&para;</a></h3>
-<table class="table">
-<thead>
-<tr>
-<th>Jar Name</th>
-<th>Version</th>
-<th>Compile</th>
-<th>Runtime</th>
-<th>Notes</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>commons-beanutils</td>
-<td>1.7.0</td>
-<td>Yes</td>
 <td>Yes</td>
-<td>Required for core infrastructure, <a href="apidocs/org/apache/velocity/tools/generic/MathTool.html">MathTool</a> and <a href="apidocs/org/apache/velocity/tools/generic/SortTool.html">SortTool</a></td>
-</tr>
-<tr>
-<td>commons-chain</td>
-<td>1.1</td>
 <td>No</td>
-<td>Yes</td>
-<td>Struts 1.3+ requires this.</td>
-</tr>
-<tr>
-<td>commons-digester</td>
-<td>1.8</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for <a href="config-xml.html">xml configuration</a></td>
-</tr>
-<tr>
-<td>slf4j-api</td>
-<td>1.7.2+</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for Velocity Engine and Velocity Tools</td>
-</tr>
-<tr>
-<td>jcl-over-slf4j</td>
-<td>1.7.12</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for Struts and Digester</td>
+<td>Only required for tests.</td>
 </tr>
 <tr>
-<td>dom4j</td>
-<td>1.1+</td>
-<td>Yes</td>
+<td>easymock</td>
+<td>3.4</td>
 <td>No</td>
-<td>Required only for <a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a></td>
-</tr>
-<tr>
-<td>struts-core</td>
-<td>1.3.8</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for all <a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">VelocityStruts</a> tools</td>
-</tr>
-<tr>
-<td>struts-taglib</td>
-<td>1.3.8</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for <a href="apidocs/org/apache/velocity/tools/struts/FormTool.html">FormTool</a>, <a href="apidocs/org/apache/velocity/tools/struts/SecureLinkTool.html">SecureLinkTool</a> and <a href="apidocs/org/apache/velocity/tools/struts/StrutsLinkTool.html">StrutsLinkTool</a></td>
-</tr>
-<tr>
-<td>struts-tiles</td>
-<td>1.3.8</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for <a href="apidocs/org/apache/velocity/tools/struts/TilesTool.html">TilesTool</a></td>
-</tr>
-<tr>
-<td>ssl-ext</td>
-<td>1.2</td>
 <td>Yes</td>
 <td>No</td>
-<td>Required for <a href="apidocs/org/apache/velocity/tools/struts/SecureLinkTool.html">SecureLinkTool</a></td>
-</tr>
-<tr>
-<td>commons-validator</td>
-<td>1.3.1</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Required for <a href="apidocs/org/apache/velocity/tools/struts/ValidatorTool.html">ValidatorTool</a></td>
+<td>Only required for tests.</td>
 </tr>
 <tr>
 <td>servletapi</td>
-<td>2.3+</td>
+<td>3.0.1+</td>
 <td>Yes</td>
 <td>Yes</td>
-<td>Required for all <a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">VelocityStruts</a> tools and all <a href="apidocs/org/apache/velocity/tools/view/package-summary.html">VelocityView</a> tools except for <a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a></td>
+<td>No</td>
+<td>Required for all <a href="apidocs/org/apache/velocity/tools/view/package-summary.html">VelocityView</a> tools except for <a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a>. Provided by the J2EE container at runtime.</td>
 </tr>
 <tr>
-<td>velocity</td>
-<td>2.0+</td>
+<td>velocity-tools-generic</td>
+<td>3.0</td>
 <td>Yes</td>
 <td>Yes</td>
-<td>Required for core infrastructure, <a href="apidocs/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a>, <a href="apidocs/org/apache/velocity/tools/generic/LoopTool.html">LoopTool</a>, <a href="apidocs/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a>, <a href="apidocs/org/apache/velocity/tools/generic/XmlTool.html">XmlTool</a>, <a href="apidocs/org/apache/velocity/tools/view/AbstractSearchTool.html">AbstractSearchTool</a>, <a href="apidocs/org/apache/velocity/tools/view/ContextTool.html">ContextTool</a>, <a href="apidocs/org/apache/velocity/tools/view/LinkTool.html">LinkTool</a>,  <a href="apidocs/org/apache/velocity/tools/view/MultiViewsTool.html">MultiViewsTool</a>, <a href="apidocs/org/apache/velocity/tools/struts/SecureLinkTool.html">SecureLinkTool</a>, <a href="apidocs/org/apache/velocity/tools/struts/StrutsLinkTool.html">StrutsLinkTool</a>, <a href="apidocs/org/apache/velocity/tools/struts/TilesTool.html">TilesTool</a> and <a href="apidocs/org/a
 pache/velocity/tools/struts/MessageTool.html">MessageTool</a></td>
+<td>Yes</td>
+<td></td>
 </tr>
 </tbody>
-</table></div></div>
+</table>
+<h2 id="slf4j-binding">SLF4J Binding<a class="headerlink" href="#slf4j-binding" title="Permanent link">&para;</a></h2>
+<p>At runtime, Velocity Tools will require an SLF4J binding to be present in the path. Typically, one of:</p>
+<ul>
+<li><a href="http://software.clapper.org/avsl/">AVSL</a> - “A Very Simple Logger”</li>
+<li><a href="http://www.slf4j.org/api/org/slf4j/impl/JDK14LoggerAdapter.html">SLF4J JDK14 Adapter</a> - redirect logs towards Java 1.4+ logging framework</li>
+<li><a href="http://www.slf4j.org/api/org/slf4j/impl/Log4jLoggerAdapter.html">SLF4J Log4J Adapter</a> - redirects logs towards Log4J</li>
+<li><a href="http://www.slf4j.org/api/org/slf4j/impl/SimpleLogger.html">SLF4J Simple Logger</a> - minimalistic logger</li>
+<li><a href="http://www.slf4j.org/android/">SLF4J Android</a> - logger for Android platforms</li>
+<li><a href="http://logback.qos.ch/">LogBack</a> - full featured logging framework</li>
+<li><a href="https://github.com/arkanovicz/webapp-slf4j-logger">WebApp SLF4J Logger</a> - redirects logs towards the J2EE container log</li>
+</ul></div></div>
         <hr/>
         <div id="copyright">
           Copyright &#169; 2016 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.

Modified: velocity/site/production/tools/devel/frameworks.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/frameworks.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/frameworks.html (original)
+++ velocity/site/production/tools/devel/frameworks.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>

Modified: velocity/site/production/tools/devel/generic.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/generic.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/generic.html (original)
+++ velocity/site/production/tools/devel/generic.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>

Modified: velocity/site/production/tools/devel/index.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/index.html?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/index.html (original)
+++ velocity/site/production/tools/devel/index.html Wed Nov  9 12:42:33 2016
@@ -165,7 +165,6 @@ h2:hover > .headerlink, h3:hover > .head
 <ul>
 <li><a href="generic.html">GenericTools</a></li>
 <li><a href="view.html">VelocityView</a></li>
-<li><a href="struts.html">VelocityStruts</a></li>
 </ul>
 <h2 id="docs">Docs<a class="headerlink" href="#docs" title="Permanent link">&para;</a></h2>
 <ul>
@@ -183,17 +182,11 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="changes.html">Changes</a></li>
-<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="dependencies.html">Dependencies</a></li>
+<li><a href="index.html#helping-out">Participating</a></li>
 <li><a href="http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository">Source Code</a></li>
 <li><a href="http://issues.apache.org/jira/browse/VELTOOLS">Report Issue</a></li>
 </ul>
-<h2 id="struts">Struts<a class="headerlink" href="#struts" title="Permanent link">&para;</a></h2>
-<ul>
-<li><a href="struts.html">Overview</a></li>
-<li><a href="struts-user-guide.html">User Guide</a></li>
-<li><a href="apidocs/org/apache/velocity/tools/struts/package-summary.html">Tools</a></li>
-</ul>
           
           <div id="bottom-nav">
             <img src="/images/pbv90x30.png"/>
@@ -216,20 +209,19 @@ 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>A Velocity "tool" is just a POJO (plain old java object) that is "useful" in a template and is not meant to be rendered in the output.  In other words, a "tool" (in Velocity-speak) is meant to be used but not seen themselves (e.g. for formatting dates or numbers, url building, etc).</p>
-<p>The VelocityTools project is, first of all, a collection of such useful Java classes, as well as infrastructure to easily, automatically and transparently make these tools available to your Velocity templates.  Other aims of the project include providing easy integration of Velocity into the view-layer of your web applications (via the <a href="view-tag.html">VelocityViewTag</a>, <a href="view-servlet.html">VelocityViewServlet</a>), the <a href="maven-velocity-tools-plugin/index.html">Maven Plugin</a>  and integration with Struts 1.x applications.</p>
-<p>In recognition of these varying aims, the VelocityTools project is divided into three parts: <a href="generic.html">GenericTools</a>, [VelocityView](view.html and <a href="struts.html">VelocityStruts</a>. Each of these parts builds on the previous one and has its own JAR distribution.</p>
+<p>The VelocityTools project is, first of all, a collection of such useful Java classes, as well as infrastructure to easily, automatically and transparently make these tools available to your Velocity templates.  Other aims of the project include providing easy integration of Velocity into the view-layer of your web applications (via the <a href="view-tag.html">VelocityViewTag</a>, <a href="view-servlet.html">VelocityViewServlet</a>) and the <a href="maven-velocity-tools-plugin/index.html">Maven Plugin</a>.</p>
+<p>In recognition of these varying aims, the VelocityTools project is divided into two parts: <a href="generic.html">GenericTools</a> and [VelocityView](view.html. Each of these parts builds on the previous one and has its own JAR distribution.</p>
 <h3 id="generictools">GenericTools<a class="headerlink" href="#generictools" title="Permanent link">&para;</a></h3>
 <p><a href="generic.html">GenericTools</a> 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.  Perenial favorites here are the DateTool, NumberTool and RenderTool, though there are many others available as well.</p>
 <h3 id="velocityview">VelocityView<a class="headerlink" href="#velocityview" title="Permanent link">&para;</a></h3>
 <p><a href="view.html">VelocityView</a> includes all of the <a href="generic.html">GenericTools</a> structure and specialized tools for using Velocity in the view layer of web applications (Java EE projects). This includes the <a href="view-servlet.html">VelocityViewServlet</a> or <a href="view-layoutservlet.html">VelocityLayoutServlet</a> for processing Velocity template requests, the <a href="view-tag.html">VelocityViewTag</a> for embedding Velocity in JSP and a <a href="maven-velocity-tools-plugin/index.html">Maven plugin</a> to embed JSP tag libraries in Velocity templates. Popular tools here are the LinkTool and the ParameterTool.</p>
-<h3 id="velocitystruts">VelocityStruts<a class="headerlink" href="#velocitystruts" title="Permanent link">&para;</a></h3>
-<p>[VelocityStruts]struts.html includes both [VelocityView](view.html and <a href="generic.html">GenericTools</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>It is worth noting that these tools, being POJOs (though some require a little configuration) are generally useful and may be used within your java classes or even other template languages, though you may need to instantiate and configure them manually (not difficult) to do so.  VelocityTools 2 has been designed with this in mind.  Ask on the user mailing list if you have questions about using VelocityTools without Velocity.</p>
-<h2 id="whats-new-in-21">What's new in 2.1<a class="headerlink" href="#whats-new-in-21" title="Permanent link">&para;</a></h2>
-<p>Velocity Tools 2.1 has the following new features:</p>
+<h2 id="whats-new-in-30">What's new in 3.0<a class="headerlink" href="#whats-new-in-30" title="Permanent link">&para;</a></h2>
+<p>Velocity Tools 3.0 new features:</p>
 <ul>
 <li>A <a href="maven-velocity-tools-plugin/index.html">Maven plugin</a> to allow embedding of JSP tag libraries inside Velocity templates.</li>
+<li>New generic <a href="apidocs/org/apache/velocity/tools/generic/LogTool.html">LogTool</a>.</li>
 </ul>
+<p>See the <a href="upgrading.html">Upgrading section</a> for a complete list of changes.</p>
 <h2 id="why-20">Why 2.0?<a class="headerlink" href="#why-20" title="Permanent link">&para;</a></h2>
 <p>Those already familiar with VelocityTools 1.x may be curious about the goals and motivations behind developing VelocityTools 2. In planning and developing the 2.0 release, there were three main goals:</p>
 <ul>

Modified: velocity/site/production/tools/devel/left.nav
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/left.nav?rev=1768927&r1=1768926&r2=1768927&view=diff
==============================================================================
--- velocity/site/production/tools/devel/left.nav (original)
+++ velocity/site/production/tools/devel/left.nav Wed Nov  9 12:42:33 2016
@@ -4,7 +4,6 @@
 ## Subprojects
 * [GenericTools](generic.html)
 * [VelocityView](view.html)
-* [VelocityStruts](struts.html)
 ## Docs
 * [Tools Summary](tools-summary.html)
 * [Javadoc](apidocs/index.html)
@@ -18,11 +17,7 @@
 * [Wiki](http://wiki.apache.org/velocity/)
 ## Development
 * [Changes](changes.html)
-* [Participating](index.html#helping-out)
 * [Dependencies](dependencies.html)
+* [Participating](index.html#helping-out)
 * [Source Code](http://velocity.apache.org/tools/releases/2.0/index.html#Subversion_Repository)
 * [Report Issue](http://issues.apache.org/jira/browse/VELTOOLS)
-## Struts
-* [Overview](struts.html)
-* [User Guide](struts-user-guide.html)
-* [Tools](apidocs/org/apache/velocity/tools/struts/package-summary.html)



Mime
View raw message