You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/06/19 21:00:23 UTC
svn commit: r1604008 - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration/builder/combined/ test/resources/
Author: oheger
Date: Thu Jun 19 19:00:22 2014
New Revision: 1604008
URL: http://svn.apache.org/r1604008
Log:
Renamed tag for MultiFileConfigurationBuilder.
When including a multi-file configuration into a CombinedConfigurationBuilder
the tag name "multiXml" was used. As MultiFileConfigurationBuilder is no
longer limited to XML configuration files, the tag name "multiFile" is more
appropriate.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
commons/proper/configuration/trunk/src/test/resources/testCCMultiTenent.xml
commons/proper/configuration/trunk/src/test/resources/testCCMultiTenentReloading.xml
commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder4.xml
commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder5.xml
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java?rev=1604008&r1=1604007&r2=1604008&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java Thu Jun 19 19:00:22 2014
@@ -476,7 +476,7 @@ public class CombinedConfigurationBuilde
/** An array with the names of the default tags. */
private static final String[] DEFAULT_TAGS = {
"properties", "xml", "hierarchicalXml", "plist",
- "ini", "system", "env", "jndi", "configuration", "multiXml"
+ "ini", "system", "env", "jndi", "configuration", "multiFile"
};
/** An array with the providers for the default tags. */
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=1604008&r1=1604007&r2=1604008&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/resources/testCCMultiTenent.xml (original)
+++ commons/proper/configuration/trunk/src/test/resources/testCCMultiTenent.xml Thu Jun 19 19:00:22 2014
@@ -29,12 +29,12 @@
</result>
</header>
<override>
- <multiXml filePattern="testMultiConfiguration_$${sys:Id}.xml"
+ <multiFile filePattern="testMultiConfiguration_$${sys:Id}.xml"
config-name="clientConfig" schemaValidation="false"
config-optional="true" config-forceCreate="true">
<expressionEngine
config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/>
- </multiXml>
+ </multiFile>
<xml fileName="testMultiConfiguration_default.xml"
config-name="defaultConfig">
<expressionEngine
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=1604008&r1=1604007&r2=1604008&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/resources/testCCMultiTenentReloading.xml (original)
+++ commons/proper/configuration/trunk/src/test/resources/testCCMultiTenentReloading.xml Thu Jun 19 19:00:22 2014
@@ -26,7 +26,7 @@
</result>
</header>
<override>
- <multiXml filePattern="$${sys:Id}"
+ <multiFile filePattern="$${sys:Id}"
config-name="clientConfig" config-reload="true"
config-optional="true" config-forceCreate="true"/>
</override>
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=1604008&r1=1604007&r2=1604008&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder4.xml (original)
+++ commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder4.xml Thu Jun 19 19:00:22 2014
@@ -34,13 +34,13 @@
<entity-resolver catalogFiles="catalog.xml"/>
</header>
<override>
- <multiXml filePattern="testMultiConfiguration_$${test:Id}.xml"
+ <multiFile filePattern="testMultiConfiguration_$${test:Id}.xml"
config-name="clientConfig" config-optional="true"
config-forceCreate="true"
schemaValidation="true">
<expressionEngine
config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/>
- </multiXml>
+ </multiFile>
<xml fileName="testMultiConfiguration_default.xml"
config-name="defaultConfig" schemaValidation="true">
<expressionEngine
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=1604008&r1=1604007&r2=1604008&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder5.xml (original)
+++ commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder5.xml Thu Jun 19 19:00:22 2014
@@ -32,14 +32,14 @@
<entity-resolver catalogFiles="catalog.xml"/>
</header>
<override>
- <multiXml filePattern="testwrite/testMultiConfiguration_$${sys:Id}.xml"
+ <multiFile filePattern="testwrite/testMultiConfiguration_$${sys:Id}.xml"
config-name="clientConfig" config-optional="true"
config-forceCreate="true" schemaValidation="false">
<expressionEngine
config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/>
- </multiXml>
+ </multiFile>
<xml fileName="testwrite/testMultiDynamic_default.xml"
- config-name="defaultConfig" config-reload="true"
+ config-name="defaultConfig" config-reload="true"
schemaValidation="false">
<expressionEngine
config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/>