Author: oheger
Date: Sat Aug 10 16:44:04 2013
New Revision: 1512796
URL: http://svn.apache.org/r1512796
Log:
Moved ListDelimiterHandler classes to convert package.
The topic of list delimiter handling is related to data type conversion.
Also, some functionality for detecting containers (arrays, collections, ...)
can be reused for some conversions.
Added:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/AbstractListDelimiterHandler.java
- copied, changed from r1512795,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DefaultListDelimiterHandler.java
- copied, changed from r1512795,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DisabledListDelimiterHandler.java
- copied, changed from r1512795,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DisabledListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/LegacyListDelimiterHandler.java
- copied, changed from r1512795,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/LegacyListDelimiterHandler.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java
- copied, changed from r1512795,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultListDelimiterHandler.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDisabledListDelimiterHandler.java
- copied, changed from r1512795,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDisabledListDelimiterHandler.java
Removed:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DisabledListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/LegacyListDelimiterHandler.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultListDelimiterHandler.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDisabledListDelimiterHandler.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/MapConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseNullConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubnodeConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestThreesomeConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileConfigurationBuilder.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiWrapDynaBean.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java
commons/proper/configuration/trunk/src/test/resources/testCCResultInitialization.xml
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -32,6 +32,8 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.configuration.convert.ConversionException;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
import org.apache.commons.configuration.event.BaseEventSource;
import org.apache.commons.configuration.event.ConfigurationErrorEvent;
import org.apache.commons.configuration.event.ConfigurationErrorListener;
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -30,6 +30,7 @@ import java.util.List;
import javax.sql.DataSource;
+import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.LogFactory;
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/MapConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/MapConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/MapConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/MapConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -24,6 +24,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
+
/**
* <p>
* A Map based Configuration.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.io.FileHandler;
import org.apache.commons.configuration.io.FileLocator;
import org.apache.commons.configuration.io.FileLocatorAware;
Copied:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/AbstractListDelimiterHandler.java
(from r1512795,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractListDelimiterHandler.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/AbstractListDelimiterHandler.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/AbstractListDelimiterHandler.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractListDelimiterHandler.java&r1=1512795&r2=1512796&rev=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractListDelimiterHandler.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/AbstractListDelimiterHandler.java
Sat Aug 10 16:44:04 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration.convert;
import java.lang.reflect.Array;
import java.util.ArrayList;
@@ -22,6 +22,9 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
+import org.apache.commons.configuration.ListDelimiterHandler;
+import org.apache.commons.configuration.ValueTransformer;
+
/**
* <p>
* An abstract base class for concrete {@code ListDelimiterHandler}
Copied:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DefaultListDelimiterHandler.java
(from r1512795,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultListDelimiterHandler.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DefaultListDelimiterHandler.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DefaultListDelimiterHandler.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultListDelimiterHandler.java&r1=1512795&r2=1512796&rev=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultListDelimiterHandler.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DefaultListDelimiterHandler.java
Sat Aug 10 16:44:04 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration.convert;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
+import org.apache.commons.configuration.ValueTransformer;
import org.apache.commons.lang3.StringUtils;
/**
Copied:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DisabledListDelimiterHandler.java
(from r1512795,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DisabledListDelimiterHandler.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DisabledListDelimiterHandler.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DisabledListDelimiterHandler.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DisabledListDelimiterHandler.java&r1=1512795&r2=1512796&rev=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DisabledListDelimiterHandler.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/DisabledListDelimiterHandler.java
Sat Aug 10 16:44:04 2013
@@ -14,12 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration.convert;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.commons.configuration.ListDelimiterHandler;
+import org.apache.commons.configuration.ValueTransformer;
+
/**
* <p>
* A specialized implementation of the {@code ListDelimiterHandler} interface
Copied:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/LegacyListDelimiterHandler.java
(from r1512795,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/LegacyListDelimiterHandler.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/LegacyListDelimiterHandler.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/LegacyListDelimiterHandler.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/LegacyListDelimiterHandler.java&r1=1512795&r2=1512796&rev=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/LegacyListDelimiterHandler.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/LegacyListDelimiterHandler.java
Sat Aug 10 16:44:04 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration.convert;
import java.util.ArrayList;
import java.util.Collection;
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.configuration.ValueTransformer;
import org.apache.commons.lang3.StringUtils;
/**
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
Sat Aug 10 16:44:04 2013
@@ -30,6 +30,8 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -40,6 +40,7 @@ import java.util.StringTokenizer;
import junitx.framework.ListAssert;
import org.apache.commons.configuration.convert.ConversionException;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseNullConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseNullConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseNullConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseNullConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -31,6 +31,7 @@ import java.util.NoSuchElementException;
import java.util.Properties;
import org.apache.commons.configuration.convert.ConversionException;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.junit.Before;
import org.junit.Test;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -38,6 +38,7 @@ import java.util.concurrent.atomic.Atomi
import junit.framework.Assert;
import org.apache.commons.configuration.SynchronizerTestImpl.Methods;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.io.FileHandler;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -34,6 +34,8 @@ import java.util.List;
import java.util.NoSuchElementException;
import org.apache.commons.configuration.SynchronizerTestImpl.Methods;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration.convert.LegacyListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.io.FileHandler;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java
Sat Aug 10 16:44:04 2013
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.commons.collections.ExtendedProperties;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.Test;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java
Sat Aug 10 16:44:04 2013
@@ -36,6 +36,7 @@ import java.util.Map;
import junitx.framework.ListAssert;
import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.event.EventSource;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -43,6 +43,7 @@ import junitx.framework.ArrayAssert;
import junitx.framework.ListAssert;
import org.apache.commons.configuration.convert.ConversionException;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -30,6 +30,7 @@ import java.util.List;
import javax.sql.DataSource;
import
org.apache.commons.configuration.builder.fluent.DatabaseBuilderParameters;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -40,6 +40,7 @@ import org.apache.commons.configuration.
import
org.apache.commons.configuration.builder.combined.MultiFileConfigurationBuilder;
import
org.apache.commons.configuration.builder.combined.ReloadingCombinedConfigurationBuilder;
import org.apache.commons.configuration.builder.fluent.Parameters;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration.interpol.Lookup;
import org.apache.commons.configuration.io.FileHandler;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.tree.ConfigurationNode;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -37,6 +37,7 @@ import java.util.Set;
import org.apache.commons.configuration.SynchronizerTestImpl.Methods;
import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.sync.ReadWriteSynchronizer;
import org.junit.Rule;
import org.junit.Test;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -25,6 +25,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.junit.Test;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.configuration.convert.LegacyListDelimiterHandler;
import org.apache.commons.configuration.io.FileHandler;
import org.junit.Before;
import org.junit.Test;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -51,6 +51,9 @@ import java.util.Set;
import org.apache.commons.configuration.SynchronizerTestImpl.Methods;
import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
import
org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
+import org.apache.commons.configuration.convert.LegacyListDelimiterHandler;
import org.apache.commons.configuration.io.FileHandler;
import org.apache.commons.lang3.mutable.MutableObject;
import org.junit.Before;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
Sat Aug 10 16:44:04 2013
@@ -28,6 +28,8 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.util.Iterator;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration.convert.LegacyListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.junit.Before;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubnodeConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubnodeConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubnodeConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubnodeConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -28,6 +28,8 @@ import java.util.NoSuchElementException;
import java.util.Set;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -33,6 +33,7 @@ import java.util.Set;
import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
import
org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration.interpol.Lookup;
import org.easymock.EasyMock;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestThreesomeConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestThreesomeConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestThreesomeConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestThreesomeConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEqu
import java.util.List;
+import org.apache.commons.configuration.convert.LegacyListDelimiterHandler;
import org.apache.commons.configuration.io.FileHandler;
import org.junit.Before;
import org.junit.Test;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -43,6 +43,8 @@ import javax.xml.parsers.ParserConfigura
import org.apache.commons.configuration.SynchronizerTestImpl.Methods;
import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
import org.apache.commons.configuration.io.FileHandler;
import org.apache.commons.configuration.resolver.CatalogResolver;
import org.apache.commons.configuration.tree.ConfigurationNode;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java
Sat Aug 10 16:44:04 2013
@@ -35,13 +35,13 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.ConfigurationRuntimeException;
-import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.Initializable;
import org.apache.commons.configuration.ListDelimiterHandler;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.beanutils.BeanDeclaration;
import org.apache.commons.configuration.beanutils.XMLBeanDeclaration;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.easymock.EasyMock;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
Sat Aug 10 16:44:04 2013
@@ -25,8 +25,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationAssert;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.DefaultListDelimiterHandler;
-import org.apache.commons.configuration.DisabledListDelimiterHandler;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.builder.BasicBuilderParameters;
@@ -36,6 +34,8 @@ import org.apache.commons.configuration.
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.junit.Test;
/**
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
Sat Aug 10 16:44:04 2013
@@ -45,7 +45,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationRuntimeException;
import org.apache.commons.configuration.ConfigurationUtils;
import org.apache.commons.configuration.DefaultFileSystem;
-import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.DynamicCombinedConfiguration;
import org.apache.commons.configuration.FileSystem;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -64,6 +63,7 @@ import org.apache.commons.configuration.
import
org.apache.commons.configuration.builder.ReloadingFileBasedConfigurationBuilder;
import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
import org.apache.commons.configuration.builder.fluent.Parameters;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileConfigurationBuilder.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileConfigurationBuilder.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileConfigurationBuilder.java
Sat Aug 10 16:44:04 2013
@@ -30,7 +30,6 @@ import java.util.Collections;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.ConfigurationLookup;
-import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.DynamicCombinedConfiguration;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
@@ -40,6 +39,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.builder.BuilderParameters;
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.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiWrapDynaBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiWrapDynaBean.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiWrapDynaBean.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiWrapDynaBean.java
Sat Aug 10 16:44:04 2013
@@ -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.DefaultListDelimiterHandler;
import org.apache.commons.configuration.ListDelimiterHandler;
import org.apache.commons.configuration.builder.BasicBuilderParameters;
import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.junit.Test;
/**
Copied:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java
(from r1512795,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultListDelimiterHandler.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java?p2=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java&p1=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultListDelimiterHandler.java&r1=1512795&r2=1512796&rev=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultListDelimiterHandler.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java
Sat Aug 10 16:44:04 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration.convert;
import static org.junit.Assert.assertEquals;
@@ -22,6 +22,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import org.apache.commons.configuration.ValueTransformer;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Copied:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDisabledListDelimiterHandler.java
(from r1512795,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDisabledListDelimiterHandler.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDisabledListDelimiterHandler.java?p2=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDisabledListDelimiterHandler.java&p1=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDisabledListDelimiterHandler.java&r1=1512795&r2=1512796&rev=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDisabledListDelimiterHandler.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDisabledListDelimiterHandler.java
Sat Aug 10 16:44:04 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration.convert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -22,6 +22,9 @@ import static org.junit.Assert.assertFal
import java.util.Arrays;
import java.util.Iterator;
+import org.apache.commons.configuration.ListDelimiterHandler;
+import org.apache.commons.configuration.ValueTransformer;
+import org.apache.commons.configuration.convert.DisabledListDelimiterHandler;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -24,9 +24,9 @@ import java.util.Properties;
import org.apache.commons.configuration.AbstractConfiguration;
import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.MapConfiguration;
import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.junit.Before;
import org.junit.Test;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -22,8 +22,8 @@ import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServlet;
import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.junit.Test;
import com.mockobjects.servlet.MockServletConfig;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -26,8 +26,8 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServlet;
import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.junit.Test;
import com.mockobjects.servlet.MockServletConfig;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -24,8 +24,8 @@ import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.junit.Test;
/**
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java
Sat Aug 10 16:44:04 2013
@@ -29,8 +29,8 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationMap;
-import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.TestAbstractConfiguration;
+import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.junit.Test;
import com.mockobjects.servlet.MockHttpServletRequest;
Modified:
commons/proper/configuration/trunk/src/test/resources/testCCResultInitialization.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testCCResultInitialization.xml?rev=1512796&r1=1512795&r2=1512796&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/resources/testCCResultInitialization.xml
(original)
+++
commons/proper/configuration/trunk/src/test/resources/testCCResultInitialization.xml
Sat Aug 10 16:44:04 2013
@@ -22,7 +22,7 @@
<header>
<result>
<listDelimiterHandler
-
config-class="org.apache.commons.configuration.DefaultListDelimiterHandler">
+
config-class="org.apache.commons.configuration.convert.DefaultListDelimiterHandler">
<config-constrarg config-value=","/>
</listDelimiterHandler>
<nodeCombiner
config-class="org.apache.commons.configuration.tree.OverrideCombiner"/>
