[tools] update default generic toolbox
git-svn-id: https://svn.apache.org/repos/asf/velocity/tools/trunk@1770548 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/tools.xml b/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/tools.xml
index c0e94b3..25b2931 100644
--- a/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/tools.xml
+++ b/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/tools.xml
@@ -23,10 +23,9 @@
<data type="number" key="TOOLS_VERSION" value="2.0"/>
<data type="boolean" key="GENERIC_TOOLS_AVAILABLE" value="true"/>
<toolbox scope="application">
- <tool class="org.apache.velocity.tools.generic.AlternatorTool"/>
<tool class="org.apache.velocity.tools.generic.ClassTool"/>
+ <tool class="org.apache.velocity.tools.generic.CollectionTool"/>
<tool class="org.apache.velocity.tools.generic.ComparisonDateTool"/>
- <tool class="org.apache.velocity.tools.generic.ConversionTool"/>
<tool class="org.apache.velocity.tools.generic.DisplayTool"/>
<tool class="org.apache.velocity.tools.generic.EscapeTool"/>
<tool class="org.apache.velocity.tools.generic.FieldTool"/>
@@ -34,6 +33,9 @@
<tool class="org.apache.velocity.tools.generic.MathTool"/>
<tool class="org.apache.velocity.tools.generic.NumberTool"/>
<tool class="org.apache.velocity.tools.generic.ResourceTool"/>
+ <!-- include deprecated tools, which will only be instanciated on demand -->
+ <tool class="org.apache.velocity.tools.generic.AlternatorTool"/>
+ <tool class="org.apache.velocity.tools.generic.ConversionTool"/>
<tool class="org.apache.velocity.tools.generic.SortTool"/>
</toolbox>
<toolbox scope="request">
