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/09/12 21:57:00 UTC
svn commit: r1624631 - in /commons/proper/configuration/branches/configuration2-alpha/src: main/java/org/apache/commons/configuration2/builder/combined/ test/java/org/apache/commons/configuration2/ test/java/org/apache/commons/configuration2/builder/co...

Author: oheger
Date: Fri Sep 12 19:56:57 2014
New Revision: 1624631

URL: http://svn.apache.org/r1624631
Log:
Make tests run again. Changed fully-qualified class names in source and test files.

Modified:
    commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
    commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
    commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java
    commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
    commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCCustomProvider.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCEntityResolver.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystem.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystemSubConfig.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCLookup.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCMultiTenent.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCMultiTenentReloading.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCResultClass.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCResultInitialization.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testComplexInitialization.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testConfigurationInterpolatorUpdate.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testConfigurationProvider.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testDigesterCreateObject.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExpression.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExtendedClass.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExtendedXMLConfigurationProvider.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder2.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileSystem.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testGlobalLookup.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testInterpolationBuilder.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder2.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder3.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder4.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder5.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testSystemProperties.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation2.xml
    commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation3.xml

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java Fri Sep 12 19:56:57 2014
@@ -395,55 +395,55 @@ public class CombinedConfigurationBuilde
 
     /** Constant for the basic configuration builder class. */
     private static final String BASIC_BUILDER =
-            "org.apache.commons.configuration.builder.BasicConfigurationBuilder";
+            "org.apache.commons.configuration2.builder.BasicConfigurationBuilder";
 
     /** Constant for the file-based configuration builder class. */
     private static final String FILE_BUILDER =
-            "org.apache.commons.configuration.builder.FileBasedConfigurationBuilder";
+            "org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder";
 
     /** Constant for the reloading file-based configuration builder class. */
     private static final String RELOADING_BUILDER =
-            "org.apache.commons.configuration.builder.ReloadingFileBasedConfigurationBuilder";
+            "org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder";
 
     /** Constant for the name of the file-based builder parameters class. */
     private static final String FILE_PARAMS =
-            "org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl";
+            "org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl";
 
     /** Constant for the provider for properties files. */
     private static final ConfigurationBuilderProvider PROPERTIES_PROVIDER =
             new FileExtensionConfigurationBuilderProvider(
                     FILE_BUILDER,
                     RELOADING_BUILDER,
-                    "org.apache.commons.configuration.XMLPropertiesConfiguration",
-                    "org.apache.commons.configuration.PropertiesConfiguration",
+                    "org.apache.commons.configuration2.XMLPropertiesConfiguration",
+                    "org.apache.commons.configuration2.PropertiesConfiguration",
                     EXT_XML, Arrays.asList(FILE_PARAMS));
 
     /** Constant for the provider for XML files. */
     private static final ConfigurationBuilderProvider XML_PROVIDER =
             new BaseConfigurationBuilderProvider(FILE_BUILDER, RELOADING_BUILDER,
-                    "org.apache.commons.configuration.XMLConfiguration",
-                    Arrays.asList("org.apache.commons.configuration.builder.XMLBuilderParametersImpl"));
+                    "org.apache.commons.configuration2.XMLConfiguration",
+                    Arrays.asList("org.apache.commons.configuration2.builder.XMLBuilderParametersImpl"));
 
     /** Constant for the provider for JNDI sources. */
     private static final BaseConfigurationBuilderProvider JNDI_PROVIDER =
             new BaseConfigurationBuilderProvider(
                     BASIC_BUILDER,
                     null,
-                    "org.apache.commons.configuration.JNDIConfiguration",
-                    Arrays.asList("org.apache.commons.configuration.builder.JndiBuilderParametersImpl"));
+                    "org.apache.commons.configuration2.JNDIConfiguration",
+                    Arrays.asList("org.apache.commons.configuration2.builder.JndiBuilderParametersImpl"));
 
     /** Constant for the provider for system properties. */
     private static final BaseConfigurationBuilderProvider SYSTEM_PROVIDER =
             new BaseConfigurationBuilderProvider(
                     BASIC_BUILDER,
                     null,
-                    "org.apache.commons.configuration.SystemConfiguration",
-                    Arrays.asList("org.apache.commons.configuration.builder.BasicBuilderParameters"));
+                    "org.apache.commons.configuration2.SystemConfiguration",
+                    Arrays.asList("org.apache.commons.configuration2.builder.BasicBuilderParameters"));
 
     /** Constant for the provider for ini files. */
     private static final BaseConfigurationBuilderProvider INI_PROVIDER =
             new BaseConfigurationBuilderProvider(FILE_BUILDER, RELOADING_BUILDER,
-                    "org.apache.commons.configuration.INIConfiguration",
+                    "org.apache.commons.configuration2.INIConfiguration",
                     Arrays.asList(FILE_PARAMS));
 
     /** Constant for the provider for environment properties. */
