You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2008/04/26 01:07:49 UTC

svn commit: r651736 - /velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java

Author: nbubna
Date: Fri Apr 25 16:07:43 2008
New Revision: 651736

URL: http://svn.apache.org/viewvc?rev=651736&view=rev
Log:
<property> tags directly inside <tools> were being wrongly ignored

Modified:
    velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java

Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java?rev=651736&r1=651735&r2=651736&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java Fri Apr 25 16:07:43 2008
@@ -91,12 +91,14 @@
     public void addRuleInstances(Digester digester)
     {
         // create the config objects
+        digester.addObjectCreate("tools/property", propertyClass);
         digester.addObjectCreate("tools/*/property", propertyClass);
         digester.addObjectCreate("tools/data", dataClass);
         digester.addObjectCreate("tools/toolbox", toolboxConfigurationClass);
         digester.addObjectCreate("tools/toolbox/tool", toolConfigurationClass);
 
         // to apply matching attributes to specific setters of config objects
+        digester.addSetProperties("tools/property");
         digester.addSetProperties("tools/*/property");
         digester.addSetProperties("tools");
         digester.addSetProperties("tools/data");
@@ -113,6 +115,7 @@
         digester.addRule("tools/*/property", new DataValueInBodyRule());
 
         // to finish a config and move on to the next
+        digester.addSetNext("tools/property", "addProperty");
         digester.addSetNext("tools/*/property", "addProperty");
         digester.addSetNext("tools/data", "addData");
         digester.addSetNext("tools/toolbox", "addToolbox");