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 [7/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/builder/TestDefaultReloadingDetectorFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDefaultReloadingDetectorFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDefaultReloadingDetectorFactory.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestDefaultReloadingDetectorFactory.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-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.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.reloading.FileHandlerReloadingDetector;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.EventListenerRegistrationData;
-import org.apache.commons.configuration.event.EventListenerTestImpl;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.EventListenerRegistrationData;
+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/builder/TestFileBasedBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.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;
@@ -28,12 +28,12 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.io.FileBased;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.io.FileLocationStrategy;
-import org.apache.commons.configuration.io.FileSystem;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.io.FileBased;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.io.FileLocationStrategy;
+import org.apache.commons.configuration2.io.FileSystem;
import org.easymock.EasyMock;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.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;
@@ -31,16 +31,16 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.XMLPropertiesConfiguration;
-import org.apache.commons.configuration.builder.fluent.Parameters;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.io.FileLocator;
-import org.apache.commons.configuration.io.FileLocatorUtils;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.XMLPropertiesConfiguration;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.io.FileLocator;
+import org.apache.commons.configuration2.io.FileLocatorUtils;
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/builder/TestHierarchicalBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import java.util.Map;
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
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/TestJndiBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.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.naming.Context;
-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/TestPropertiesBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import java.util.Map;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.PropertiesConfigurationLayout;
-import org.apache.commons.configuration.beanutils.BeanHelper;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.PropertiesConfigurationLayout;
+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/TestReloadingBuilderSupportListener.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java Fri Sep 12 18:04:36 2014
@@ -14,17 +14,17 @@
* 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.assertNotNull;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.reloading.ReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingDetector;
-import org.apache.commons.configuration.reloading.ReloadingEvent;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingDetector;
+import org.apache.commons.configuration2.reloading.ReloadingEvent;
import org.easymock.EasyMock;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.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;
@@ -25,11 +25,11 @@ import static org.junit.Assert.assertTru
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.configuration.PropertiesConfiguration;
-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.PropertiesConfiguration;
+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;
import org.easymock.EasyMock;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.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.xml.parsers.DocumentBuilder;
-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/combined/AbstractMultiFileConfigurationBuilderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.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.combined;
+package org.apache.commons.configuration2.builder.combined;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration.interpol.DefaultLookups;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.DefaultLookups;
import org.junit.After;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java Fri Sep 12 18:04:36 2014
@@ -14,28 +14,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
-import org.apache.commons.configuration.BaseHierarchicalConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.ReloadingFileBasedConfigurationBuilder;
-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.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
+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/combined/TestCombinedBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -26,16 +26,16 @@ import static org.junit.Assert.assertTru
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.builder.DefaultParametersHandler;
-import org.apache.commons.configuration.builder.DefaultParametersManager;
-import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
-import org.apache.commons.configuration.builder.fluent.FileBasedBuilderParameters;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.builder.DefaultParametersHandler;
+import org.apache.commons.configuration2.builder.DefaultParametersManager;
+import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters;
import org.easymock.EasyMock;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -36,46 +36,46 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-import org.apache.commons.configuration.BaseHierarchicalConfiguration;
-import org.apache.commons.configuration.CombinedConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.DynamicCombinedConfiguration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.XMLPropertiesConfiguration;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration.builder.BuilderEventListenerImpl;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.builder.ConfigurationBuilderEvent;
-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.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.PropertiesBuilderParametersImpl;
-import org.apache.commons.configuration.builder.ReloadingFileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
-import org.apache.commons.configuration.builder.XMLBuilderProperties;
-import org.apache.commons.configuration.builder.fluent.FileBasedBuilderParameters;
-import org.apache.commons.configuration.builder.fluent.Parameters;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-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.DefaultFileSystem;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.io.FileLocatorUtils;
-import org.apache.commons.configuration.io.FileSystem;
-import org.apache.commons.configuration.reloading.ReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingControllerSupport;
-import org.apache.commons.configuration.resolver.CatalogResolver;
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.DynamicCombinedConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.XMLPropertiesConfiguration;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.BuilderEventListenerImpl;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent;
+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.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.PropertiesBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.XMLBuilderProperties;
+import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+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.DefaultFileSystem;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.io.FileLocatorUtils;
+import org.apache.commons.configuration2.io.FileSystem;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingControllerSupport;
+import org.apache.commons.configuration2.resolver.CatalogResolver;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
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/builder/combined/TestCombinedConfigurationBuilderVFS.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
@@ -22,15 +22,15 @@ import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.configuration.BaseHierarchicalConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration.builder.fluent.FileBasedBuilderParameters;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.VFSFileSystem;
-import org.apache.commons.configuration.tree.ImmutableNode;
+import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.VFSFileSystem;
+import org.apache.commons.configuration2.tree.ImmutableNode;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-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/combined/TestFileExtensionConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
@@ -22,13 +22,13 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Locale;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.XMLPropertiesConfiguration;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.ReloadingFileBasedConfigurationBuilder;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLPropertiesConfiguration;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
+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/combined/TestMultiFileBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -25,9 +25,9 @@ import static org.junit.Assert.assertSam
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
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/combined/TestMultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -28,28 +28,28 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import org.apache.commons.configuration.ConfigurationLookup;
-import org.apache.commons.configuration.DynamicCombinedConfiguration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BuilderConfigurationWrapperFactory;
-import org.apache.commons.configuration.builder.BuilderEventListenerImpl;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.ConfigurationBuilderEvent;
-import org.apache.commons.configuration.builder.ConfigurationBuilderResultCreatedEvent;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventListenerTestImpl;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration.interpol.DefaultLookups;
-import org.apache.commons.configuration.tree.ExpressionEngine;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.ConfigurationLookup;
+import org.apache.commons.configuration2.DynamicCombinedConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BuilderConfigurationWrapperFactory;
+import org.apache.commons.configuration2.builder.BuilderEventListenerImpl;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent;
+import org.apache.commons.configuration2.builder.ConfigurationBuilderResultCreatedEvent;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventListenerTestImpl;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.DefaultLookups;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
import org.easymock.EasyMock;
import org.junit.Test;
import org.xml.sax.SAXParseException;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -28,10 +28,10 @@ import java.util.Map;
import org.apache.commons.beanutils.DynaClass;
import org.apache.commons.beanutils.LazyDynaBean;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
@@ -23,15 +23,15 @@ import static org.junit.Assert.assertTru
import java.io.File;
import java.util.Collection;
-import org.apache.commons.configuration.CombinedConfiguration;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.XMLConfiguration;
-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.configuration.reloading.CombinedReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingControllerSupport;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.reloading.CombinedReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingControllerSupport;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -25,28 +25,28 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.text.MessageFormat;
-import org.apache.commons.configuration.BaseHierarchicalConfiguration;
-import org.apache.commons.configuration.CombinedConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-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.ReloadingDetectorFactory;
-import org.apache.commons.configuration.builder.ReloadingFileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.fluent.Parameters;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.reloading.AlwaysReloadingDetector;
-import org.apache.commons.configuration.reloading.RandomReloadingDetector;
-import org.apache.commons.configuration.reloading.ReloadingDetector;
-import org.apache.commons.configuration.sync.ReadWriteSynchronizer;
-import org.apache.commons.configuration.sync.Synchronizer;
-import org.apache.commons.configuration.tree.MergeCombiner;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+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.ReloadingDetectorFactory;
+import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.reloading.AlwaysReloadingDetector;
+import org.apache.commons.configuration2.reloading.RandomReloadingDetector;
+import org.apache.commons.configuration2.reloading.ReloadingDetector;
+import org.apache.commons.configuration2.sync.ReadWriteSynchronizer;
+import org.apache.commons.configuration2.sync.Synchronizer;
+import org.apache.commons.configuration2.tree.MergeCombiner;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
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/builder/combined/TestReloadingMultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.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.combined;
+package org.apache.commons.configuration2.builder.combined;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -25,15 +25,15 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.ReloadingFileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.reloading.ReloadingController;
-import org.apache.commons.configuration.tree.ExpressionEngine;
-import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
import org.easymock.EasyMock;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.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.fluent;
+package org.apache.commons.configuration2.builder.fluent;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -23,16 +23,16 @@ import static org.junit.Assert.assertSam
import java.io.File;
import java.net.URL;
-import org.apache.commons.configuration.CombinedConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationAssert;
-import org.apache.commons.configuration.INIConfiguration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.plist.PropertyListConfiguration;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationAssert;
+import org.apache.commons.configuration2.INIConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.plist.PropertyListConfiguration;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.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.fluent;
+package org.apache.commons.configuration2.builder.fluent;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -25,17 +25,17 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.DefaultParametersHandler;
-import org.apache.commons.configuration.builder.DefaultParametersManager;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.combined.CombinedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.combined.MultiFileBuilderParametersImpl;
-import org.apache.commons.configuration.convert.ListDelimiterHandler;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.DefaultParametersHandler;
+import org.apache.commons.configuration2.builder.DefaultParametersManager;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.combined.CombinedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.combined.MultiFileBuilderParametersImpl;
+import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.BeforeClass;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.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.convert;
+package org.apache.commons.configuration2.convert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -28,8 +28,8 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.configuration.ex.ConversionException;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.ex.ConversionException;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.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.convert;
+package org.apache.commons.configuration2.convert;
import static org.junit.Assert.assertEquals;
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
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/convert/TestDisabledListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.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.convert;
+package org.apache.commons.configuration2.convert;
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/convert/TestPropertyConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertSam
import java.lang.annotation.ElementType;
import java.math.BigDecimal;
-import org.apache.commons.configuration.ex.ConversionException;
+import org.apache.commons.configuration2.ex.ConversionException;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.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.event;
+package org.apache.commons.configuration2.event;
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/event/AbstractTestConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/AbstractTestConfigurationEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/AbstractTestConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/AbstractTestConfigurationEvents.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.event;
+package org.apache.commons.configuration2.event;
-import org.apache.commons.configuration.AbstractConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/ErrorListenerTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/ErrorListenerTestImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/ErrorListenerTestImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/ErrorListenerTestImpl.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.event;
+package org.apache.commons.configuration2.event;
import static org.junit.Assert.assertEquals;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/EventListenerTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/EventListenerTestImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/EventListenerTestImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/EventListenerTestImpl.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.event;
+package org.apache.commons.configuration2.event;
import static org.junit.Assert.assertEquals;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.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.event;
+package org.apache.commons.configuration2.event;
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/event/TestDatabaseConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestDatabaseConfigurationEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestDatabaseConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestDatabaseConfigurationEvents.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.event;
+package org.apache.commons.configuration2.event;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.DatabaseConfigurationTestHelper;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.DatabaseConfigurationTestHelper;
+import org.apache.commons.configuration2.ex.ConfigurationException;
import org.junit.After;
import org.junit.Before;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEvent.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEvent.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEvent.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEvent.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.event;
+package org.apache.commons.configuration2.event;
import static org.junit.Assert.assertEquals;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.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.event;
+package org.apache.commons.configuration2.event;
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/event/TestEventSource.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventSource.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.event;
+package org.apache.commons.configuration2.event;
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/event/TestEventType.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventType.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventType.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestEventType.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.event;
+package org.apache.commons.configuration2.event;
import static org.junit.Assert.assertEquals;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.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.event;
+package org.apache.commons.configuration2.event;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -22,13 +22,13 @@ import static org.junit.Assert.assertTru
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.BaseHierarchicalConfiguration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.tree.ImmutableNode;
-import org.apache.commons.configuration.tree.NodeHandler;
-import org.apache.commons.configuration.tree.NodeStructureHelper;
-import org.apache.commons.configuration.tree.QueryResult;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+import org.apache.commons.configuration2.tree.NodeHandler;
+import org.apache.commons.configuration2.tree.NodeStructureHelper;
+import org.apache.commons.configuration2.tree.QueryResult;
import org.junit.Test;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestMapConfigurationEvents.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.event;
+package org.apache.commons.configuration2.event;
import java.util.HashMap;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.MapConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.MapConfiguration;
/**
* Test class for the events generated by MapConfiguration.
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestPropertiesConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestPropertiesConfigurationEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestPropertiesConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestPropertiesConfigurationEvents.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.event;
+package org.apache.commons.configuration2.event;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
/**
* Test class for the events generated by properties configurations. This class
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestSubsetConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestSubsetConfigurationEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestSubsetConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestSubsetConfigurationEvents.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.event;
+package org.apache.commons.configuration2.event;
import java.util.HashMap;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.MapConfiguration;
-import org.apache.commons.configuration.SubsetConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.MapConfiguration;
+import org.apache.commons.configuration2.SubsetConfiguration;
/**
* Test class for the events generated by SubsetConfiguration.
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestXMLConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestXMLConfigurationEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestXMLConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/event/TestXMLConfigurationEvents.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.event;
+package org.apache.commons.configuration2.event;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
/**
* Test class for events generated by XMLConfiguration.
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.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.interpol;
+package org.apache.commons.configuration2.interpol;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;