commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r611444 [4/5] - in /commons/proper/configuration/branches/configuration2_experimental/src: main/java/org/apache/commons/configuration/ main/java/org/apache/commons/configuration2/ main/java/org/apache/commons/configuration2/beanutils/ main/...
Date Sat, 12 Jan 2008 17:06:46 GMT
Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java (from r610888, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java&r1=610888&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
+
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
 
 /**
  * Test if non-string properties are handled correctly.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.List;
 import java.util.Map;
@@ -23,6 +23,9 @@
 
 import junit.framework.TestCase;
 import org.apache.commons.collections.ExtendedProperties;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationConverter;
 
 /**
  * Tests the ConfigurationConverter class.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationFactory.java (from r610894, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationFactory.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationFactory.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationFactory.java&r1=610894&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationFactory.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationFactory.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -24,6 +24,14 @@
 
 import junit.framework.TestCase;
 
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.ConfigurationFactory;
+import org.apache.commons.configuration2.JNDIConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.XMLPropertiesConfiguration;
 import org.xml.sax.SAXException;
 
 /**
@@ -69,7 +77,7 @@
 
     public void setUp() throws Exception
     {
-        System.setProperty("java.naming.factory.initial", "org.apache.commons.configuration.MockInitialContextFactory");
+        System.setProperty("java.naming.factory.initial", "org.apache.commons.configuration2.MockInitialContextFactory");
         factory = new ConfigurationFactory();
     }
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationKey.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationKey.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationKey.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationKey.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationKey.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationKey.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationKey.java Sat Jan 12 09:06:33 2008
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,6 +18,8 @@
  */
 
 import java.util.NoSuchElementException;
+
+import org.apache.commons.configuration2.ConfigurationKey;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationMap.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationMap.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationMap.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.ConfigurationMap;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationSet.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationSet.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationSet.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java Sat Jan 12 09:06:33 2008
@@ -14,10 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Iterator;
 import java.util.Map;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.ConfigurationMap;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java Sat Jan 12 09:06:33 2008
@@ -15,13 +15,20 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
 
 import com.mockobjects.dynamic.Mock;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.awt.Color;
 import java.math.BigDecimal;
@@ -32,6 +32,10 @@
 import java.util.Locale;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConversionException;
+import org.apache.commons.configuration2.DataConfiguration;
 import org.apache.commons.lang.SystemUtils;
 
 import junit.framework.TestCase;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java (from r610887, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java&r1=610887&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.FileInputStream;
 import java.sql.Connection;
@@ -27,8 +27,11 @@
 
 import junit.framework.TestCase;
 
-import org.apache.commons.configuration.event.ConfigurationErrorListener;
-import org.apache.commons.configuration.test.HsqlDB;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.DatabaseConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationErrorListener;
+import org.apache.commons.configuration2.test.HsqlDB;
 import org.apache.commons.dbcp.BasicDataSource;
 import org.dbunit.database.DatabaseConnection;
 import org.dbunit.database.IDatabaseConnection;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDefaultConfigurationBuilder.java (from r610880, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDefaultConfigurationBuilder.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDefaultConfigurationBuilder.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java&r1=610880&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDefaultConfigurationBuilder.java Sat Jan 12 09:06:33 2008
@@ -14,17 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Set;
 
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.DefaultConfigurationBuilder;
+import org.apache.commons.configuration2.FileConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.XMLPropertiesConfiguration;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
 
 import junit.framework.TestCase;
 
@@ -66,7 +76,7 @@
         super.setUp();
         System
                 .setProperty("java.naming.factory.initial",
-                        "org.apache.commons.configuration.MockInitialContextFactory");
+                        "org.apache.commons.configuration2.MockInitialContextFactory");
         System.setProperty("test_file_xml", "test.xml");
         System.setProperty("test_file_combine", "testcombine1.xml");
         factory = new DefaultConfigurationBuilder();

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestEnvironmentConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestEnvironmentConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestEnvironmentConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java Sat Jan 12 09:06:33 2008
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
+import org.apache.commons.configuration2.EnvironmentConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java (from r610904, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestEqualBehaviour.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestEqualBehaviour.java&r1=610904&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestEqualBehaviour.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java Sat Jan 12 09:06:33 2008
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,6 +19,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationFactory;
+import org.apache.commons.configuration2.PropertiesConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java (from r610892, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java&r1=610892&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java Sat Jan 12 09:06:33 2008
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,6 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import org.apache.commons.configuration2.PropertiesConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java (from r610912, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestFileConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestFileConfiguration.java&r1=610912&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestFileConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.net.URL;
 import java.util.Properties;
@@ -26,8 +26,18 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.apache.commons.configuration.reloading.FileAlwaysReloadingStrategy;
-import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
+import org.apache.commons.configuration2.AbstractFileConfiguration;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.ConfigurationFactory;
+import org.apache.commons.configuration2.DefaultConfigurationBuilder;
+import org.apache.commons.configuration2.FileConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.StrictConfigurationComparator;
+import org.apache.commons.configuration2.reloading.FileAlwaysReloadingStrategy;
+import org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,12 +25,15 @@
 import java.util.Set;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.configuration.HierarchicalConfiguration.Node;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
-import org.apache.commons.configuration.tree.DefaultExpressionEngine;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationKey;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration.Node;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultExpressionEngine;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java (from r610903, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java&r1=610903&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java Sat Jan 12 09:06:33 2008
@@ -15,13 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.sax.SAXSource;
 
+import org.apache.commons.configuration2.HierarchicalConfigurationXMLReader;
+import org.apache.commons.configuration2.XMLConfiguration;
 import org.apache.commons.jxpath.JXPathContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java (from r610898, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java&r1=610898&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java Sat Jan 12 09:06:33 2008
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,6 +22,8 @@
 import java.io.File;
 import java.util.Collection;
 import java.util.Iterator;
+
+import org.apache.commons.configuration2.XMLConfiguration;
 
 /**
  * Test class for XMLConfiguration. In addition to TestXMLConfiguration this

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -24,6 +24,9 @@
 import java.io.Writer;
 import java.util.HashSet;
 import java.util.Set;
+
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.INIConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestJNDIConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestJNDIConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestJNDIConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Hashtable;
 
@@ -25,7 +25,9 @@
 
 import junit.framework.TestCase;
 
-import org.apache.commons.configuration.event.ConfigurationErrorListener;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.JNDIConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationErrorListener;
 
 /**
  * Test to see if the JNDIConfiguration works properly.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestJNDIEnvironmentValues.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestJNDIEnvironmentValues.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestJNDIEnvironmentValues.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java Sat Jan 12 09:06:33 2008
@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+
+import org.apache.commons.configuration2.JNDIConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,13 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.MapConfiguration;
+import org.apache.commons.configuration2.StrictConfigurationComparator;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
 
 /**
  * Tests for MapConfiguration.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java (from r610885, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java&r1=610885&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
+
+import org.apache.commons.configuration2.PropertiesConfiguration;
 
 /**
  * Test if non-string properties are handled correctly.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java (from r610883, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java&r1=610883&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,12 +15,19 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationConverter;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestNullJNDIEnvironmentValues.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestNullJNDIEnvironmentValues.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestNullJNDIEnvironmentValues.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java Sat Jan 12 09:06:33 2008
@@ -15,9 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Iterator;
+
+import org.apache.commons.configuration2.JNDIConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java (from r610537, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java&r1=610537&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -34,7 +34,13 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.ConfigurationFactory;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.PropertiesConfigurationLayout;
+import org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java Sat Jan 12 09:06:33 2008
@@ -14,14 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Iterator;
 
-import org.apache.commons.configuration.event.ConfigurationEvent;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.AbstractFileConfiguration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.PropertiesConfigurationLayout;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java (from r610896, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertiesSequence.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertiesSequence.java&r1=610896&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertiesSequence.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java Sat Jan 12 09:06:33 2008
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +23,10 @@
 import junit.framework.TestCase;
 
 import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationFactory;
+import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.lang.StringUtils;
 
 /**

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertyConverter.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertyConverter.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertyConverter.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertyConverter.java Sat Jan 12 09:06:33 2008
@@ -15,13 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.configuration2.ConversionException;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.PropertyConverter;
 import org.apache.commons.lang.SystemUtils;
 
 import junit.framework.TestCase;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestStrictConfigurationComparator.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestStrictConfigurationComparator.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestStrictConfigurationComparator.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationComparator;
+import org.apache.commons.configuration2.StrictConfigurationComparator;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestSubnodeConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestSubnodeConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestSubnodeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java Sat Jan 12 09:06:33 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.File;
 import java.util.HashSet;
@@ -23,9 +23,14 @@
 import java.util.Set;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.configuration.reloading.FileAlwaysReloadingStrategy;
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.SubnodeConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.reloading.FileAlwaysReloadingStrategy;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java (from r610900, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java&r1=610900&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -24,6 +24,12 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
+
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationFactory;
+import org.apache.commons.configuration2.SubsetConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestSystemConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestSystemConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestSystemConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,9 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Properties;
+
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.SystemConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestThreesomeConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestThreesomeConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestThreesomeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java Sat Jan 12 09:06:33 2008
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,11 +19,14 @@
 
 import java.util.List;
 
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+
 import junit.framework.TestCase;
 
 /**
  * A base class for testing {@link
- * org.apache.commons.configuration.BasePropertiesConfiguration}
+ * org.apache.commons.configuration2.BasePropertiesConfiguration}
  * extensions.
  *
  * @version $Id$

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java (from r610879, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java&r1=610879&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -36,10 +36,16 @@
 
 import junit.framework.TestCase;
 
-import org.apache.commons.configuration.reloading.FileAlwaysReloadingStrategy;
-import org.apache.commons.configuration.reloading.InvariantReloadingStrategy;
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.FileConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.SubnodeConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.reloading.FileAlwaysReloadingStrategy;
+import org.apache.commons.configuration2.reloading.InvariantReloadingStrategy;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestXMLPropertiesConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestXMLPropertiesConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestXMLPropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,9 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.File;
+
+import org.apache.commons.configuration2.XMLPropertiesConfiguration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestBeanHelper.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestBeanHelper.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestBeanHelper.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java Sat Jan 12 09:06:33 2008
@@ -14,13 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.beanutils.BeanDeclaration;
+import org.apache.commons.configuration2.beanutils.BeanFactory;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.beanutils.DefaultBeanFactory;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBean.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBean.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBean.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,8 +24,9 @@
 import junit.framework.TestCase;
 import junitx.framework.ObjectAssert;
 import org.apache.commons.beanutils.DynaProperty;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.beanutils.ConfigurationDynaBean;
 
 /**
  * <p>Test Case for the <code>ConfigurationDynaBean</code> implementation class.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBeanXMLConfig.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBeanXMLConfig.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBeanXMLConfig.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java Sat Jan 12 09:06:33 2008
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.XMLConfiguration;
 
 /**
  * An additional test class for ConfigurationDynaBean. This test class performs

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestDefaultBeanFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestDefaultBeanFactory.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestDefaultBeanFactory.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java Sat Jan 12 09:06:33 2008
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.beanutils.BeanDeclaration;
+import org.apache.commons.configuration2.beanutils.DefaultBeanFactory;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestXMLBeanDeclaration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestXMLBeanDeclaration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/beanutils/TestXMLBeanDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java Sat Jan 12 09:06:33 2008
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
 import java.util.Map;
 
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.tree.ConfigurationNode;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.beanutils.BeanDeclaration;
+import org.apache.commons.configuration2.beanutils.XMLBeanDeclaration;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
 
 import junit.framework.TestCase;
 
@@ -46,8 +48,8 @@
 
     /** An array with the names of the classes of the complex properties. */
     static final String[] COMPLEX_CLASSES =
-    { "org.apache.commons.configuration.test.AddressTest",
-            "org.apache.commons.configuration.test.CarTest"};
+    { "org.apache.commons.configuration2.test.AddressTest",
+            "org.apache.commons.configuration2.test.CarTest"};
 
     /** An array with the property names of the complex properties. */
     static final String[][] COMPLEX_ATTRIBUTES =

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/AbstractTestConfigurationEvents.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/AbstractTestConfigurationEvents.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/AbstractTestConfigurationEvents.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/AbstractTestConfigurationEvents.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/AbstractTestConfigurationEvents.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/AbstractTestConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/AbstractTestConfigurationEvents.java Sat Jan 12 09:06:33 2008
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.event;
+package org.apache.commons.configuration2.event;
 
 import java.util.LinkedList;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/AbstractTestFileConfigurationEvents.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/AbstractTestFileConfigurationEvents.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/AbstractTestFileConfigurationEvents.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/AbstractTestFileConfigurationEvents.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/AbstractTestFileConfigurationEvents.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/AbstractTestFileConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/AbstractTestFileConfigurationEvents.java Sat Jan 12 09:06:33 2008
@@ -14,15 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.event;
+package org.apache.commons.configuration2.event;
 
 import java.io.IOException;
 import java.net.URL;
 
-import org.apache.commons.configuration.AbstractFileConfiguration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.FileConfiguration;
-import org.apache.commons.configuration.reloading.ReloadingStrategy;
+import org.apache.commons.configuration2.AbstractFileConfiguration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.FileConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
+import org.apache.commons.configuration2.reloading.ReloadingStrategy;
 
 /**
  * A base test class that can be used for testing file-based configurations.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestEventSource.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestEventSource.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestEventSource.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java Sat Jan 12 09:06:33 2008
@@ -14,9 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.event;
+package org.apache.commons.configuration2.event;
 
 import java.util.Collection;
+
+import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.event.ConfigurationErrorListener;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
+import org.apache.commons.configuration2.event.EventSource;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java Sat Jan 12 09:06:33 2008
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.event;
+package org.apache.commons.configuration2.event;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.SubnodeConfiguration;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.SubnodeConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
 
 /**
  * Test class for the events generated by hierarchical configurations.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestMapConfigurationEvents.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestMapConfigurationEvents.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestMapConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java Sat Jan 12 09:06:33 2008
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.event;
+package org.apache.commons.configuration2.event;
 
 import java.util.HashMap;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.MapConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.MapConfiguration;
 
 /**
  * Test class for the events generated by MapConfiguration.



Mime
View raw message