Author: oheger Date: Fri Dec 7 21:12:18 2012 New Revision: 1418477 URL: http://svn.apache.org/viewvc?rev=1418477&view=rev Log: Reverted changes in test file to fix failing tests.
Modified: commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml Modified: commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml?rev=1418477&r1=1418476&r2=1418477&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml Fri Dec 7 21:12:18 2012 @@ -18,11 +18,37 @@ <!-- Test configuration definition file that demonstrates complex initialization --> <configuration> <header> + <result delimiterParsingDisabled="true"> + <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + </result> <providers> <provider config-tag="test" - config-class="org.apache.commons.configuration.builder.combined.TestCombinedConfigurationBuilder$BuilderProviderTestImpl" - propertyKey="testKey"/> + config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$XMLConfigurationProvider" + configurationClass="org.apache.commons.configuration.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> </providers> + <combiner> + <override> + <list-nodes> + <node>table</node> + <node>list</node> + </list-nodes> + </override> + </combiner> </header> - <test/> + <system/> + <properties fileName="test.properties" throwExceptionOnMissing="true" + config-name="properties"> + <reloadingStrategy config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy" + refreshDelay="10000"/> + </properties> + <!-- Fetch the file name from a variable --> + <test fileName="${test_file_xml}" config-name="xml"> + <expressionEngine config-class="org.apache.commons.configuration.tree.DefaultExpressionEngine" + propertyDelimiter="/" indexStart="[" indexEnd="]"/> + </test> + <additional> + <xml config-name="combiner1" fileName="${test_file_combine}"/> --> + <xml config-name="combiner2" fileName="testcombine2.xml"/> + </additional> </configuration> \ No newline at end of file