@@ -451,16 +451,16 @@ public class CombinedConfigurationBuilde
             new BaseConfigurationBuilderProvider(
                     BASIC_BUILDER,
                     null,
-                    "org.apache.commons.configuration.EnvironmentConfiguration",
-                    Arrays.asList("org.apache.commons.configuration.builder.BasicBuilderParameters"));
+                    "org.apache.commons.configuration2.EnvironmentConfiguration",
+                    Arrays.asList("org.apache.commons.configuration2.builder.BasicBuilderParameters"));
 
     /** Constant for the provider for plist files. */
     private static final BaseConfigurationBuilderProvider PLIST_PROVIDER =
             new FileExtensionConfigurationBuilderProvider(
                     FILE_BUILDER,
                     RELOADING_BUILDER,
-                    "org.apache.commons.configuration.plist.XMLPropertyListConfiguration",
-                    "org.apache.commons.configuration.plist.PropertyListConfiguration",
+                    "org.apache.commons.configuration2.plist.XMLPropertyListConfiguration",
+                    "org.apache.commons.configuration2.plist.PropertyListConfiguration",
                     EXT_XML, Arrays.asList(FILE_PARAMS));
 
     /** Constant for the provider for configuration definition files. */
@@ -470,8 +470,8 @@ public class CombinedConfigurationBuilde
     /** Constant for the provider for multiple XML configurations. */
     private static final MultiFileConfigurationBuilderProvider MULTI_XML_PROVIDER =
             new MultiFileConfigurationBuilderProvider(
-                    "org.apache.commons.configuration.XMLConfiguration",
-                    "org.apache.commons.configuration.builder.XMLBuilderParametersImpl");
+                    "org.apache.commons.configuration2.XMLConfiguration",
+                    "org.apache.commons.configuration2.builder.XMLBuilderParametersImpl");
 
     /** An array with the names of the default tags. */
     private static final String[] DEFAULT_TAGS = {

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java Fri Sep 12 19:56:57 2014
@@ -45,23 +45,23 @@ public class CombinedConfigurationBuilde
 {
     /** Constant for the name of the supported builder class. */
     private static final String BUILDER_CLASS =
-            "org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder";
+            "org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder";
 
     /** Constant for the name of the supported reloading builder class. */
     private static final String RELOADING_BUILDER_CLASS =
-            "org.apache.commons.configuration.builder.combined.ReloadingCombinedConfigurationBuilder";
+            "org.apache.commons.configuration2.builder.combined.ReloadingCombinedConfigurationBuilder";
 
     /** Constant for the name of the supported configuration class. */
     private static final String CONFIGURATION_CLASS =
-            "org.apache.commons.configuration.CombinedConfiguration";
+            "org.apache.commons.configuration2.CombinedConfiguration";
 
     /** Constant for the combined configuration builder parameters class. */
     private static final String COMBINED_PARAMS =
-            "org.apache.commons.configuration.builder.combined.CombinedBuilderParametersImpl";
+            "org.apache.commons.configuration2.builder.combined.CombinedBuilderParametersImpl";
 
     /** Constant for the name of the file-based builder parameters class. */
     private static final String FILE_PARAMS =
-            "org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl";
+            "org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl";
 
     /**
      * Creates a new instance of {@code CombinedConfigurationBuilderProvider}.

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java Fri Sep 12 19:56:57 2014
@@ -59,15 +59,15 @@ public class MultiFileConfigurationBuild
 {
     /** Constant for the name of the builder class. */
     private static final String BUILDER_CLASS =
-            "org.apache.commons.configuration.builder.combined.MultiFileConfigurationBuilder";
+            "org.apache.commons.configuration2.builder.combined.MultiFileConfigurationBuilder";
 
     /** Constant for the name of the reloading builder class. */
     private static final String RELOADING_BUILDER_CLASS =
-            "org.apache.commons.configuration.builder.combined.ReloadingMultiFileConfigurationBuilder";
+            "org.apache.commons.configuration2.builder.combined.ReloadingMultiFileConfigurationBuilder";
 
     /** Constant for the name of the parameters class. */
     private static final String PARAM_CLASS =
-            "org.apache.commons.configuration.builder.combined.MultiFileBuilderParametersImpl";
+            "org.apache.commons.configuration2.builder.combined.MultiFileBuilderParametersImpl";
 
     /**
      * Creates a new instance of {@code MultiFileConfigurationBuilderProvider}

Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java Fri Sep 12 19:56:57 2014
@@ -56,7 +56,7 @@ public class TestConfigurationUtils
 {
     /** Constant for the name of a class to be loaded. */
     private static final String CLS_NAME =
-            "org.apache.commons.configuration.PropertiesConfiguration";
+            "org.apache.commons.configuration2.PropertiesConfiguration";
 
     /** Stores the CCL. */
     private ClassLoader ccl;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java Fri Sep 12 19:56:57 2014
@@ -114,7 +114,7 @@ public class TestCombinedConfigurationBu
     public void setUp() throws Exception
     {
         System.setProperty("java.naming.factory.initial",
-                "org.apache.commons.configuration.MockInitialContextFactory");
+                "org.apache.commons.configuration2.MockInitialContextFactory");
         System.setProperty("test_file_xml", TEST_SUB_XML);
         System.setProperty("test_file_combine", "testcombine1.xml");
         parameters = new Parameters();

Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCCustomProvider.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCCustomProvider.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCCustomProvider.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCCustomProvider.xml Fri Sep 12 19:56:57 2014
@@ -20,7 +20,7 @@
   <header>
     <providers>
       <provider config-tag="test"
-                config-class="org.apache.commons.configuration.builder.combined.TestCombinedConfigurationBuilder$BuilderProviderTestImpl"
+                config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$BuilderProviderTestImpl"
                 propertyKey="testKey"/>
     </providers>
   </header>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCEntityResolver.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCEntityResolver.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCEntityResolver.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCEntityResolver.xml Fri Sep 12 19:56:57 2014
@@ -23,7 +23,7 @@
 <configuration>
   <header>
     <entity-resolver
-      config-class="org.apache.commons.configuration.builder.combined.TestCombinedConfigurationBuilder$EntityResolverWithPropertiesTestImpl"/>
+      config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$EntityResolverWithPropertiesTestImpl"/>
   </header>
   <xml fileName="test.xml" config-name="xml"/>
 </configuration>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystem.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystem.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystem.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystem.xml Fri Sep 12 19:56:57 2014
@@ -23,7 +23,7 @@
 <configuration>
   <header>
     <fileSystem
-      config-class="org.apache.commons.configuration.builder.combined.TestCombinedConfigurationBuilder$FileSystemTestImpl"/>
+      config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$FileSystemTestImpl"/>
   </header>
   <xml fileName="test.xml" config-name="xml"/>
 </configuration>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystemSubConfig.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystemSubConfig.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystemSubConfig.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCFileSystemSubConfig.xml Fri Sep 12 19:56:57 2014
@@ -23,10 +23,10 @@
 <configuration>
   <header>
     <fileSystem
-      config-class="org.apache.commons.configuration.io.DefaultFileSystem"/>
+      config-class="org.apache.commons.configuration2.io.DefaultFileSystem"/>
   </header>
   <xml fileName="test.xml" config-name="xml">
     <fileSystem
-      config-class="org.apache.commons.configuration.builder.combined.TestCombinedConfigurationBuilder$FileSystemTestImpl"/>
+      config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$FileSystemTestImpl"/>
   </xml>
 </configuration>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCLookup.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCLookup.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCLookup.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCLookup.xml Fri Sep 12 19:56:57 2014
@@ -24,7 +24,7 @@
   <header>
     <lookups>
       <lookup config-prefix="test"
-              config-class="org.apache.commons.configuration.builder.combined.TestCombinedConfigurationBuilder$TestLookup"/>
+              config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$TestLookup"/>
     </lookups>
   </header>
   <!-- Fetch the file name from a variable -->

Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCMultiTenent.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCMultiTenent.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCMultiTenent.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCMultiTenent.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testCCMultiTenentReloading.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCMultiTenentReloading.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCMultiTenentReloading.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCMultiTenentReloading.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testCCResultClass.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCResultClass.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCResultClass.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCResultClass.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testCCResultInitialization.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCResultInitialization.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCResultInitialization.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testCCResultInitialization.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testComplexInitialization.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testComplexInitialization.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testComplexInitialization.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testComplexInitialization.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testConfigurationInterpolatorUpdate.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testConfigurationInterpolatorUpdate.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testConfigurationInterpolatorUpdate.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testConfigurationInterpolatorUpdate.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testConfigurationProvider.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testConfigurationProvider.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testConfigurationProvider.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testConfigurationProvider.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testDigesterCreateObject.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testDigesterCreateObject.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testDigesterCreateObject.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testDigesterCreateObject.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testExpression.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExpression.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExpression.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExpression.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testExtendedClass.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExtendedClass.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExtendedClass.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExtendedClass.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testExtendedXMLConfigurationProvider.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExtendedXMLConfigurationProvider.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExtendedXMLConfigurationProvider.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testExtendedXMLConfigurationProvider.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder2.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder2.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder2.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileReloadConfigurationBuilder2.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testFileSystem.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileSystem.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileSystem.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testFileSystem.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testGlobalLookup.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testGlobalLookup.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testGlobalLookup.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testGlobalLookup.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testInterpolationBuilder.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testInterpolationBuilder.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testInterpolationBuilder.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testInterpolationBuilder.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder2.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder2.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder2.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder2.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder3.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder3.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder3.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder3.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder4.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder4.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder4.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder4.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder5.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder5.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder5.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testMultiTenentConfigurationBuilder5.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testSystemProperties.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testSystemProperties.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testSystemProperties.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testSystemProperties.xml Fri Sep 12 19:56:57 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

Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testValidation.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testValidation2.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation2.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation2.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation2.xml Fri Sep 12 19:56:57 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/branches/configuration2-alpha/src/test/resources/testValidation3.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation3.xml?rev=1624631&r1=1624630&r2=1624631&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation3.xml (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/resources/testValidation3.xml Fri Sep 12 19:56:57 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/>