Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.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.assertNull;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestDummyLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestDummyLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestDummyLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestDummyLookup.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.assertNull; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestEnvironmentLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestEnvironmentLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestEnvironmentLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestEnvironmentLookup.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.interpol; +package org.apache.commons.configuration2.interpol; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import java.util.Iterator; -import org.apache.commons.configuration.EnvironmentConfiguration; +import org.apache.commons.configuration2.EnvironmentConfiguration; import org.junit.Before; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.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.interpol; +package org.apache.commons.configuration2.interpol; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.File; -import org.apache.commons.configuration.ConfigurationAssert; -import org.apache.commons.configuration.XMLConfiguration; -import org.apache.commons.configuration.io.FileHandler; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.Log4JLogger; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.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.assertNull; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestSystemPropertiesLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestSystemPropertiesLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestSystemPropertiesLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/interpol/TestSystemPropertiesLookup.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.assertNull; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestAbsoluteNameLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestAbsoluteNameLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestAbsoluteNameLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestAbsoluteNameLocationStrategy.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.io; +package org.apache.commons.configuration2.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNul import java.io.File; import java.net.URL; -import org.apache.commons.configuration.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationAssert; 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/io/TestBasePathLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestBasePathLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestBasePathLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestBasePathLocationStrategy.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.io; +package org.apache.commons.configuration2.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNul import java.io.File; import java.net.URL; -import org.apache.commons.configuration.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationAssert; 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/io/TestClasspathLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestClasspathLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestClasspathLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestClasspathLocationStrategy.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.io; +package org.apache.commons.configuration2.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import java.net.URL; -import org.apache.commons.configuration.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationAssert; 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/io/TestCombinedLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestCombinedLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestCombinedLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestCombinedLocationStrategy.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.io; +package org.apache.commons.configuration2.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -25,7 +25,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; -import org.apache.commons.configuration.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationAssert; 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/io/TestDefaultFileSystem.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.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.io; +package org.apache.commons.configuration2.io; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.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.io; +package org.apache.commons.configuration2.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -44,11 +44,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.configuration.ConfigurationAssert; -import org.apache.commons.configuration.PropertiesConfiguration; -import org.apache.commons.configuration.SynchronizerTestImpl; -import org.apache.commons.configuration.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration.ex.ConfigurationException; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.SynchronizerTestImpl; +import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.easymock.EasyMock; import org.junit.Rule; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.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.io; +package org.apache.commons.configuration2.io; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertTha import java.net.URL; -import org.apache.commons.configuration.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationAssert; 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/io/TestFileLocatorUtils.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.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.io; +package org.apache.commons.configuration2.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -32,9 +32,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.apache.commons.configuration.ConfigurationAssert; -import org.apache.commons.configuration.XMLConfiguration; -import org.apache.commons.configuration.ex.ConfigurationException; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; 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/io/TestFileSystemLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileSystemLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileSystemLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestFileSystemLocationStrategy.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.io; +package org.apache.commons.configuration2.io; import static org.junit.Assert.assertSame; import java.net.URL; -import org.apache.commons.configuration.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationAssert; 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/io/TestHomeDirectoryLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestHomeDirectoryLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestHomeDirectoryLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestHomeDirectoryLocationStrategy.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.io; +package org.apache.commons.configuration2.io; 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/io/TestProvidedURLLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestProvidedURLLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestProvidedURLLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/io/TestProvidedURLLocationStrategy.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.io; +package org.apache.commons.configuration2.io; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import java.net.URL; -import org.apache.commons.configuration.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationAssert; 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/plist/AbstractTestPListEvents.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/AbstractTestPListEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/AbstractTestPListEvents.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/AbstractTestPListEvents.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.plist; +package org.apache.commons.configuration2.plist; -import org.apache.commons.configuration.event.AbstractTestConfigurationEvents; -import org.apache.commons.configuration.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.AbstractTestConfigurationEvents; +import org.apache.commons.configuration2.event.ConfigurationEvent; import org.junit.Test; /** Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.plist; +package org.apache.commons.configuration2.plist; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,15 +35,15 @@ import junitx.framework.ArrayAssert; import junitx.framework.ListAssert; import junitx.framework.ObjectAssert; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationAssert; -import org.apache.commons.configuration.ConfigurationComparator; -import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.configuration.StrictConfigurationComparator; -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.NodeHandler; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationComparator; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.StrictConfigurationComparator; +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.NodeHandler; 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/plist/TestPropertyListConfigurationEvents.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfigurationEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfigurationEvents.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfigurationEvents.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.plist; +package org.apache.commons.configuration2.plist; import java.io.File; -import org.apache.commons.configuration.AbstractConfiguration; -import org.apache.commons.configuration.ConfigurationAssert; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration.io.FileHandler; +import org.apache.commons.configuration2.AbstractConfiguration; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.io.FileHandler; /** * Test class for the events generated by PropertyListConfiguration. Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.plist; +package org.apache.commons.configuration2.plist; import static org.junit.Assert.assertEquals; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.plist; +package org.apache.commons.configuration2.plist; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,12 +33,12 @@ import junitx.framework.ArrayAssert; import junitx.framework.ListAssert; import junitx.framework.ObjectAssert; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationAssert; -import org.apache.commons.configuration.ConfigurationComparator; -import org.apache.commons.configuration.StrictConfigurationComparator; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.io.FileHandler; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationComparator; +import org.apache.commons.configuration2.StrictConfigurationComparator; +import org.apache.commons.configuration2.ex.ConfigurationException; +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/plist/TestXMLPropertyListConfigurationEvents.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfigurationEvents.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfigurationEvents.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfigurationEvents.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.plist; +package org.apache.commons.configuration2.plist; import java.io.File; -import org.apache.commons.configuration.AbstractConfiguration; -import org.apache.commons.configuration.ConfigurationAssert; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration.io.FileHandler; +import org.apache.commons.configuration2.AbstractConfiguration; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.io.FileHandler; /** * Test class for the events generated by XMLPropertyListConfiguration. Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/AlwaysReloadingDetector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/AlwaysReloadingDetector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/AlwaysReloadingDetector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/AlwaysReloadingDetector.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.reloading; +package org.apache.commons.configuration2.reloading; /** * A reloading detector implementation which always indicates that a reload is Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/RandomReloadingDetector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/RandomReloadingDetector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/RandomReloadingDetector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/RandomReloadingDetector.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.reloading; +package org.apache.commons.configuration2.reloading; import java.util.Random; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestCombinedReloadingController.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestCombinedReloadingController.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestCombinedReloadingController.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestCombinedReloadingController.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.reloading; +package org.apache.commons.configuration2.reloading; 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/reloading/TestFileHandlerReloadingDetector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestFileHandlerReloadingDetector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestFileHandlerReloadingDetector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestFileHandlerReloadingDetector.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.reloading; +package org.apache.commons.configuration2.reloading; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertTru import java.io.File; import java.net.URL; -import org.apache.commons.configuration.io.FileHandler; +import org.apache.commons.configuration2.io.FileHandler; import org.easymock.EasyMock; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestManagedReloadingDetector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestManagedReloadingDetector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestManagedReloadingDetector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestManagedReloadingDetector.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; 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/reloading/TestPeriodicReloadingTrigger.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.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.reloading; +package org.apache.commons.configuration2.reloading; 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/reloading/TestReloadingController.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.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.reloading; +package org.apache.commons.configuration2.reloading; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import org.apache.commons.configuration.event.Event; -import org.apache.commons.configuration.event.EventListener; +import org.apache.commons.configuration2.event.Event; +import org.apache.commons.configuration2.event.EventListener; import org.apache.commons.lang3.mutable.MutableObject; import org.easymock.EasyMock; import org.easymock.IAnswer; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -24,10 +24,10 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; -import org.apache.commons.configuration.ConfigurationAssert; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration.io.FileHandler; -import org.apache.commons.configuration.io.VFSFileSystem; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.VFSFileSystem; import org.apache.commons.vfs2.FileName; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemException; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/sync/TestReadWriteSynchronizer.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/sync/TestReadWriteSynchronizer.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/sync/TestReadWriteSynchronizer.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/sync/TestReadWriteSynchronizer.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.sync; +package org.apache.commons.configuration2.sync; import static org.junit.Assert.assertEquals; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java Fri Sep 12 18:04:36 2014 @@ -1,4 +1,4 @@ -package org.apache.commons.configuration.test; +package org.apache.commons.configuration2.test; /* * Licensed to the Apache Software Foundation (ASF) under one or more Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/AbstractCombinerTest.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/AbstractCombinerTest.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/AbstractCombinerTest.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/AbstractCombinerTest.java Fri Sep 12 18:04:36 2014 @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.File; -import org.apache.commons.configuration.BaseHierarchicalConfiguration; -import org.apache.commons.configuration.ConfigurationAssert; -import org.apache.commons.configuration.XMLConfiguration; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.io.FileHandler; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +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/tree/AbstractImmutableNodeHandlerTest.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandlerTest.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandlerTest.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandlerTest.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.tree; +package org.apache.commons.configuration2.tree; -import static org.apache.commons.configuration.tree.NodeStructureHelper.ROOT_AUTHORS_TREE; -import static org.apache.commons.configuration.tree.NodeStructureHelper.ROOT_PERSONAE_TREE; -import static org.apache.commons.configuration.tree.NodeStructureHelper.nodeForKey; +import static org.apache.commons.configuration2.tree.NodeStructureHelper.ROOT_AUTHORS_TREE; +import static org.apache.commons.configuration2.tree.NodeStructureHelper.ROOT_PERSONAE_TREE; +import static org.apache.commons.configuration2.tree.NodeStructureHelper.nodeForKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.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.tree; +package org.apache.commons.configuration2.tree; import java.util.List; import java.util.NoSuchElementException; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultConfigurationKey.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultConfigurationKey.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultConfigurationKey.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultConfigurationKey.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.tree; +package org.apache.commons.configuration2.tree; 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/tree/TestDefaultExpressionEngine.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngine.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngine.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngine.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.tree; +package org.apache.commons.configuration2.tree; 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/tree/TestDefaultExpressionEngineSymbols.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngineSymbols.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngineSymbols.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngineSymbols.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.tree; +package org.apache.commons.configuration2.tree; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.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.tree; +package org.apache.commons.configuration2.tree; -import static org.apache.commons.configuration.tree.NodeStructureHelper.ROOT_AUTHORS_TREE; -import static org.apache.commons.configuration.tree.NodeStructureHelper.ROOT_PERSONAE_TREE; -import static org.apache.commons.configuration.tree.NodeStructureHelper.nodeForKey; -import static org.apache.commons.configuration.tree.NodeStructureHelper.nodePathWithEndNode; +import static org.apache.commons.configuration2.tree.NodeStructureHelper.ROOT_AUTHORS_TREE; +import static org.apache.commons.configuration2.tree.NodeStructureHelper.ROOT_PERSONAE_TREE; +import static org.apache.commons.configuration2.tree.NodeStructureHelper.nodeForKey; +import static org.apache.commons.configuration2.tree.NodeStructureHelper.nodePathWithEndNode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelReferences.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelReferences.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelReferences.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelReferences.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.tree; +package org.apache.commons.configuration2.tree; 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/tree/TestInMemoryNodeModelTrackedNodes.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.easymock.EasyMock; import org.easymock.IAnswer; import org.junit.Before; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestMergeCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestMergeCombiner.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestMergeCombiner.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestMergeCombiner.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,10 +22,10 @@ import static org.junit.Assert.assertNul import java.util.List; -import org.apache.commons.configuration.BaseHierarchicalConfiguration; -import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; import org.junit.Test; /** Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeAddData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeAddData.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeAddData.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeAddData.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeHandlerDecorator.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeHandlerDecorator.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeHandlerDecorator.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeHandlerDecorator.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.tree; +package org.apache.commons.configuration2.tree; /** * Test class for {@code NodeHandlerDecorator}. This class uses the abstract Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.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.tree; +package org.apache.commons.configuration2.tree; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.apache.commons.configuration.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationAssert; 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/tree/TestNodeTreeWalker.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertEquals; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeUpdateData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeUpdateData.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeUpdateData.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestNodeUpdateData.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestOverrideCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestOverrideCombiner.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestOverrideCombiner.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestOverrideCombiner.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import java.util.List; -import org.apache.commons.configuration.BaseHierarchicalConfiguration; -import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.configuration.ex.ConfigurationException; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +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/tree/TestQueryResult.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestQueryResult.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestQueryResult.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestQueryResult.java Fri Sep 12 18:04:36 2014 @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.tree; +package org.apache.commons.configuration2.tree; -import static org.apache.commons.configuration.ConfigurationAssert.checkEquals; +import static org.apache.commons.configuration2.ConfigurationAssert.checkEquals; import static org.hamcrest.CoreMatchers.containsString; 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/tree/TestTrackedNodeHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeHandler.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeHandler.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertSame; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeModel.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeModel.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeModel.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeModel.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertSame; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTreeData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTreeData.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTreeData.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestTreeData.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.tree; +package org.apache.commons.configuration2.tree; /** * Test class for {@code TreeData} Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestUnionCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestUnionCombiner.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestUnionCombiner.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/TestUnionCombiner.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.tree; +package org.apache.commons.configuration2.tree; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import org.apache.commons.configuration.BaseHierarchicalConfiguration; -import org.apache.commons.configuration.ex.ConfigurationException; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +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/tree/xpath/AbstractXPathTest.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.ArrayList; import java.util.List; -import org.apache.commons.configuration.tree.ImmutableNode; -import org.apache.commons.configuration.tree.InMemoryNodeModel; -import org.apache.commons.configuration.tree.NodeHandler; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.NodeHandler; import org.apache.commons.jxpath.ri.model.NodeIterator; import org.apache.commons.jxpath.ri.model.NodePointer; import org.junit.After; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationAttributePointer.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationAttributePointer.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationAttributePointer.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationAttributePointer.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,9 +24,9 @@ import static org.junit.Assert.assertTru import java.util.Locale; -import org.apache.commons.configuration.tree.ImmutableNode; -import org.apache.commons.configuration.tree.InMemoryNodeModel; -import org.apache.commons.configuration.tree.QueryResult; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.QueryResult; import org.apache.commons.jxpath.ri.Compiler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.compiler.NodeTest; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import org.apache.commons.configuration.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.ImmutableNode; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.model.NodePointer; import org.junit.Before; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -23,8 +23,8 @@ import static org.junit.Assert.assertTru import java.util.List; import java.util.Locale; -import org.apache.commons.configuration.tree.ImmutableNode; -import org.apache.commons.configuration.tree.NodeStructureHelper; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.NodeStructureHelper; import org.apache.commons.jxpath.ri.Compiler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.compiler.NodeNameTest; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTru import java.util.Locale; -import org.apache.commons.configuration.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.ImmutableNode; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.model.NodeIterator; import org.apache.commons.jxpath.ri.model.NodePointer; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointerFactory.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointerFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointerFactory.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointerFactory.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import static org.junit.Assert.assertEquals; import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.ImmutableNode; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; import org.junit.Before; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathContextFactory.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathContextFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathContextFactory.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathContextFactory.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import org.apache.commons.configuration.tree.ImmutableNode; -import org.apache.commons.configuration.tree.InMemoryNodeModel; -import org.apache.commons.configuration.tree.NodeHandler; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.NodeHandler; 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/tree/xpath/TestXPathExpressionEngine.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngine.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -26,11 +26,11 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration.tree.ImmutableNode; -import org.apache.commons.configuration.tree.InMemoryNodeModel; -import org.apache.commons.configuration.tree.NodeAddData; -import org.apache.commons.configuration.tree.NodeHandler; -import org.apache.commons.configuration.tree.QueryResult; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.NodeAddData; +import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration2.tree.QueryResult; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; import org.apache.commons.jxpath.ri.model.NodePointerFactory; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngineInConfig.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngineInConfig.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngineInConfig.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/tree/xpath/TestXPathExpressionEngineInConfig.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNot import java.io.StringReader; import java.util.Iterator; -import org.apache.commons.configuration.XMLConfiguration; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.io.FileHandler; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.Before; import org.junit.Test;
