Modified: velocity/site/production/tools/2.0/creating-tools.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/creating-tools.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/2.0/creating-tools.html (original) +++ velocity/site/production/tools/2.0/creating-tools.html Tue Sep 13 13:55:58 2016 @@ -255,7 +255,7 @@ h2:hover > .headerlink, h3:hover > .head <span class="kn">import</span> <span class="nn">org.apache.velocity.tools.config.DefaultKey</span><span class="p">;</span> -<span class="nd">@DefaultKey</span><span class="p">(</span><span class="s">"foob"</span><span class="p">)</span> +<span class="nd">@DefaultKey</span><span class="p">(</span><span class="s2">"foob"</span><span class="p">)</span> <span class="n">public</span> <span class="k">class</span> <span class="nc">FooBar</span> <span class="p">{</span> <span class="o">...</span> <span class="p">}</span>
Modified: velocity/site/production/tools/2.0/frameworks.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/frameworks.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/2.0/frameworks.html (original) +++ velocity/site/production/tools/2.0/frameworks.html Tue Sep 13 13:55:58 2016 @@ -274,7 +274,8 @@ h2:hover > .headerlink, h3:hover > .head <p>You can, of course, simply create a VelocityView instance for your framework to use, but if you are supporting multiple ways of using Velocity (e.g. VelocityViewTag and separate templates) or if you suspect your users might want access to the VelocityView facilities, it is better to get your VelocityView instance using the getVelocityView(...) methods of the <code>org.apache.velocity.tools.view.ServletUtils</code> class. These methods will automatically create an instance, store it for you, return it, and then retrieve it again on subsequent calls to any of those methods. This allows the VelocityView (which is a rather heavy object) to be shared across multiple servlets, tags, and filters in the same application. Of course, if you do not wish to share your VelocityEngine configuration (template cache, global macros) or Toolbox configuration(s), then you should explicitly avoid using these methods and construct and manage your own VelocityView instance.</p> <p>If you are using VelocityViewServlet, VelocityLayoutServlet, and/or VelocityViewTag in the same application and do not want them to share a VelocityView instance for some reason, you can tell them to keep their VelocityViews private by setting <code>org.apache.velocity.tools.shared.config</code> to <code>false</code> in the <code>init-param</code>s of the servlet config.</p> <h3 id="using">Using<a class="headerlink" href="#using" title="Permanent link">¶</a></h3> -<p class="note">This is unfinished. <a href="index.html#Contribution">You can help fix that!</a> - TODO: discuss basic functions, config options, etc</p> +<p class="note">This is unfinished. <a href="index.html#Contribution">You can help fix that!</a> - TODO: discuss basic functions, config options, etc +</p> <h2 id="other-ways-to-integrate-velocitytools">Other Ways to Integrate VelocityTools<a class="headerlink" href="#other-ways-to-integrate-velocitytools" title="Permanent link">¶</a></h2> <h3 id="toolboxfactory">ToolboxFactory<a class="headerlink" href="#toolboxfactory" title="Permanent link">¶</a></h3> <p>This is unfinished. <a href="index.html#Contribution">You can help fix that!</a> - TODO: Discuss lifecycle, configuration, and use. See <a href="http://velocity.markmail.org/search/?q=subject%3A%22upgrading%22#query:subject%3Aupgrading%20order%3Adate-forward+page:3+mid:pw56jxgsudhwwnnd+state:results";>this email thread</a> for more on this, including code samples.</p> Modified: velocity/site/production/tools/2.0/tools-summary.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/tools-summary.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/2.0/tools-summary.html (original) +++ velocity/site/production/tools/2.0/tools-summary.html Tue Sep 13 13:55:58 2016 @@ -1284,8 +1284,8 @@ h2:hover > .headerlink, h3:hover > .head <td>an optional coma-separated list of admissible languages in the webapp</td> </tr> <tr> -<td>`$browser.languageFilter</td> -<td>`returns or sets the current languages filter</td> +<td><code>$browser.languageFilter |</code>returns or sets the current languages filter</td> +<td></td> </tr> <tr> <td><code>$browser.version</code></td> @@ -1702,7 +1702,8 @@ h2:hover > .headerlink, h3:hover > .head </tbody> </table> <h3 id="struts-tools_1">Struts Tools<a class="headerlink" href="#struts-tools_1" title="Permanent link">¶</a></h3> -<p class="note">This is unfinished. <a href="index.html#Contribution">You can help fix that!</a><br> TODO: This page only covers the Generic and View subprojects, leaving aside the Struts subproject for now.</p></div></div> +<p class="note">This is unfinished. <a href="index.html#Contribution">You can help fix that!</a><br> TODO: This page only covers the Generic and View subprojects, leaving aside the Struts subproject for now. +</p></div></div> <hr/> <div id="copyright"> Copyright © 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/2.0/view-servlet.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/view-servlet.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/2.0/view-servlet.html (original) +++ velocity/site/production/tools/2.0/view-servlet.html Tue Sep 13 13:55:58 2016 @@ -215,7 +215,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="overview">Overview<a class="headerlink" href="#overview" title="Permanent link">¶</a></h2> -<p class="note">This page is still unfinished. Much of this needs to be moved or at least copied to a VelocityView page, as it applies to anything using a <a href="apidocs/org/apache/velocity/tools/view/VelocityView.html">VelocityView</a> instance under the covers (including the <a href="view-tag.html">VelocityViewTag</a>). <a href="index.html#Contribution">Help is welcome!</a></p> +<p class="note">This page is still unfinished. Much of this needs to be moved or at least copied to a VelocityView page, as it applies to anything using a <a href="apidocs/org/apache/velocity/tools/view/VelocityView.html">VelocityView</a> instance under the covers (including the <a href="view-tag.html">VelocityViewTag</a>). <a href="index.html#Contribution">Help is welcome!</a> +</p> <p><a href="apidocs/org/apache/velocity/tools/view/VelocityViewServlet.html">Javadoc is here</a>.</p> <p>A typical application use-case for the VelocityViewServlet is to provide the view rendering layer for a servlet-based web application framework. The <a href="struts.html">VelocityStruts</a> subproject uses the approach to bring Velocity templates to the Struts 1 application framework.</p> <h2 id="installation">Installation<a class="headerlink" href="#installation" title="Permanent link">¶</a></h2> Modified: velocity/site/production/tools/2.0/view-tag.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/2.0/view-tag.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/2.0/view-tag.html (original) +++ velocity/site/production/tools/2.0/view-tag.html Tue Sep 13 13:55:58 2016 @@ -215,7 +215,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="overview">Overview<a class="headerlink" href="#overview" title="Permanent link">¶</a></h2> -<p class="note">This page is still unfinished. For details on configuring the VelocityViewTag, you can follow most of the instructions for the <a href="view-servlet.html">VelocityViewServlet</a> and of course on the <a href="configuration.html">configuration pages</a>. <a href="index.html#Contribution">Help finishing this is welcome!</a></p> +<p class="note">This page is still unfinished. For details on configuring the VelocityViewTag, you can follow most of the instructions for the <a href="view-servlet.html">VelocityViewServlet</a> and of course on the <a href="configuration.html">configuration pages</a>. <a href="index.html#Contribution">Help finishing this is welcome!</a> +</p> <p>This is a JSP tag that allows you to use Velocity and VelocityTools from within a JSP page or tag. There are many ways to use this tag. This simplest is to have it process an external template using the current page context. Assuming you have a template called "foo.vm" that can be found by your resource loader(s) that looks like this:</p> <div class="codehilite"><pre>Hello $!bodyContent World! </pre></div> Modified: velocity/site/production/tools/devel/creating-tools.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/creating-tools.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/devel/creating-tools.html (original) +++ velocity/site/production/tools/devel/creating-tools.html Tue Sep 13 13:55:58 2016 @@ -255,7 +255,7 @@ h2:hover > .headerlink, h3:hover > .head <span class="kn">import</span> <span class="nn">org.apache.velocity.tools.config.DefaultKey</span><span class="p">;</span> -<span class="nd">@DefaultKey</span><span class="p">(</span><span class="s">"foob"</span><span class="p">)</span> +<span class="nd">@DefaultKey</span><span class="p">(</span><span class="s2">"foob"</span><span class="p">)</span> <span class="n">public</span> <span class="k">class</span> <span class="nc">FooBar</span> <span class="p">{</span> <span class="o">...</span> <span class="p">}</span> Modified: velocity/site/production/tools/devel/frameworks.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/frameworks.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/devel/frameworks.html (original) +++ velocity/site/production/tools/devel/frameworks.html Tue Sep 13 13:55:58 2016 @@ -274,7 +274,8 @@ h2:hover > .headerlink, h3:hover > .head <p>You can, of course, simply create a VelocityView instance for your framework to use, but if you are supporting multiple ways of using Velocity (e.g. VelocityViewTag and separate templates) or if you suspect your users might want access to the VelocityView facilities, it is better to get your VelocityView instance using the getVelocityView(...) methods of the <code>org.apache.velocity.tools.view.ServletUtils</code> class. These methods will automatically create an instance, store it for you, return it, and then retrieve it again on subsequent calls to any of those methods. This allows the VelocityView (which is a rather heavy object) to be shared across multiple servlets, tags, and filters in the same application. Of course, if you do not wish to share your VelocityEngine configuration (template cache, global macros) or Toolbox configuration(s), then you should explicitly avoid using these methods and construct and manage your own VelocityView instance.</p> <p>If you are using VelocityViewServlet, VelocityLayoutServlet, and/or VelocityViewTag in the same application and do not want them to share a VelocityView instance for some reason, you can tell them to keep their VelocityViews private by setting <code>org.apache.velocity.tools.shared.config</code> to <code>false</code> in the <code>init-param</code>s of the servlet config.</p> <h3 id="using">Using<a class="headerlink" href="#using" title="Permanent link">¶</a></h3> -<p class="note">This is unfinished. <a href="index.html#Contribution">You can help fix that!</a> - TODO: discuss basic functions, config options, etc</p> +<p class="note">This is unfinished. <a href="index.html#Contribution">You can help fix that!</a> - TODO: discuss basic functions, config options, etc +</p> <h2 id="other-ways-to-integrate-velocitytools">Other Ways to Integrate VelocityTools<a class="headerlink" href="#other-ways-to-integrate-velocitytools" title="Permanent link">¶</a></h2> <h3 id="toolboxfactory">ToolboxFactory<a class="headerlink" href="#toolboxfactory" title="Permanent link">¶</a></h3> <p>This is unfinished. <a href="index.html#Contribution">You can help fix that!</a> - TODO: Discuss lifecycle, configuration, and use. See <a href="http://velocity.markmail.org/search/?q=subject%3A%22upgrading%22#query:subject%3Aupgrading%20order%3Adate-forward+page:3+mid:pw56jxgsudhwwnnd+state:results";>this email thread</a> for more on this, including code samples.</p> Modified: velocity/site/production/tools/devel/tools-summary.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/tools-summary.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/devel/tools-summary.html (original) +++ velocity/site/production/tools/devel/tools-summary.html Tue Sep 13 13:55:58 2016 @@ -1284,8 +1284,8 @@ h2:hover > .headerlink, h3:hover > .head <td>an optional coma-separated list of admissible languages in the webapp</td> </tr> <tr> -<td>`$browser.languageFilter</td> -<td>`returns or sets the current languages filter</td> +<td><code>$browser.languageFilter |</code>returns or sets the current languages filter</td> +<td></td> </tr> <tr> <td><code>$browser.version</code></td> @@ -1702,7 +1702,8 @@ h2:hover > .headerlink, h3:hover > .head </tbody> </table> <h3 id="struts-tools_1">Struts Tools<a class="headerlink" href="#struts-tools_1" title="Permanent link">¶</a></h3> -<p class="note">This is unfinished. <a href="index.html#Contribution">You can help fix that!</a><br> TODO: This page only covers the Generic and View subprojects, leaving aside the Struts subproject for now.</p></div></div> +<p class="note">This is unfinished. <a href="index.html#Contribution">You can help fix that!</a><br> TODO: This page only covers the Generic and View subprojects, leaving aside the Struts subproject for now. +</p></div></div> <hr/> <div id="copyright"> Copyright © 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/view-servlet.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/view-servlet.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/devel/view-servlet.html (original) +++ velocity/site/production/tools/devel/view-servlet.html Tue Sep 13 13:55:58 2016 @@ -215,7 +215,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="overview">Overview<a class="headerlink" href="#overview" title="Permanent link">¶</a></h2> -<p class="note">This page is still unfinished. Much of this needs to be moved or at least copied to a VelocityView page, as it applies to anything using a <a href="apidocs/org/apache/velocity/tools/view/VelocityView.html">VelocityView</a> instance under the covers (including the <a href="view-tag.html">VelocityViewTag</a>). <a href="index.html#Contribution">Help is welcome!</a></p> +<p class="note">This page is still unfinished. Much of this needs to be moved or at least copied to a VelocityView page, as it applies to anything using a <a href="apidocs/org/apache/velocity/tools/view/VelocityView.html">VelocityView</a> instance under the covers (including the <a href="view-tag.html">VelocityViewTag</a>). <a href="index.html#Contribution">Help is welcome!</a> +</p> <p><a href="apidocs/org/apache/velocity/tools/view/VelocityViewServlet.html">Javadoc is here</a>.</p> <p>A typical application use-case for the VelocityViewServlet is to provide the view rendering layer for a servlet-based web application framework. The <a href="struts.html">VelocityStruts</a> subproject uses the approach to bring Velocity templates to the Struts 1 application framework.</p> <h2 id="installation">Installation<a class="headerlink" href="#installation" title="Permanent link">¶</a></h2> Modified: velocity/site/production/tools/devel/view-tag.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/view-tag.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/devel/view-tag.html (original) +++ velocity/site/production/tools/devel/view-tag.html Tue Sep 13 13:55:58 2016 @@ -215,7 +215,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="overview">Overview<a class="headerlink" href="#overview" title="Permanent link">¶</a></h2> -<p class="note">This page is still unfinished. For details on configuring the VelocityViewTag, you can follow most of the instructions for the <a href="view-servlet.html">VelocityViewServlet</a> and of course on the <a href="configuration.html">configuration pages</a>. <a href="index.html#Contribution">Help finishing this is welcome!</a></p> +<p class="note">This page is still unfinished. For details on configuring the VelocityViewTag, you can follow most of the instructions for the <a href="view-servlet.html">VelocityViewServlet</a> and of course on the <a href="configuration.html">configuration pages</a>. <a href="index.html#Contribution">Help finishing this is welcome!</a> +</p> <p>This is a JSP tag that allows you to use Velocity and VelocityTools from within a JSP page or tag. There are many ways to use this tag. This simplest is to have it process an external template using the current page context. Assuming you have a template called "foo.vm" that can be found by your resource loader(s) that looks like this:</p> <div class="codehilite"><pre>Hello $!bodyContent World! </pre></div> Modified: velocity/site/production/tools/index.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/index.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/tools/index.html (original) +++ velocity/site/production/tools/index.html Tue Sep 13 13:55:58 2016 @@ -183,6 +183,7 @@ h2:hover > .headerlink, h3:hover > .head </ul> <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">¶</a></h2> <ul> +<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200";>Issues</a></li> <li><a href="http://wiki.apache.org/velocity/CodeStandards";>Coding standards</a></li> <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li> <li><a href="/site-building.html">Site building</a></li> Modified: velocity/site/production/who-we-are.html URL: http://svn.apache.org/viewvc/velocity/site/production/who-we-are.html?rev=1760548&r1=1760547&r2=1760548&view=diff ============================================================================== --- velocity/site/production/who-we-are.html (original) +++ velocity/site/production/who-we-are.html Tue Sep 13 13:55:58 2016 @@ -181,6 +181,7 @@ h2:hover > .headerlink, h3:hover > .head </ul> <h2 id="developer-resources">Developer Resources<a class="headerlink" href="#developer-resources" title="Permanent link">¶</a></h2> <ul> +<li><a href="https://issues.apache.org/jira/secure/BrowseProjects.jspa#10200";>Issues</a></li> <li><a href="http://wiki.apache.org/velocity/CodeStandards";>Coding standards</a></li> <li><a href="/how-it-works.html#Project%20Guidelines">Project guidelines</a></li> <li><a href="/site-building.html">Site building</a></li>
