You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/09/12 20:04:46 UTC
svn commit: r1624601 [6/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...
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -31,17 +31,17 @@ import java.util.List;
import java.util.Map;
import junitx.framework.ListAssert;
-import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.event.ConfigurationErrorEvent;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventSource;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration.sync.NoOpSynchronizer;
-import org.apache.commons.configuration.tree.DefaultExpressionEngine;
-import org.apache.commons.configuration.tree.DefaultExpressionEngineSymbols;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventSource;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.sync.NoOpSynchronizer;
+import org.apache.commons.configuration2.tree.DefaultExpressionEngine;
+import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -43,9 +43,9 @@ import java.util.NoSuchElementException;
import junitx.framework.ArrayAssert;
import junitx.framework.ListAssert;
-import org.apache.commons.configuration.convert.DefaultConversionHandler;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.ex.ConversionException;
+import org.apache.commons.configuration2.convert.DefaultConversionHandler;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConversionException;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -28,13 +28,13 @@ import java.sql.SQLException;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.configuration.builder.fluent.DatabaseBuilderParameters;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.event.ConfigurationErrorEvent;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ErrorListenerTestImpl;
-import org.apache.commons.configuration.event.EventType;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.builder.fluent.DatabaseBuilderParameters;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ErrorListenerTestImpl;
+import org.apache.commons.configuration2.event.EventType;
+import org.apache.commons.configuration2.ex.ConfigurationException;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -32,24 +32,24 @@ import java.io.Reader;
import java.io.Writer;
import java.util.Random;
-import org.apache.commons.configuration.SynchronizerTestImpl.Methods;
-import org.apache.commons.configuration.builder.BuilderConfigurationWrapperFactory;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.builder.CopyObjectDefaultHandler;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.FileBasedBuilderProperties;
-import org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
-import org.apache.commons.configuration.builder.combined.MultiFileConfigurationBuilder;
-import org.apache.commons.configuration.builder.combined.ReloadingCombinedConfigurationBuilder;
-import org.apache.commons.configuration.builder.fluent.Parameters;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration.interpol.Lookup;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.sync.LockMode;
-import org.apache.commons.configuration.sync.ReadWriteSynchronizer;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.SynchronizerTestImpl.Methods;
+import org.apache.commons.configuration2.builder.BuilderConfigurationWrapperFactory;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.builder.CopyObjectDefaultHandler;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.FileBasedBuilderProperties;
+import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.combined.MultiFileConfigurationBuilder;
+import org.apache.commons.configuration2.builder.combined.ReloadingCombinedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.sync.LockMode;
+import org.apache.commons.configuration2.sync.ReadWriteSynchronizer;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.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 static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java Fri Sep 12 18:04:36 2014
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,10 +24,10 @@ import static org.junit.Assert.assertTru
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java Fri Sep 12 18:04:36 2014
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,7 +19,7 @@ package org.apache.commons.configuration
import static org.junit.Assert.assertEquals;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.io.FileHandler;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -24,12 +24,12 @@ import static org.junit.Assert.assertTru
import java.util.Collection;
import java.util.List;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration.tree.DefaultConfigurationKey;
-import org.apache.commons.configuration.tree.DefaultExpressionEngine;
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.NodeStructureHelper;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.tree.DefaultConfigurationKey;
+import org.apache.commons.configuration2.tree.DefaultExpressionEngine;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.NodeStructureHelper;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.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 static org.junit.Assert.assertEquals;
@@ -24,8 +24,8 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.SAXSource;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.tree.ImmutableNode;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.tree.ImmutableNode;
import org.apache.commons.jxpath.JXPathContext;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java Fri Sep 12 18:04:36 2014
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,7 +25,7 @@ import java.io.File;
import java.util.Collection;
import java.util.Iterator;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.io.FileHandler;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
* the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -34,14 +34,14 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.commons.configuration.SynchronizerTestImpl.Methods;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.sync.ReadWriteSynchronizer;
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.NodeHandler;
+import org.apache.commons.configuration2.SynchronizerTestImpl.Methods;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.sync.ReadWriteSynchronizer;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.NodeHandler;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -24,9 +24,9 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.ex.ConfigurationException;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -31,10 +31,10 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.commons.configuration.event.ConfigurationErrorEvent;
-import org.apache.commons.configuration.event.ErrorListenerTestImpl;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventType;
+import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.event.ErrorListenerTestImpl;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventType;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -25,10 +25,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.EventListenerTestImpl;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.EventListenerTestImpl;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java Fri Sep 12 18:04:36 2014
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.io.FileHandler;
import org.junit.Before;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -28,9 +28,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.configuration.convert.LegacyListDelimiterHandler;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.io.FileHandler;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java Fri Sep 12 18:04:36 2014
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.StringWriter;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -48,16 +48,16 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.commons.configuration.SynchronizerTestImpl.Methods;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
-import org.apache.commons.configuration.convert.LegacyListDelimiterHandler;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.SynchronizerTestImpl.Methods;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
+import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
import org.apache.commons.lang3.mutable.MutableObject;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -28,11 +28,11 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.util.Iterator;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.convert.LegacyListDelimiterHandler;
-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.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.ex.ConfigurationException;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java Fri Sep 12 18:04:36 2014
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,9 +24,9 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration2.io.FileHandler;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.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 static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
@@ -28,17 +28,17 @@ import java.util.NoSuchElementException;
import java.util.Set;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
-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.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.InMemoryNodeModel;
-import org.apache.commons.configuration.tree.NodeSelector;
-import org.apache.commons.configuration.tree.NodeStructureHelper;
-import org.apache.commons.configuration.tree.TrackedNodeModel;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
+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.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.InMemoryNodeModel;
+import org.apache.commons.configuration2.tree.NodeSelector;
+import org.apache.commons.configuration2.tree.NodeStructureHelper;
+import org.apache.commons.configuration2.tree.TrackedNodeModel;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -31,12 +31,12 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-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.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.Lookup;
import org.easymock.EasyMock;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -26,8 +26,8 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
-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.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java Fri Sep 12 18:04:36 2014
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,14 +21,14 @@ import static org.junit.Assert.assertEqu
import java.util.List;
-import org.apache.commons.configuration.convert.LegacyListDelimiterHandler;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler;
+import org.apache.commons.configuration2.io.FileHandler;
import org.junit.Before;
import org.junit.Test;
/**
* A base class for testing {@link
- * org.apache.commons.configuration.BasePropertiesConfiguration}
+ * org.apache.commons.configuration2.BasePropertiesConfiguration}
* extensions.
*
* @version $Id$
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.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 static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
@@ -41,17 +41,17 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.apache.commons.configuration.SynchronizerTestImpl.Methods;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.resolver.CatalogResolver;
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.NodeStructureHelper;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.SynchronizerTestImpl.Methods;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.resolver.CatalogResolver;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.NodeStructureHelper;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
import org.junit.Before;
import org.junit.Test;
import org.xml.sax.SAXException;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -40,7 +40,7 @@ import java.io.StringWriter;
import java.util.Collection;
import java.util.HashSet;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationException;
import org.easymock.EasyMock;
import org.junit.Test;
import org.w3c.dom.Document;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -30,8 +30,8 @@ import javax.xml.transform.stream.Stream
import java.io.File;
import java.net.URL;
-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.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.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;
/**
* A simple bean class used for testing bean creation operations.
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.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.beanutils;
+package org.apache.commons.configuration2.beanutils;
import java.util.ArrayList;
import java.util.List;
/**
- * A simple bean class used for testing bean creation operations that has
+ * A simple bean class used for testing bean creation operations that has
* a list of children of a different bean type.
*
* @version $Id$
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.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;
/**
* Another test bean class for bean creation operations which defines some constructors.
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.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/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -29,8 +29,8 @@ import java.util.Map;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.LazyDynaBean;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -31,9 +31,9 @@ import java.util.List;
import junitx.framework.ObjectAssert;
import org.apache.commons.beanutils.DynaProperty;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.MapConfiguration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.MapConfiguration;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.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.beanutils;
+package org.apache.commons.configuration2.beanutils;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.XMLConfiguration;
/**
* An additional test class for ConfigurationDynaBean. This test class performs
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.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 static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -30,10 +30,10 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.configuration.PropertiesConfiguration;
-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.PropertiesConfiguration;
+import org.apache.commons.configuration2.convert.ConversionHandler;
+import org.apache.commons.configuration2.convert.DefaultConversionHandler;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -26,9 +26,9 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.configuration.BaseHierarchicalConfiguration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventType;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventType;
/**
* A test implementation of an event listener for configuration builders. This
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.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;
/**
* A test bean used to check whether all properties can be found.
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.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.event.ConfigurationEvent;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -29,13 +29,13 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-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.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;
import org.easymock.EasyMock;
import org.junit.Before;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -30,30 +30,30 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.BaseHierarchicalConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.Initializable;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.beanutils.BeanCreationContext;
-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.convert.DefaultListDelimiterHandler;
-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.ErrorListenerTestImpl;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventListenerRegistrationData;
-import org.apache.commons.configuration.event.EventListenerTestImpl;
-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.configuration.reloading.ReloadingDetector;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.Initializable;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.beanutils.BeanCreationContext;
+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.convert.DefaultListDelimiterHandler;
+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.ErrorListenerTestImpl;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventListenerRegistrationData;
+import org.apache.commons.configuration2.event.EventListenerTestImpl;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingDetector;
import org.easymock.EasyMock;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -22,12 +22,12 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-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.configuration2.Configuration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+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.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -24,16 +24,16 @@ import static org.junit.Assert.fail;
import java.util.Collection;
-import org.apache.commons.configuration.BaseHierarchicalConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.builder.BuilderConfigurationWrapperFactory.EventSourceSupport;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventListenerTestImpl;
-import org.apache.commons.configuration.event.EventSource;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.BuilderConfigurationWrapperFactory.EventSourceSupport;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventListenerTestImpl;
+import org.apache.commons.configuration2.event.EventSource;
+import org.apache.commons.configuration2.ex.ConfigurationException;
import org.easymock.EasyMock;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java Fri Sep 12 18:04:36 2014
@@ -14,14 +14,14 @@
* 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 static org.junit.Assert.assertEquals;
import java.util.Map;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
import org.easymock.EasyMock;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.sql.DataSource;
-import org.apache.commons.configuration.beanutils.BeanHelper;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -23,12 +23,12 @@ import static org.junit.Assert.assertSam
import java.util.Map;
-import org.apache.commons.configuration.builder.fluent.FileBasedBuilderParameters;
-import org.apache.commons.configuration.builder.fluent.Parameters;
-import org.apache.commons.configuration.builder.fluent.PropertiesBuilderParameters;
-import org.apache.commons.configuration.builder.fluent.XMLBuilderParameters;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters;
+import org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.BeforeClass;