svn commit: r611444 [2/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/...

[oh...@apache.org]

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationComparator.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationComparator.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationComparator.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationComparator.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationComparator.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationComparator.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationComparator.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;
 
 /**
  * Comparator for configurations interface.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationConverter.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationConverter.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationConverter.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.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.Iterator;
 import java.util.List;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationException.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationException.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationException.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationException.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationException.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationException.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationException.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 org.apache.commons.lang.exception.NestableException;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationFactory.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationFactory.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationFactory.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationFactory.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationFactory.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationFactory.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.IOException;
@@ -26,8 +26,8 @@
 import java.util.LinkedList;
 import java.util.Map;
 
-import org.apache.commons.configuration.plist.PropertyListConfiguration;
-import org.apache.commons.configuration.plist.XMLPropertyListConfiguration;
+import org.apache.commons.configuration2.plist.PropertyListConfiguration;
+import org.apache.commons.configuration2.plist.XMLPropertyListConfiguration;
 import org.apache.commons.digester.AbstractObjectCreationFactory;
 import org.apache.commons.digester.CallMethodRule;
 import org.apache.commons.digester.Digester;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationKey.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationKey.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationKey.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationKey.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationKey.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationKey.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationKey.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.Serializable;
 import java.util.Iterator;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationMap.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationMap.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationMap.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationMap.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.AbstractMap;
 import java.util.AbstractSet;
@@ -26,7 +26,7 @@
 /**
  * <p>The <code>ConfigurationMap</code> wraps a
  * configuration-collection
- * {@link org.apache.commons.configuration.Configuration}
+ * {@link org.apache.commons.configuration2.Configuration}
  * instance to provide a <code>Map</code> interface.</p>
  *
  * <p><em>Note:</em> This implementation is incomplete.</p>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationRuntimeException.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationRuntimeException.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationRuntimeException.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationRuntimeException.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationRuntimeException.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationRuntimeException.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationRuntimeException.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 org.apache.commons.lang.exception.NestableRuntimeException;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.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.IOException;
@@ -30,9 +30,9 @@
 import java.net.URLDecoder;
 import java.util.Iterator;
 
-import org.apache.commons.configuration.event.ConfigurationErrorEvent;
-import org.apache.commons.configuration.event.ConfigurationErrorListener;
-import org.apache.commons.configuration.event.EventSource;
+import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.event.ConfigurationErrorListener;
+import org.apache.commons.configuration2.event.EventSource;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationXMLReader.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationXMLReader.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.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.IOException;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConversionException.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConversionException.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConversionException.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConversionException.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConversionException.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/ConversionException.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConversionException.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;
 
 /**
  * Exception thrown when a property is incompatible with the type requested.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DataConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/DataConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DataConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DataConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/DataConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/DataConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DataConfiguration.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.io.Serializable;
@@ -80,7 +80,7 @@
  * Date objects are expected to be formatted with the pattern <tt>yyyy-MM-dd HH:mm:ss</tt>.
  * This default format can be changed by specifying another format in the
  * getters, or by putting a date format in the configuration under the key
- * <tt>org.apache.commons.configuration.format.date</tt>.
+ * <tt>org.apache.commons.configuration2.format.date</tt>.
  *
  * @author <a href="ebourg@apache.org">Emmanuel Bourg</a>
  * @version $Revision$, $Date$
@@ -89,7 +89,7 @@
 public class DataConfiguration extends AbstractConfiguration implements Serializable
 {
     /** The key of the property storing the user defined date format. */
-    public static final String DATE_FORMAT_KEY = "org.apache.commons.configuration.format.date";
+    public static final String DATE_FORMAT_KEY = "org.apache.commons.configuration2.format.date";
 
     /** The default format for dates. */
     public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.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.sql.Connection;
 import java.sql.PreparedStatement;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.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.net.URL;
@@ -25,15 +25,15 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.configuration.beanutils.BeanDeclaration;
-import org.apache.commons.configuration.beanutils.BeanFactory;
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.beanutils.DefaultBeanFactory;
-import org.apache.commons.configuration.beanutils.XMLBeanDeclaration;
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.DefaultExpressionEngine;
-import org.apache.commons.configuration.tree.OverrideCombiner;
-import org.apache.commons.configuration.tree.UnionCombiner;
+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 org.apache.commons.configuration2.beanutils.XMLBeanDeclaration;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultExpressionEngine;
+import org.apache.commons.configuration2.tree.OverrideCombiner;
+import org.apache.commons.configuration2.tree.UnionCombiner;
 import org.apache.commons.logging.LogFactory;
 
 /**
@@ -49,7 +49,7 @@
  * classes. If such a tag is found, the corresponding <code>Configuration</code>
  * class is instantiated and initialized using the classes of the
  * <code>beanutils</code> package (namely
- * <code>{@link org.apache.commons.configuration.beanutils.XMLBeanDeclaration XMLBeanDeclaration}</code>
+ * <code>{@link org.apache.commons.configuration2.beanutils.XMLBeanDeclaration XMLBeanDeclaration}</code>
  * will be used to extract the configuration's initialization parameters, which
  * allows for complex initialization szenarios).
  * </p>
@@ -122,7 +122,7 @@
  * <td valign="top"><code>config-optional</code></td>
  * <td>Declares a configuration as optional. This means that errors that occur
  * when creating the configuration are ignored. (However
- * <code>{@link org.apache.commons.configuration.event.ConfigurationErrorListener}</code>s
+ * <code>{@link org.apache.commons.configuration2.event.ConfigurationErrorListener}</code>s
  * registered at the builder instance will get notified about this error: they
  * receive an event of type <code>EVENT_ERR_LOAD_OPTIONAL</code>. The key
  * property of this event contains the name of the optional configuration source
@@ -299,8 +299,8 @@
 
     /** Constant for the provider for plist files. */
     private static final ConfigurationProvider PLIST_PROVIDER = new FileExtensionConfigurationProvider(
-            "org.apache.commons.configuration.plist.XMLPropertyListConfiguration",
-            "org.apache.commons.configuration.plist.PropertyListConfiguration",
+            "org.apache.commons.configuration2.plist.XMLPropertyListConfiguration",
+            "org.apache.commons.configuration2.plist.PropertyListConfiguration",
             EXT_XML);
 
     /** Constant for the provider for configuration definition files.*/
@@ -830,7 +830,7 @@
          * Returns the configuration. This method is called to fetch the
          * configuration from the provider. This implementation will call the
          * inherited <code>{@link
-         * org.apache.commons.configuration.beanutils.DefaultBeanFactory#createBean(Class, BeanDeclaration, Object)
+         * org.apache.commons.configuration2.beanutils.DefaultBeanFactory#createBean(Class, BeanDeclaration, Object)
          * createBean()}</code> method to create a new instance of the
          * configuration class.
          *

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/EnvironmentConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/EnvironmentConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/EnvironmentConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.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.lang.reflect.Method;
 import java.util.Collection;
@@ -93,7 +93,7 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.apache.commons.configuration.AbstractConfiguration#containsKey(java.lang.String)
+     * @see org.apache.commons.configuration2.AbstractConfiguration#containsKey(java.lang.String)
      */
     public boolean containsKey(String key)
     {
@@ -103,7 +103,7 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.apache.commons.configuration.AbstractConfiguration#getKeys()
+     * @see org.apache.commons.configuration2.AbstractConfiguration#getKeys()
      */
     public Iterator getKeys()
     {
@@ -113,7 +113,7 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.apache.commons.configuration.AbstractConfiguration#getProperty(java.lang.String)
+     * @see org.apache.commons.configuration2.AbstractConfiguration#getProperty(java.lang.String)
      */
     public Object getProperty(String key)
     {
@@ -123,7 +123,7 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.apache.commons.configuration.AbstractConfiguration#isEmpty()
+     * @see org.apache.commons.configuration2.AbstractConfiguration#isEmpty()
      */
     public boolean isEmpty()
     {

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/FileConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/FileConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/FileConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/FileConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/FileConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/FileConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/FileConfiguration.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.io.InputStream;
@@ -24,7 +24,7 @@
 import java.io.Writer;
 import java.io.File;
 
-import org.apache.commons.configuration.reloading.ReloadingStrategy;
+import org.apache.commons.configuration2.reloading.ReloadingStrategy;
 
 /**
  * A persistent configuration loaded and saved to a file.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.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.Serializable;
 import java.util.ArrayList;
@@ -28,15 +28,15 @@
 
 import org.apache.commons.collections.set.ListOrderedSet;
 import org.apache.commons.collections.iterators.SingletonIterator;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.ConfigurationNodeVisitor;
-import org.apache.commons.configuration.tree.ConfigurationNodeVisitorAdapter;
-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.configuration.tree.NodeAddData;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNodeVisitor;
+import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultExpressionEngine;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.NodeAddData;
 import org.apache.commons.lang.StringUtils;
 
 /**
@@ -104,7 +104,7 @@
  * expression engine, which is used when a new <code>HierarchicalConfiguration</code>
  * instance is created. With the <code>setExpressionEngine()</code> method a
  * different expression engine can be set. For instance with
- * <code>{@link org.apache.commons.configuration.tree.xpath.XPathExpressionEngine}</code>
+ * <code>{@link org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine}</code>
  * there is an expression engine available that supports configuration keys in
  * XPATH syntax.</p>
  * <p>In addition to the events common for all configuration classes hierarchical
@@ -1161,7 +1161,7 @@
      * A data class for storing (hierarchical) property information. A property
      * can have a value and an arbitrary number of child properties. From
      * version 1.3 on this class is only a thin wrapper over the
-     * <code>{@link org.apache.commons.configuration.tree.DefaultConfigurationNode DefaultconfigurationNode}</code>
+     * <code>{@link org.apache.commons.configuration2.tree.DefaultConfigurationNode DefaultconfigurationNode}</code>
      * class that exists mainly for the purpose of backwards compatibility.
      */
     public static class Node extends DefaultConfigurationNode implements Serializable

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationConverter.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationConverter.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationConverter.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.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;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationXMLReader.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationXMLReader.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java Sat Jan 12 09:06:33 2008
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Iterator;
 
-import org.apache.commons.configuration.HierarchicalConfiguration.Node;
+import org.apache.commons.configuration2.HierarchicalConfiguration.Node;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.AttributesImpl;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalXMLConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalXMLConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalXMLConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalXMLConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalXMLConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/HierarchicalXMLConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/HierarchicalXMLConfiguration.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;
 
 /**
  * A specialized hierarchical configuration class that is able to parse XML

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/INIConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/INIConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/INIConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/INIConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/INIConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/INIConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/INIConfiguration.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.BufferedReader;
 import java.io.File;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/JNDIConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/JNDIConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/JNDIConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.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.HashSet;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/MapConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/MapConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/MapConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/MapConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/MapConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/MapConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/MapConfiguration.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.Iterator;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.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.FilterWriter;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.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.IOException;
 import java.io.Reader;
@@ -25,8 +25,8 @@
 import java.util.Set;
 
 import org.apache.commons.collections.map.LinkedMap;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
 import org.apache.commons.lang.StringUtils;
 
 /**

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertyConverter.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/PropertyConverter.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertyConverter.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertyConverter.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/PropertyConverter.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/PropertyConverter.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PropertyConverter.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.lang.reflect.Array;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/StrictConfigurationComparator.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/StrictConfigurationComparator.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/StrictConfigurationComparator.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.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.Iterator;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/SubnodeConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/SubnodeConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/SubnodeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java Sat Jan 12 09:06:33 2008
@@ -14,14 +14,14 @@
  * 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.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
 
 /**
  * <p>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/SubsetConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/SubsetConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/SubsetConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.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.Iterator;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/SystemConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/SystemConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/SystemConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/SystemConfiguration.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;
 
 /**
  * A configuration based on the system properties.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/XMLConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/XMLConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/XMLConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/XMLConfiguration.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.IOException;
@@ -44,7 +44,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.DOMException;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/XMLPropertiesConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/XMLPropertiesConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/XMLPropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.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.PrintWriter;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/BeanDeclaration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/BeanDeclaration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/BeanDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.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.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
 import java.util.Map;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/BeanFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/BeanFactory.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/BeanFactory.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.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.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
 /**
  * <p>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.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.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
@@ -25,7 +25,7 @@
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.configuration.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.ConfigurationRuntimeException;
 import org.apache.commons.lang.ClassUtils;
 
 /**

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.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.lang.reflect.Array;
 import java.util.Collection;
@@ -24,26 +24,26 @@
 
 import org.apache.commons.beanutils.DynaBean;
 import org.apache.commons.beanutils.DynaClass;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationMap;
-import org.apache.commons.configuration.ConversionException;
-import org.apache.commons.configuration.SubsetConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationMap;
+import org.apache.commons.configuration2.ConversionException;
+import org.apache.commons.configuration2.SubsetConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
  * The <tt>ConfigurationDynaBean</tt> dynamically reads and writes
  * configurations properties from a wrapped configuration-collection
- * {@link org.apache.commons.configuration.Configuration} instance. It also
+ * {@link org.apache.commons.configuration2.Configuration} instance. It also
  * implements a {@link java.util.Map} interface so that it can be used in
  * JSP 2.0 Expression Language expressions.
  *
  * <p>The <code>ConfigurationDynaBean</code> maps nested and mapped properties
  * to the appropriate <code>Configuration</code> subset using the
- * {@link org.apache.commons.configuration.Configuration#subset}
+ * {@link org.apache.commons.configuration2.Configuration#subset}
  * method. Similarly, indexed properties reference lists of configuration
  * properties using the
- * {@link org.apache.commons.configuration.Configuration#getList(String)}
+ * {@link org.apache.commons.configuration2.Configuration#getList(String)}
  * method. Setting an indexed property always throws an exception.</p>
  *
  * <p>Note: Some of the methods expect that a dot (&quot;.&quot;) is used as

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.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.Iterator;
 import java.util.ArrayList;
@@ -24,14 +24,14 @@
 import org.apache.commons.beanutils.DynaBean;
 import org.apache.commons.beanutils.DynaClass;
 import org.apache.commons.beanutils.DynaProperty;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
  * The <tt>ConfigurationDynaClass</tt> dynamically determines properties for
  * a <code>ConfigurationDynaBean</code> from a wrapped configuration-collection
- * {@link org.apache.commons.configuration.Configuration} instance.
+ * {@link org.apache.commons.configuration2.Configuration} instance.
  *
  * @author <a href="mailto:ricardo.gladwell@btinternet.com">Ricardo Gladwell</a>
  * @version $Revision$, $Date$

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.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.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
 /**
  * <p>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java Sat Jan 12 09:06:33 2008
@@ -14,17 +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.HierarchicalConfiguration;
-import org.apache.commons.configuration.PropertyConverter;
-import org.apache.commons.configuration.SubnodeConfiguration;
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.DefaultConfigurationNode;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.PropertyConverter;
+import org.apache.commons.configuration2.SubnodeConfiguration;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
 
 /**
  * <p>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationErrorEvent.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationErrorEvent.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationErrorEvent.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.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.event;
+package org.apache.commons.configuration2.event;
 
 /**
  * <p>
@@ -23,8 +23,8 @@
  * </p>
  * <p>
  * Some configuration implementations (e.g.
- * <code>{@link org.apache.commons.configuration.DatabaseConfiguration}</code>
- * or <code>{@link org.apache.commons.configuration.JNDIConfiguration}</code>
+ * <code>{@link org.apache.commons.configuration2.DatabaseConfiguration}</code>
+ * or <code>{@link org.apache.commons.configuration2.JNDIConfiguration}</code>
  * use an underlying storage that can throw an exception on each property
  * access. In earlier versions of this library such exceptions were logged and
  * then silently ignored. This makes it impossible for a client to find out that

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorListener.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationErrorListener.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorListener.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorListener.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationErrorListener.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationErrorListener.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorListener.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.event;
+package org.apache.commons.configuration2.event;
 
 /**
  * <p>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationEvent.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationEvent.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationEvent.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.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.event;
+package org.apache.commons.configuration2.event;
 
 import java.util.EventObject;
 
@@ -48,7 +48,7 @@
  * <p>
  * The following standard events are generated by typical configuration
  * implementations (the constants for the event types are defined in
- * <code>{@link org.apache.commons.configuration.AbstractConfiguration}</code>):
+ * <code>{@link org.apache.commons.configuration2.AbstractConfiguration}</code>):
  * <dl>
  * <dt>EVENT_ADD_PROPERTY</dt>
  * <dd>This event is triggered for each call of the <code>addProperty()</code>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationListener.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationListener.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationListener.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationListener.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationListener.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/ConfigurationListener.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/ConfigurationListener.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.event;
+package org.apache.commons.configuration2.event;
 
 /**
  * <p>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/EventSource.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/EventSource.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/EventSource.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/EventSource.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/EventSource.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/event/EventSource.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/event/EventSource.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.event;
+package org.apache.commons.configuration2.event;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -49,7 +49,7 @@
  * (which is the default), detail events are suppressed, so only property set
  * events will be received. Note that the number of received detail events may
  * differ for different configuration implementations.
- * <code>{@link org.apache.commons.configuration.HierarchicalConfiguration HierarchicalConfiguration}</code>
+ * <code>{@link org.apache.commons.configuration2.HierarchicalConfiguration HierarchicalConfiguration}</code>
  * for instance has a custom implementation of <code>setProperty()</code>,
  * which does not generate any detail events.
  * </p>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/interpol/ConfigurationInterpolator.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/interpol/ConfigurationInterpolator.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/interpol/ConfigurationInterpolator.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.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.interpol;
+package org.apache.commons.configuration2.interpol;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -73,7 +73,7 @@
  * interpreted as a constant member field of a class (i.e. a field with the
  * <b>static final</b> modifiers). The name of the variable must be of the form
  * <code>&lt;full qualified class name&gt;.&lt;field name&gt;</code>, e.g.
- * <code>org.apache.commons.configuration.interpol.ConfigurationInterpolator.PREFIX_CONSTANTS
+ * <code>org.apache.commons.configuration2.interpol.ConfigurationInterpolator.PREFIX_CONSTANTS
  * </code>.</td>
  * </tr>
  * </table>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/interpol/ConstantLookup.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/interpol/ConstantLookup.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/interpol/ConstantLookup.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.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.interpol;
+package org.apache.commons.configuration2.interpol;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/ParseException.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/ParseException.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/ParseException.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/ParseException.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/ParseException.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/ParseException.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/ParseException.java Sat Jan 12 09:06:33 2008
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 /**
  * This exception is thrown when parse errors are encountered.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.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.PrintWriter;
@@ -31,11 +31,11 @@
 import java.util.TimeZone;
 
 import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.configuration.AbstractHierarchicalFileConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.MapConfiguration;
+import org.apache.commons.configuration2.AbstractHierarchicalFileConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.MapConfiguration;
 import org.apache.commons.lang.StringUtils;
 
 /**

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListParser.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListParser.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListParser.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.java Sat Jan 12 09:06:33 2008
@@ -1,12 +1,12 @@
 /* Generated By:JavaCC: Do not edit this line. PropertyListParser.java */
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
 
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.HierarchicalConfiguration.Node;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration.Node;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.codec.binary.Hex;