Modified: commons/proper/configuration/trunk/src/test/resources/testCCMultiTenent.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testCCMultiTenent.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testCCMultiTenent.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testCCMultiTenent.xml Sat Sep 13 15:36:51 2014 @@ -23,9 +23,9 @@ <configuration> <header> <result loggerName="TestLogger" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> </result> </header> <override> @@ -33,12 +33,12 @@ config-name="clientConfig" schemaValidation="false" config-optional="true" config-forceCreate="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </multiFile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </xml> </override> </configuration> \ No newline at end of file
Modified: commons/proper/configuration/trunk/src/test/resources/testCCMultiTenentReloading.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testCCMultiTenentReloading.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testCCMultiTenentReloading.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testCCMultiTenentReloading.xml Sat Sep 13 15:36:51 2014 @@ -22,7 +22,7 @@ <configuration> <header> <result keyPattern="$${sys:Id}" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration"> + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration"> </result> </header> <override> Modified: commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml Sat Sep 13 15:36:51 2014 @@ -23,9 +23,9 @@ <configuration> <header> <result throwExceptionOnMissing="true" - config-class="org.apache.commons.configuration.builder.combined.TestCombinedConfigurationBuilder$CombinedConfigurationTestImpl"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> + config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$CombinedConfigurationTestImpl"> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> </result> - </header> + </header> <xml fileName="test.xml" config-name="xml"/> </configuration> Modified: commons/proper/configuration/trunk/src/test/resources/testCCResultInitialization.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testCCResultInitialization.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testCCResultInitialization.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testCCResultInitialization.xml Sat Sep 13 15:36:51 2014 @@ -22,11 +22,11 @@ <header> <result> <listDelimiterHandler - config-class="org.apache.commons.configuration.convert.DefaultListDelimiterHandler"> + config-class="org.apache.commons.configuration2.convert.DefaultListDelimiterHandler"> <config-constrarg config-value=","/> </listDelimiterHandler> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <combiner> <override> Modified: commons/proper/configuration/trunk/src/test/resources/testComplexInitialization.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testComplexInitialization.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testComplexInitialization.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testComplexInitialization.xml Sat Sep 13 15:36:51 2014 @@ -20,8 +20,8 @@ <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" ignoreReloadExceptions="true"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <combiner> <override> @@ -35,12 +35,12 @@ <system/> <properties fileName="test.properties" throwExceptionOnMissing="true" config-name="properties"> - <reloadingStrategy config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy" + <reloadingStrategy config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy" refreshDelay="10000"/> </properties> <!-- Fetch the file name from a variable --> <xml fileName="${test_file_xml}" config-name="xml"> - <expressionEngine config-class="org.apache.commons.configuration.tree.DefaultExpressionEngine" + <expressionEngine config-class="org.apache.commons.configuration2.tree.DefaultExpressionEngine" propertyDelimiter="/" indexStart="[" indexEnd="]"/> </xml> <additional> Modified: commons/proper/configuration/trunk/src/test/resources/testConfigurationInterpolatorUpdate.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testConfigurationInterpolatorUpdate.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testConfigurationInterpolatorUpdate.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testConfigurationInterpolatorUpdate.xml Sat Sep 13 15:36:51 2014 @@ -19,13 +19,13 @@ <configuration> <header> <result delimiterParsingDisabled="true"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <providers> <provider config-tag="test" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$XMLConfigurationProvider" - configurationClass="org.apache.commons.configuration.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$XMLConfigurationProvider" + configurationClass="org.apache.commons.configuration2.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> </providers> <combiner> <override> @@ -39,12 +39,12 @@ <system/> <properties fileName="test.properties" throwExceptionOnMissing="true" config-name="properties"> - <reloadingStrategy config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy" + <reloadingStrategy config-class="org.apache.commons.configuration2.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" + <expressionEngine config-class="org.apache.commons.configuration2.tree.DefaultExpressionEngine" propertyDelimiter="/" indexStart="[" indexEnd="]"/> </test> <additional> Propchange: commons/proper/configuration/trunk/src/test/resources/testConfigurationInterpolatorUpdate.xml ------------------------------------------------------------------------------ Merged /commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testConfigurationInterpolatorUpdate.xml:r1624597-1624751 Modified: commons/proper/configuration/trunk/src/test/resources/testConfigurationProvider.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testConfigurationProvider.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testConfigurationProvider.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testConfigurationProvider.xml Sat Sep 13 15:36:51 2014 @@ -19,12 +19,12 @@ <configuration> <header> <result delimiterParsingDisabled="true"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <providers> <provider config-tag="test" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider"/> </providers> <combiner> <override> @@ -38,12 +38,12 @@ <system/> <properties fileName="test.properties" throwExceptionOnMissing="true" config-name="properties"> - <reloadingStrategy config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy" + <reloadingStrategy config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy" refreshDelay="10000"/> </properties> <!-- Fetch the file name from a variable --> <xml fileName="${test_file_xml}" config-name="xml"> - <expressionEngine config-class="org.apache.commons.configuration.tree.DefaultExpressionEngine" + <expressionEngine config-class="org.apache.commons.configuration2.tree.DefaultExpressionEngine" propertyDelimiter="/" indexStart="[" indexEnd="]"/> </xml> <additional> Modified: commons/proper/configuration/trunk/src/test/resources/testDigesterCreateObject.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testDigesterCreateObject.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testDigesterCreateObject.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testDigesterCreateObject.xml Sat Sep 13 15:36:51 2014 @@ -17,7 +17,7 @@ --> <configuration> <connection> - <class name="org.apache.commons.configuration.TestConfigurationXMLDocument$ConnectionData"> + <class name="org.apache.commons.configuration2.TestConfigurationXMLDocument$ConnectionData"> <property name="dsn" value="MyData"/> <property name="user" value="scott"/> <property name="passwd" value="tiger"/> Modified: commons/proper/configuration/trunk/src/test/resources/testExpression.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testExpression.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testExpression.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testExpression.xml Sat Sep 13 15:36:51 2014 @@ -19,16 +19,16 @@ <configuration> <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <lookups> - <lookup config-prefix="mdc" config-class="org.apache.commons.configuration.TestVFSConfigurationBuilder$MDCStrLookup"/> + <lookup config-prefix="mdc" config-class="org.apache.commons.configuration2.TestVFSConfigurationBuilder$MDCStrLookup"/> <lookup config-prefix="expr" - config-class="org.apache.commons.configuration.interpol.ExprLookup"> + config-class="org.apache.commons.configuration2.interpol.ExprLookup"> <variables> <variable name="String" value="Class:org.apache.commons.lang.StringUtils"/> <variable name="MDC" value="Class:org.slf4j.MDC"/> @@ -37,20 +37,20 @@ </lookups> <providers> <provider config-tag="multifile" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider" - configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/> </providers> </header> <override> <multifile filePattern='$$${expr:String.right(MDC.get("Id"), 2)}/testMultiConfiguration_$$${sys:Id}.xml' config-name="clientConfig" delimiterParsingDisabled="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </multifile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig" delimiterParsingDisabled="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testExtendedClass.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testExtendedClass.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testExtendedClass.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testExtendedClass.xml Sat Sep 13 15:36:51 2014 @@ -19,9 +19,9 @@ <configuration> <header> <result delimiterParsingDisabled="true" - config-class="org.apache.commons.configuration.TestDefaultConfigurationBuilder$ExtendedCombinedConfiguration"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.TestDefaultConfigurationBuilder$ExtendedCombinedConfiguration"> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <combiner> <override> @@ -35,12 +35,12 @@ <system/> <properties fileName="test.properties" throwExceptionOnMissing="true" config-name="properties"> - <reloadingStrategy config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy" + <reloadingStrategy config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy" refreshDelay="10000"/> </properties> <!-- Fetch the file name from a variable --> <xml fileName="${test_file_xml}" config-name="xml"> - <expressionEngine config-class="org.apache.commons.configuration.tree.DefaultExpressionEngine" + <expressionEngine config-class="org.apache.commons.configuration2.tree.DefaultExpressionEngine" propertyDelimiter="/" indexStart="[" indexEnd="]"/> </xml> <additional> 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=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml Sat Sep 13 15:36:51 2014 @@ -19,13 +19,13 @@ <configuration> <header> <result delimiterParsingDisabled="true"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <providers> <provider config-tag="test" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$XMLConfigurationProvider" - configurationClass="org.apache.commons.configuration.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$XMLConfigurationProvider" + configurationClass="org.apache.commons.configuration2.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> </providers> <combiner> <override> @@ -39,12 +39,12 @@ <system/> <properties fileName="test.properties" throwExceptionOnMissing="true" config-name="properties"> - <reloadingStrategy config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy" + <reloadingStrategy config-class="org.apache.commons.configuration2.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" + <expressionEngine config-class="org.apache.commons.configuration2.tree.DefaultExpressionEngine" propertyDelimiter="/" indexStart="[" indexEnd="]"/> </test> <additional> Modified: commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder.xml Sat Sep 13 15:36:51 2014 @@ -19,33 +19,33 @@ <configuration> <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> - <fileSystem config-class="org.apache.commons.configuration.VFSFileSystem"/> + <fileSystem config-class="org.apache.commons.configuration2.VFSFileSystem"/> <providers> <provider config-tag="multifile" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider" - configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/> </providers> </header> <override> <multifile filePattern="testwrite/testMultiConfiguration_$$${sys:Id}.xml" config-name="clientConfig" delimiterParsingDisabled="true" schemaValidation="false"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="0" - config-class="org.apache.commons.configuration.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> </multifile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig" delimiterParsingDisabled="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="0" - config-class="org.apache.commons.configuration.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder2.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder2.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder2.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder2.xml Sat Sep 13 15:36:51 2014 @@ -19,33 +19,33 @@ <configuration> <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> - <fileSystem config-class="org.apache.commons.configuration.VFSFileSystem"/> + <fileSystem config-class="org.apache.commons.configuration2.VFSFileSystem"/> <providers> <provider config-tag="multifile" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider" - configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/> </providers> </header> <override> <multifile filePattern="${sys:basePath}/testwrite/testMultiConfiguration_$$${sys:Id}.xml" config-name="clientConfig" delimiterParsingDisabled="true" schemaValidation="false"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> </multifile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig" delimiterParsingDisabled="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testFileSystem.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testFileSystem.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testFileSystem.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testFileSystem.xml Sat Sep 13 15:36:51 2014 @@ -19,13 +19,13 @@ <configuration> <header> <result delimiterParsingDisabled="true"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> - <fileSystem config-class="org.apache.commons.configuration.VFSFileSystem"/> + <fileSystem config-class="org.apache.commons.configuration2.VFSFileSystem"/> <providers> <provider config-tag="test" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider"/> </providers> <combiner> <override> @@ -39,12 +39,12 @@ <system/> <properties fileName="test.properties" throwExceptionOnMissing="true" config-name="properties"> - <reloadingStrategy config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy" + <reloadingStrategy config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy" refreshDelay="10000"/> </properties> <!-- Fetch the file name from a variable --> <xml fileName="${test_file_xml}" config-name="xml"> - <expressionEngine config-class="org.apache.commons.configuration.tree.DefaultExpressionEngine" + <expressionEngine config-class="org.apache.commons.configuration2.tree.DefaultExpressionEngine" propertyDelimiter="/" indexStart="[" indexEnd="]"/> </xml> <additional> Modified: commons/proper/configuration/trunk/src/test/resources/testGlobalLookup.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testGlobalLookup.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testGlobalLookup.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testGlobalLookup.xml Sat Sep 13 15:36:51 2014 @@ -19,12 +19,12 @@ <configuration> <header> <result delimiterParsingDisabled="true"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <lookups> <lookup config-prefix="test" - config-class="org.apache.commons.configuration.TestDefaultConfigurationBuilder$TestLookup"/> + config-class="org.apache.commons.configuration2.TestDefaultConfigurationBuilder$TestLookup"/> </lookups> <combiner> <override> @@ -38,12 +38,12 @@ <system/> <properties fileName="test.properties" throwExceptionOnMissing="true" config-name="properties"> - <reloadingStrategy config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy" + <reloadingStrategy config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy" refreshDelay="10000"/> </properties> <!-- Fetch the file name from a variable --> <xml fileName="${test:test_file_xml}" config-name="xml"> - <expressionEngine config-class="org.apache.commons.configuration.tree.DefaultExpressionEngine" + <expressionEngine config-class="org.apache.commons.configuration2.tree.DefaultExpressionEngine" propertyDelimiter="/" indexStart="[" indexEnd="]"/> </xml> <additional> Modified: commons/proper/configuration/trunk/src/test/resources/testInterpolationBuilder.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testInterpolationBuilder.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testInterpolationBuilder.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testInterpolationBuilder.xml Sat Sep 13 15:36:51 2014 @@ -26,6 +26,6 @@ <system/> <properties fileName="testInterpolation.properties"/> <xml fileName="${testXmlFile}" config-name="test"> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </xml> </configuration> Modified: commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder.xml Sat Sep 13 15:36:51 2014 @@ -19,28 +19,28 @@ <configuration> <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" loggerName="TestLogger" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <providers> <provider config-tag="multifile" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider" - configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/> </providers> </header> <override> <multifile filePattern="testMultiConfiguration_$$${sys:Id}.xml" config-name="clientConfig" delimiterParsingDisabled="true" schemaValidation="false"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </multifile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig" delimiterParsingDisabled="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder2.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder2.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder2.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder2.xml Sat Sep 13 15:36:51 2014 @@ -19,33 +19,33 @@ <configuration> <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" loggerName="TestLogger" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <entity-resolver catalogFiles="catalog.xml"/> <providers> <provider config-tag="multifile" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider" - configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/> </providers> </header> <override> <multifile filePattern="testMultiConfiguration_$$${sys:Id}.xml" config-name="clientConfig" delimiterParsingDisabled="true" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"/> </multifile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig" delimiterParsingDisabled="true" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder3.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder3.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder3.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder3.xml Sat Sep 13 15:36:51 2014 @@ -19,33 +19,33 @@ <configuration> <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" loggerName="TestLogger" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <entity-resolver catalogFiles="catalog.xml"/> <providers> <provider config-tag="multifile" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider" - configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/> </providers> </header> <override> <multifile filePattern="testwrite/testMultiConfiguration_$$${sys:Id}.xml" config-name="clientConfig" delimiterParsingDisabled="true" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"/> </multifile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig" delimiterParsingDisabled="true" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder4.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder4.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder4.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder4.xml Sat Sep 13 15:36:51 2014 @@ -21,15 +21,15 @@ <configuration> <header> <result loggerName="TestLogger" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${test:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <lookups> <lookup config-prefix="test" - config-class="org.apache.commons.configuration.TestDynamicCombinedConfiguration$ThreadLookup"/> + config-class="org.apache.commons.configuration2.TestDynamicCombinedConfiguration$ThreadLookup"/> </lookups> <entity-resolver catalogFiles="catalog.xml"/> </header> @@ -39,12 +39,12 @@ config-forceCreate="true" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </multiFile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder5.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder5.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder5.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder5.xml Sat Sep 13 15:36:51 2014 @@ -23,11 +23,11 @@ <configuration> <header> <result loggerName="TestLogger" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <entity-resolver catalogFiles="catalog.xml"/> </header> @@ -36,13 +36,13 @@ config-name="clientConfig" config-optional="true" config-forceCreate="true" schemaValidation="false"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </multiFile> <xml fileName="testwrite/testMultiDynamic_default.xml" config-name="defaultConfig" config-reload="true" schemaValidation="false"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testSystemProperties.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testSystemProperties.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testSystemProperties.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testSystemProperties.xml Sat Sep 13 15:36:51 2014 @@ -19,14 +19,14 @@ <configuration systemProperties="test.properties.xml"> <header> <result delimiterParsingDisabled="true"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> </header> <system/> <properties fileName="test2.properties" throwExceptionOnMissing="true" config-name="properties"> - <reloadingStrategy config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy" + <reloadingStrategy config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy" refreshDelay="10000"/> </properties> </configuration> \ No newline at end of file Propchange: commons/proper/configuration/trunk/src/test/resources/testSystemProperties.xml ------------------------------------------------------------------------------ Merged /commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testSystemProperties.xml:r1624597-1624751 Modified: commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml Sat Sep 13 15:36:51 2014 @@ -19,34 +19,34 @@ <configuration> <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" loggerName="TestLogger" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> - <fileSystem config-class="org.apache.commons.configuration.VFSFileSystem"/> + <fileSystem config-class="org.apache.commons.configuration2.VFSFileSystem"/> <entity-resolver catalogFiles="catalog.xml"/> <providers> <provider config-tag="multifile" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider" - configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/> </providers> </header> <override> <multifile filePattern="testMultiConfiguration_$$${sys:Id}.xml" config-name="clientConfig" delimiterParsingDisabled="true" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> </multifile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig" delimiterParsingDisabled="true" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml Sat Sep 13 15:36:51 2014 @@ -19,34 +19,34 @@ <configuration> <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" loggerName="TestLogger" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> - <fileSystem config-class="org.apache.commons.configuration.VFSFileSystem"/> + <fileSystem config-class="org.apache.commons.configuration2.VFSFileSystem"/> <entity-resolver catalogFiles="catalog.xml"/> <providers> <provider config-tag="multifile" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider" - configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/> </providers> </header> <override> <multifile filePattern="testwrite/testMultiConfiguration_$$${sys:Id}.xml" config-name="clientConfig" delimiterParsingDisabled="true" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> </multifile> <xml fileName="testMultiConfiguration_default.xml" config-name="defaultConfig" delimiterParsingDisabled="true" schemaValidation="true"> <expressionEngine - config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> <reloadingStrategy refreshDelay="500" - config-class="org.apache.commons.configuration.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> </xml> </override> </configuration> \ No newline at end of file Modified: commons/proper/configuration/trunk/src/test/resources/testValidation.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testValidation.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testValidation.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testValidation.xml Sat Sep 13 15:36:51 2014 @@ -19,10 +19,10 @@ <configuration> <header> <result delimiterParsingDisabled="true"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> - <entity-resolver catalogFiles="catalog.xml"/> + <entity-resolver catalogFiles="catalog.xml"/> </header> <system/> <properties fileName="test.properties.xml" throwExceptionOnMissing="true" Modified: commons/proper/configuration/trunk/src/test/resources/testValidation2.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testValidation2.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testValidation2.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testValidation2.xml Sat Sep 13 15:36:51 2014 @@ -19,8 +19,8 @@ <configuration> <header> <result delimiterParsingDisabled="true"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <entity-resolver catalogFiles="file://${sys:user.dir}/target/test-classes/catalog2.xml"/> </header> Modified: commons/proper/configuration/trunk/src/test/resources/testValidation3.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testValidation3.xml?rev=1624753&r1=1624752&r2=1624753&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/resources/testValidation3.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testValidation3.xml Sat Sep 13 15:36:51 2014 @@ -19,15 +19,15 @@ <configuration> <header> <result delimiterParsingDisabled="true" forceReloadCheck="true" loggerName="TestLogger" - config-class="org.apache.commons.configuration.DynamicCombinedConfiguration" + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration" keyPattern="$${sys:Id}"> - <nodeCombiner config-class="org.apache.commons.configuration.tree.MergeCombiner"/> - <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/> + <nodeCombiner config-class="org.apache.commons.configuration2.tree.MergeCombiner"/> + <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> </result> <providers> <provider config-tag="multifile" - config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider" - configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/> </providers><entity-resolver catalogFiles="catalog.xml"/> </header> <system/>
