Author: oheger Date: Sat Feb 19 16:34:06 2011 New Revision: 1072379 URL: http://svn.apache.org/viewvc?rev=1072379&view=rev Log: [CONFIGURATION-389] Updated user's guide and changes. Ported fix to configuration2 branch.
Modified: commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml commons/proper/configuration/branches/configuration2_experimental/src/site/xdoc/userguide/howto_configurationbuilder.xml Modified: commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml?rev=1072379&r1=1072378&r2=1072379&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml (original) +++ commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml Sat Feb 19 16:34:06 2011 @@ -161,6 +161,10 @@ BaseConfiguration.clone() now also clones collections stored in the internal map. This causes list properties to be handled correctly. </action> + <action dev="oheger" type="add" issue="CONFIGURATION-389"> + DefaultConfigurationBuilder now supports defining ini files in its + configuration definition file. + </action> <action dev="rgoers" type="fix" issue="CONFIGURATION-388"> Attribute or element values will not be escaped when attribute or element splitting are disabled. </action> Modified: commons/proper/configuration/branches/configuration2_experimental/src/site/xdoc/userguide/howto_configurationbuilder.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/site/xdoc/userguide/howto_configurationbuilder.xml?rev=1072379&r1=1072378&r2=1072379&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2_experimental/src/site/xdoc/userguide/howto_configurationbuilder.xml (original) +++ commons/proper/configuration/branches/configuration2_experimental/src/site/xdoc/userguide/howto_configurationbuilder.xml Sat Feb 19 16:34:06 2011 @@ -149,6 +149,11 @@ <code>fileName</code> attribute can be used to specify the configuration definition file to be loaded. This file must be an XML document that conforms to the format described here.</dd> + <dt>ini</dt> + <dd>This tag can be used to include an ini file into the resulting + combined configuration. Behind the scenes an instance of + <code><a href="../apidocs/org/apache/commons/configuration/INIConfiguration.html"> + INIConfiguration</a></code> is used to load the ini file.</dd> </dl> </p> <p>