commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r611444 [5/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/event/TestPropertiesConfigurationEvents.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestPropertiesConfigurationEvents.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestPropertiesConfigurationEvents.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestPropertiesConfigurationEvents.java Sat Jan 12 09:06:33 2008
@@ -14,15 +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.io.File;
 import java.io.IOException;
 import java.net.URL;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.PropertiesConfiguration;
 
 /**
  * Test class for the events generated by properties configurations. This class

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestXMLConfigurationEvents.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestXMLConfigurationEvents.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestXMLConfigurationEvents.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/event/TestXMLConfigurationEvents.java Sat Jan 12 09:06:33 2008
@@ -14,15 +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.io.File;
 import java.io.IOException;
 import java.net.URL;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.XMLConfiguration;
 
 /**
  * Test class for events generated by XMLConfiguration.

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

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/interpol/TestConstantLookup.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/interpol/TestConstantLookup.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/interpol/TestConstantLookup.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.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.interpol;
+package org.apache.commons.configuration2.interpol;
 
 import java.awt.event.KeyEvent;
 
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.ConstantLookup;
+
 import junit.framework.TestCase;
 
 /**
@@ -91,7 +94,7 @@
     public void testLookupUnknownClass()
     {
         assertNull("Non null return value for unknown class", lookup
-                .lookup("org.apache.commons.configuration.NonExistingConfig."
+                .lookup("org.apache.commons.configuration2.NonExistingConfig."
                         + FIELD));
     }
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/AbstractTestPListEvents.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/AbstractTestPListEvents.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/AbstractTestPListEvents.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/AbstractTestPListEvents.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/AbstractTestPListEvents.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/AbstractTestPListEvents.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/AbstractTestPListEvents.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.plist;
+package org.apache.commons.configuration2.plist;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.event.AbstractTestConfigurationEvents;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.event.AbstractTestConfigurationEvents;
 
 /**
  * A base test class for testing the events generated by the plist

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 import java.io.File;
 import java.io.StringReader;
@@ -29,11 +29,13 @@
 import junitx.framework.ArrayAssert;
 import junitx.framework.ListAssert;
 import junitx.framework.ObjectAssert;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.ConfigurationComparator;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.StrictConfigurationComparator;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.ConfigurationComparator;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.StrictConfigurationComparator;
+import org.apache.commons.configuration2.plist.ParseException;
+import org.apache.commons.configuration2.plist.PropertyListConfiguration;
 
 /**
  * @author Emmanuel Bourg

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

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/TestPropertyListParser.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/TestPropertyListParser.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/TestPropertyListParser.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java Sat Jan 12 09:06:33 2008
@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 import java.io.Reader;
 import java.util.Calendar;
 import java.util.SimpleTimeZone;
+
+import org.apache.commons.configuration2.plist.PropertyListParser;
 
 import junit.framework.TestCase;
 import junitx.framework.ArrayAssert;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/TestXMLPropertyListConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/TestXMLPropertyListConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/plist/TestXMLPropertyListConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 import java.io.File;
 import java.util.*;
@@ -25,12 +25,13 @@
 import junitx.framework.ArrayAssert;
 import junitx.framework.ListAssert;
 
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.FileConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.StrictConfigurationComparator;
-import org.apache.commons.configuration.ConfigurationComparator;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.ConfigurationComparator;
+import org.apache.commons.configuration2.FileConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.StrictConfigurationComparator;
+import org.apache.commons.configuration2.plist.XMLPropertyListConfiguration;
 
 /**
  * @author Emmanuel Bourg

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

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/reloading/FileAlwaysReloadingStrategy.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/reloading/FileAlwaysReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/reloading/FileAlwaysReloadingStrategy.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/reloading/FileAlwaysReloadingStrategy.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/reloading/FileAlwaysReloadingStrategy.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/reloading/FileAlwaysReloadingStrategy.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/reloading/FileAlwaysReloadingStrategy.java Sat Jan 12 09:06:33 2008
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.reloading;
+package org.apache.commons.configuration2.reloading;
 
 import java.io.File;
+
+import org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy;
 
 /**
  * A specialized reloading strategy for files that will always report a change

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/reloading/TestFileChangedReloadingStrategy.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/reloading/TestFileChangedReloadingStrategy.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/reloading/TestFileChangedReloadingStrategy.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/reloading/TestFileChangedReloadingStrategy.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/reloading/TestFileChangedReloadingStrategy.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.reloading;
+package org.apache.commons.configuration2.reloading;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -23,9 +23,10 @@
 
 import junit.framework.TestCase;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy;
 
 /**
  * Test case for the ReloadableConfiguration class.

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

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/test/HsqlDB.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/test/HsqlDB.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/test/HsqlDB.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java Sat Jan 12 09:06:33 2008
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration.test;
+package org.apache.commons.configuration2.test;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/AbstractCombinerTest.java (from r610907, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/AbstractCombinerTest.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/AbstractCombinerTest.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java&r1=610907&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/AbstractCombinerTest.java Sat Jan 12 09:06:33 2008
@@ -14,14 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.tree;
+package org.apache.commons.configuration2.tree;
 
 import java.io.File;
 
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.NodeCombiner;
 
 import junit.framework.TestCase;
 

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

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

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

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

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/TestOverrideCombiner.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/TestOverrideCombiner.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/TestOverrideCombiner.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/TestOverrideCombiner.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/TestOverrideCombiner.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/TestOverrideCombiner.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/TestOverrideCombiner.java Sat Jan 12 09:06:33 2008
@@ -14,12 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.tree;
+package org.apache.commons.configuration2.tree;
 
 import java.util.List;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.NodeCombiner;
+import org.apache.commons.configuration2.tree.OverrideCombiner;
+import org.apache.commons.configuration2.tree.ViewNode;
 
 /**
  * Test class for OverrideCombiner.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/TestUnionCombiner.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/TestUnionCombiner.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/TestUnionCombiner.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/TestUnionCombiner.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/TestUnionCombiner.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/TestUnionCombiner.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/TestUnionCombiner.java Sat Jan 12 09:06:33 2008
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.tree;
+package org.apache.commons.configuration2.tree;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.tree.NodeCombiner;
+import org.apache.commons.configuration2.tree.UnionCombiner;
 
 /**
  * Test class for UnionCombiner.

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

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/AbstractXPathTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/AbstractXPathTest.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/AbstractXPathTest.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.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.tree.xpath;
+package org.apache.commons.configuration2.tree.xpath;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
 import org.apache.commons.jxpath.ri.model.NodeIterator;
 
 import junit.framework.TestCase;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationIteratorAttributes.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationIteratorAttributes.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationIteratorAttributes.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.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.tree.xpath;
+package org.apache.commons.configuration2.tree.xpath;
 
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.xpath.ConfigurationNodeIteratorAttribute;
+import org.apache.commons.configuration2.tree.xpath.ConfigurationNodePointer;
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.model.NodePointer;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodeIteratorChildren.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodeIteratorChildren.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodeIteratorChildren.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java Sat Jan 12 09:06:33 2008
@@ -14,14 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.tree.xpath;
+package org.apache.commons.configuration2.tree.xpath;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.xpath.ConfigurationNodeIteratorChildren;
+import org.apache.commons.configuration2.tree.xpath.ConfigurationNodePointer;
 import org.apache.commons.jxpath.ri.Compiler;
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.compiler.NodeNameTest;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodePointer.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodePointer.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodePointer.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.java Sat Jan 12 09:06:33 2008
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.tree.xpath;
+package org.apache.commons.configuration2.tree.xpath;
 
 import java.util.Locale;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.xpath.ConfigurationNodePointer;
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.model.NodeIterator;
 import org.apache.commons.jxpath.ri.model.NodePointer;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointerFactory.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodePointerFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointerFactory.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointerFactory.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodePointerFactory.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodePointerFactory.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointerFactory.java Sat Jan 12 09:06:33 2008
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.tree.xpath;
+package org.apache.commons.configuration2.tree.xpath;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.xpath.ConfigurationNodePointerFactory;
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestXPathExpressionEngine.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestXPathExpressionEngine.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/tree/xpath/TestXPathExpressionEngine.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.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.tree.xpath;
+package org.apache.commons.configuration2.tree.xpath;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
-import org.apache.commons.configuration.tree.NodeAddData;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.NodeAddData;
+import org.apache.commons.configuration2.tree.xpath.ConfigurationNodePointerFactory;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
 import org.apache.commons.jxpath.ri.model.NodePointerFactory;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.web;
+package org.apache.commons.configuration2.web;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.MapConfiguration;
-import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.MapConfiguration;
+import org.apache.commons.configuration2.TestAbstractConfiguration;
+import org.apache.commons.configuration2.web.AppletConfiguration;
 
 import java.applet.Applet;
 import java.util.Properties;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.web;
+package org.apache.commons.configuration2.web;
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServlet;
 
 import com.mockobjects.servlet.MockServletConfig;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.TestAbstractConfiguration;
+import org.apache.commons.configuration2.web.ServletConfiguration;
 
 /**
  * Test case for the {@link ServletConfiguration} class.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.web;
+package org.apache.commons.configuration2.web;
 
 import java.util.Enumeration;
 import java.util.Properties;
@@ -26,8 +26,9 @@
 
 import com.mockobjects.servlet.MockServletConfig;
 import com.mockobjects.servlet.MockServletContext;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.TestAbstractConfiguration;
+import org.apache.commons.configuration2.web.ServletContextConfiguration;
 
 /**
  * Test case for the {@link ServletContextConfiguration} class.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.web;
+package org.apache.commons.configuration2.web;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.TestAbstractConfiguration;
+import org.apache.commons.configuration2.web.ServletFilterConfiguration;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.web;
+package org.apache.commons.configuration2.web;
 
 import java.util.Enumeration;
 import java.util.List;
@@ -24,10 +24,11 @@
 
 import com.mockobjects.servlet.MockHttpServletRequest;
 import org.apache.commons.collections.iterators.IteratorEnumeration;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.TestAbstractConfiguration;
+import org.apache.commons.configuration2.web.ServletRequestConfiguration;
 import org.apache.commons.lang.StringUtils;
 
 /**

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/resources/digesterRules.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/resources/digesterRules.xml?rev=611444&r1=611443&r2=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/resources/digesterRules.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/resources/digesterRules.xml Sat Jan 12 09:06:33 2008
@@ -4,23 +4,23 @@
 <digester-rules>
 
     <pattern value="configuration/properties">
-        <object-create-rule classname="org.apache.commons.configuration.PropertiesConfiguration"/>
+        <object-create-rule classname="org.apache.commons.configuration2.PropertiesConfiguration"/>
         <set-properties-rule/>
-        <set-next-rule methodname="addConfiguration" paramtype="org.apache.commons.configuration.Configuration"/>
+        <set-next-rule methodname="addConfiguration" paramtype="org.apache.commons.configuration2.Configuration"/>
         <call-method-rule methodname="load"/>
     </pattern>
 
     <pattern value="configuration/xml">
-        <object-create-rule classname="org.apache.commons.configuration.XMLConfiguration"/>
+        <object-create-rule classname="org.apache.commons.configuration2.XMLConfiguration"/>
         <set-properties-rule/>
-        <set-next-rule methodname="addConfiguration" paramtype="org.apache.commons.configuration.Configuration"/>
+        <set-next-rule methodname="addConfiguration" paramtype="org.apache.commons.configuration2.Configuration"/>
         <call-method-rule methodname="load"/>
     </pattern>
 
     <pattern value="configuration/jndi">
-        <object-create-rule classname="org.apache.commons.configuration.JNDIConfiguration"/>
+        <object-create-rule classname="org.apache.commons.configuration2.JNDIConfiguration"/>
         <set-properties-rule/>
-        <set-next-rule methodname="addConfiguration" paramtype="org.apache.commons.configuration.Configuration"/>
+        <set-next-rule methodname="addConfiguration" paramtype="org.apache.commons.configuration2.Configuration"/>
     </pattern>
 
 </digester-rules>

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testComplexInitialization.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testComplexInitialization.xml?rev=611444&r1=611443&r2=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testComplexInitialization.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testComplexInitialization.xml Sat Jan 12 09:06:33 2008
@@ -3,8 +3,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>
     <combiner>
       <override>
@@ -18,12 +18,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>



Mime
View raw message