commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r1624601 [2/9] - in /commons/proper/configuration/branches/configuration2-alpha/src: main/java/org/apache/commons/configuration/ main/java/org/apache/commons/configuration2/ main/java/org/apache/commons/configuration2/beanutils/ main/java/o...
Date Fri, 12 Sep 2014 18:04:46 GMT
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java Fri Sep 12 18:04:36 2014
@@ -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 @@ import java.util.Set;
 /**
  * <p>The {@code ConfigurationMap} wraps a
  * configuration-collection
- * {@link org.apache.commons.configuration.Configuration}
+ * {@link org.apache.commons.configuration2.Configuration}
  * instance to provide a {@code Map} interface.</p>
  *
  * <p><em>Note:</em> This implementation is incomplete.</p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -25,15 +25,15 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Iterator;
 
-import org.apache.commons.configuration.event.ConfigurationErrorEvent;
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventSource;
-import org.apache.commons.configuration.event.EventType;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration.sync.NoOpSynchronizer;
-import org.apache.commons.configuration.sync.Synchronizer;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventSource;
+import org.apache.commons.configuration2.event.EventType;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.sync.NoOpSynchronizer;
+import org.apache.commons.configuration2.sync.Synchronizer;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.IOException;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DataConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DataConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DataConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.awt.Color;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URL;
@@ -30,9 +29,9 @@ import java.util.List;
 import java.util.Locale;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.configuration.convert.ConversionHandler;
-import org.apache.commons.configuration.convert.DefaultConversionHandler;
-import org.apache.commons.configuration.ex.ConversionException;
+import org.apache.commons.configuration2.convert.ConversionHandler;
+import org.apache.commons.configuration2.convert.DefaultConversionHandler;
+import org.apache.commons.configuration2.ex.ConversionException;
 import org.apache.commons.lang3.StringUtils;
 
 /**

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import javax.sql.DataSource;
 import java.sql.Clob;
@@ -29,11 +29,11 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.event.ConfigurationErrorEvent;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.EventType;
+import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.EventType;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.LogFactory;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java Fri Sep 12 18:04:36 2014
@@ -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.math.BigDecimal;
 import java.math.BigInteger;
@@ -30,14 +30,14 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventType;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration.interpol.Lookup;
-import org.apache.commons.configuration.tree.ExpressionEngine;
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.NodeCombiner;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventType;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.NodeCombiner;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -114,7 +114,7 @@ public class DynamicCombinedConfiguratio
      * Creates a new instance of {@code DynamicCombinedConfiguration} that uses
      * a union combiner.
      *
-     * @see org.apache.commons.configuration.tree.UnionCombiner
+     * @see org.apache.commons.configuration2.tree.UnionCombiner
      */
     public DynamicCombinedConfiguration()
     {

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.HashMap;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java Fri Sep 12 18:04:36 2014
@@ -14,9 +14,9 @@
  * 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 org.apache.commons.configuration.io.FileBased;
+import org.apache.commons.configuration2.io.FileBased;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java Fri Sep 12 18:04:36 2014
@@ -14,10 +14,10 @@
  * 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 org.apache.commons.configuration.tree.ConfigurationNodeVisitorAdapter;
-import org.apache.commons.configuration.tree.NodeHandler;
+import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter;
+import org.apache.commons.configuration2.tree.NodeHandler;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java Fri Sep 12 18:04:36 2014
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.configuration.tree.ExpressionEngine;
-import org.apache.commons.configuration.tree.NodeModelSupport;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.NodeModelSupport;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,8 +25,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.configuration.tree.DefaultConfigurationKey;
-import org.apache.commons.configuration.tree.DefaultExpressionEngine;
+import org.apache.commons.configuration2.tree.DefaultConfigurationKey;
+import org.apache.commons.configuration2.tree.DefaultExpressionEngine;
 
 /**
  * <p>A base class for converters that transform a normal configuration

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java Fri Sep 12 18:04:36 2014
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
-import org.apache.commons.configuration.tree.ConfigurationNodeVisitorAdapter;
-import org.apache.commons.configuration.tree.NodeHandler;
-import org.apache.commons.configuration.tree.NodeTreeWalker;
+import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter;
+import org.apache.commons.configuration2.tree.NodeHandler;
+import org.apache.commons.configuration2.tree.NodeTreeWalker;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.AttributesImpl;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/INIConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/INIConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/INIConfiguration.java Fri Sep 12 18:04:36 2014
@@ -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.BufferedReader;
 import java.io.IOException;
@@ -30,16 +30,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.InMemoryNodeModel;
-import org.apache.commons.configuration.tree.InMemoryNodeModelSupport;
-import org.apache.commons.configuration.tree.NodeHandler;
-import org.apache.commons.configuration.tree.NodeHandlerDecorator;
-import org.apache.commons.configuration.tree.NodeSelector;
-import org.apache.commons.configuration.tree.TrackedNodeModel;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.InMemoryNodeModel;
+import org.apache.commons.configuration2.tree.InMemoryNodeModelSupport;
+import org.apache.commons.configuration2.tree.NodeHandler;
+import org.apache.commons.configuration2.tree.NodeHandlerDecorator;
+import org.apache.commons.configuration2.tree.NodeSelector;
+import org.apache.commons.configuration2.tree.TrackedNodeModel;
 
 /**
  * <p>
@@ -114,7 +114,7 @@ import org.apache.commons.configuration.
  * '.' (period). Thus a parameter named "var1" in "section1" will have the key
  * {@code section1.var1} in this configuration. (This is the default
  * behavior. Because this is a hierarchical configuration you can change this by
- * setting a different {@link org.apache.commons.configuration.tree.ExpressionEngine}.)
+ * setting a different {@link org.apache.commons.configuration2.tree.ExpressionEngine}.)
  * </p>
  * <p>
  * <h3>Implementation Details:</h3> Consider the following ini file:<br>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java Fri Sep 12 18:04:36 2014
@@ -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.math.BigDecimal;
 import java.math.BigInteger;
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 
-import org.apache.commons.configuration.ex.ConversionException;
+import org.apache.commons.configuration2.ex.ConversionException;
 
 /**
  * <p>The main interface for accessing configuration data in a read-only fashion.</p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java Fri Sep 12 18:04:36 2014
@@ -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.InvocationHandler;
 import java.lang.reflect.Method;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java Fri Sep 12 18:04:36 2014
@@ -14,11 +14,11 @@
  * 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.List;
 
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/Initializable.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/Initializable.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/Initializable.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/Initializable.java Fri Sep 12 18:04:36 2014
@@ -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;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -31,7 +31,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.configuration.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.LogFactory;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/MapConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/MapConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/MapConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/MapConfiguration.java Fri Sep 12 18:04:36 2014
@@ -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;
@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java Fri Sep 12 18:04:36 2014
@@ -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;
@@ -27,13 +27,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventType;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileBased;
-import org.apache.commons.configuration.tree.ExpressionEngine;
-import org.apache.commons.configuration.tree.ImmutableNode;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventType;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileBased;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.ImmutableNode;
 
 /**
  * Wraps a BaseHierarchicalConfiguration and allows subtrees to be accessed via a configured path with

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java Fri Sep 12 18:04:36 2014
@@ -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.NoSuchElementException;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.FilterWriter;
 import java.io.IOException;
@@ -29,16 +29,16 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.convert.ValueTransformer;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.io.FileLocator;
-import org.apache.commons.configuration.io.FileLocatorAware;
-import org.apache.commons.configuration.io.FileLocatorUtils;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ValueTransformer;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.io.FileLocator;
+import org.apache.commons.configuration2.io.FileLocatorAware;
+import org.apache.commons.configuration2.io.FileLocatorUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java Fri Sep 12 18:04:36 2014
@@ -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;
@@ -24,10 +24,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 import org.apache.commons.lang3.StringUtils;
 
 /**

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Iterator;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java Fri Sep 12 18:04:36 2014
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.InMemoryNodeModel;
-import org.apache.commons.configuration.tree.NodeModel;
-import org.apache.commons.configuration.tree.NodeSelector;
-import org.apache.commons.configuration.tree.TrackedNodeModel;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.InMemoryNodeModel;
+import org.apache.commons.configuration2.tree.NodeModel;
+import org.apache.commons.configuration2.tree.NodeSelector;
+import org.apache.commons.configuration2.tree.TrackedNodeModel;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java Fri Sep 12 18:04:36 2014
@@ -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.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
 
 /**
  * <p>A subset of another configuration. The new Configuration object contains

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Iterator;
 
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -40,15 +40,15 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileLocator;
-import org.apache.commons.configuration.io.FileLocatorAware;
-import org.apache.commons.configuration.io.InputStreamSupport;
-import org.apache.commons.configuration.resolver.DefaultEntityResolver;
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.NodeTreeWalker;
-import org.apache.commons.configuration.tree.ReferenceNodeHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileLocator;
+import org.apache.commons.configuration2.io.FileLocatorAware;
+import org.apache.commons.configuration2.io.InputStreamSupport;
+import org.apache.commons.configuration2.resolver.DefaultEntityResolver;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.NodeTreeWalker;
+import org.apache.commons.configuration2.tree.ReferenceNodeHandler;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.apache.commons.logging.LogFactory;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java Fri Sep 12 18:04:36 2014
@@ -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 javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -31,7 +31,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.PrintWriter;
 import java.io.Reader;
@@ -26,10 +26,10 @@ import java.util.List;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileLocator;
-import org.apache.commons.configuration.io.FileLocatorAware;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileLocator;
+import org.apache.commons.configuration2.io.FileLocatorAware;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java Fri Sep 12 18:04:36 2014
@@ -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>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java Fri Sep 12 18:04:36 2014
@@ -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.Collection;
 import java.util.Map;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java Fri Sep 12 18:04:36 2014
@@ -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>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java Fri Sep 12 18:04:36 2014
@@ -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.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
@@ -34,7 +34,7 @@ import org.apache.commons.beanutils.Flue
 import org.apache.commons.beanutils.PropertyUtilsBean;
 import org.apache.commons.beanutils.WrapDynaBean;
 import org.apache.commons.beanutils.WrapDynaClass;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 import org.apache.commons.lang3.ClassUtils;
 
 /**

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java Fri Sep 12 18:04:36 2014
@@ -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.ArrayList;
 import java.util.Arrays;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java Fri Sep 12 18:04:36 2014
@@ -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;
@@ -23,25 +23,25 @@ import java.util.List;
 
 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.SubsetConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationMap;
+import org.apache.commons.configuration2.SubsetConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
  * The {@code ConfigurationDynaBean} 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} maps nested and mapped properties
  * to the appropriate {@code Configuration} 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 is supported, too.</p>
  *
  * <p>Note: Some of the methods expect that a dot (&quot;.&quot;) is used as

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.beanutils;
+package org.apache.commons.configuration2.beanutils;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,14 +24,14 @@ import java.util.List;
 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 {@code ConfigurationDynaClass} dynamically determines properties for
  * a {@code ConfigurationDynaBean} 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 $Id$

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java Fri Sep 12 18:04:36 2014
@@ -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>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java Fri Sep 12 18:04:36 2014
@@ -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.Constructor;
 import java.util.Collection;
@@ -22,9 +22,9 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.configuration.convert.ConversionHandler;
-import org.apache.commons.configuration.convert.DefaultConversionHandler;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.convert.ConversionHandler;
+import org.apache.commons.configuration2.convert.DefaultConversionHandler;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java Fri Sep 12 18:04:36 2014
@@ -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.ArrayList;
 import java.util.Collection;
@@ -24,11 +24,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.configuration.BaseHierarchicalConfiguration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration.tree.NodeHandler;
+import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.tree.NodeHandler;
 import org.apache.commons.lang3.StringUtils;
 
 /**

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/package-info.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/beanutils/package-info.java Fri Sep 12 18:04:36 2014
@@ -26,4 +26,4 @@
  *
  * @version $Id$
  */
-package org.apache.commons.configuration.beanutils;
+package org.apache.commons.configuration2.beanutils;

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java Fri Sep 12 18:04:36 2014
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.io.FileHandlerListenerAdapter;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.io.FileHandlerListenerAdapter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.convert.ConversionHandler;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration.interpol.InterpolatorSpecification;
-import org.apache.commons.configuration.interpol.Lookup;
-import org.apache.commons.configuration.sync.Synchronizer;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.convert.ConversionHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.InterpolatorSpecification;
+import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.sync.Synchronizer;
 import org.apache.commons.logging.Log;
 
 /**

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java Fri Sep 12 18:04:36 2014
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.convert.ConversionHandler;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration.interpol.Lookup;
-import org.apache.commons.configuration.sync.Synchronizer;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.convert.ConversionHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.sync.Synchronizer;
 import org.apache.commons.logging.Log;
 
 /**

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -22,21 +22,21 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationUtils;
-import org.apache.commons.configuration.Initializable;
-import org.apache.commons.configuration.beanutils.BeanDeclaration;
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.beanutils.ConstructorArg;
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventListenerList;
-import org.apache.commons.configuration.event.EventListenerRegistrationData;
-import org.apache.commons.configuration.event.EventSource;
-import org.apache.commons.configuration.event.EventType;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration.reloading.ReloadingController;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.Initializable;
+import org.apache.commons.configuration2.beanutils.BeanDeclaration;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.beanutils.ConstructorArg;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventListenerList;
+import org.apache.commons.configuration2.event.EventListenerRegistrationData;
+import org.apache.commons.configuration2.event.EventSource;
+import org.apache.commons.configuration2.event.EventType;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.reloading.ReloadingController;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java Fri Sep 12 18:04:36 2014
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationUtils;
-import org.apache.commons.configuration.event.EventSource;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.event.EventSource;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
 import java.util.Map;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java Fri Sep 12 18:04:36 2014
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.event.EventSource;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.event.EventSource;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java Fri Sep 12 18:04:36 2014
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventType;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventType;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java Fri Sep 12 18:04:36 2014
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.event.EventType;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.event.EventType;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java Fri Sep 12 18:04:36 2014
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
 import javax.sql.DataSource;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
 import javax.sql.DataSource;
 

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java Fri Sep 12 18:04:36 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
-import org.apache.commons.configuration.builder.fluent.Parameters;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java Fri Sep 12 18:04:36 2014
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.commons.configuration.builder.fluent.FileBasedBuilderParameters;
-import org.apache.commons.configuration.builder.fluent.PropertiesBuilderParameters;
-import org.apache.commons.configuration.builder.fluent.XMLBuilderParameters;
+import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters;
+import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters;
+import org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java Fri Sep 12 18:04:36 2014
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.reloading.FileHandlerReloadingDetector;
-import org.apache.commons.configuration.reloading.ReloadingDetector;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.reloading.FileHandlerReloadingDetector;
+import org.apache.commons.configuration2.reloading.ReloadingDetector;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java Fri Sep 12 18:04:36 2014
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
 import java.util.Collections;
 import java.util.Map;
 
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventListenerList;
-import org.apache.commons.configuration.event.EventListenerRegistrationData;
-import org.apache.commons.configuration.event.EventType;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventListenerList;
+import org.apache.commons.configuration2.event.EventListenerRegistrationData;
+import org.apache.commons.configuration2.event.EventType;
 
 /**
  * <p>

Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java Fri Sep 12 18:04:36 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
 
-import org.apache.commons.configuration.event.EventListenerList;
+import org.apache.commons.configuration2.event.EventListenerList;
 
 /**
  * <p>



Mime
View raw message