Author: oheger Date: Sat Aug 10 16:40:56 2013 New Revision: 1512794 URL: http://svn.apache.org/r1512794 Log: Created new convert package.
This package will contain the code responsible for data type conversions. The ConversionException class was moved into the new package. Added: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/ConversionException.java - copied, changed from r1511080, commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConversionException.java commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/package.html Removed: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConversionException.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/DataConfiguration.java commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ImmutableConfiguration.java commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfiguration.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/TestDataConfiguration.java commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java 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=1512794&r1=1512793&r2=1512794&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:40:56 2013 @@ -31,6 +31,7 @@ import java.util.NoSuchElementException; import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; +import org.apache.commons.configuration.convert.ConversionException; 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/DataConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DataConfiguration.java?rev=1512794&r1=1512793&r2=1512794&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DataConfiguration.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DataConfiguration.java Sat Aug 10 16:40:56 2013 @@ -32,6 +32,7 @@ import java.util.List; import java.util.Locale; import java.util.NoSuchElementException; +import org.apache.commons.configuration.convert.ConversionException; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.StringUtils; Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ImmutableConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ImmutableConfiguration.java?rev=1512794&r1=1512793&r2=1512794&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ImmutableConfiguration.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ImmutableConfiguration.java Sat Aug 10 16:40:56 2013 @@ -22,6 +22,8 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import org.apache.commons.configuration.convert.ConversionException; + /** * <p>The main interface for accessing configuration data in a read-only fashion.</p> * <p> Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java?rev=1512794&r1=1512793&r2=1512794&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java Sat Aug 10 16:40:56 2013 @@ -32,6 +32,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; +import org.apache.commons.configuration.convert.ConversionException; import org.apache.commons.configuration.interpol.ConfigurationInterpolator; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; Copied: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/ConversionException.java (from r1511080, commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConversionException.java) URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/ConversionException.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/ConversionException.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConversionException.java&r1=1511080&r2=1512794&rev=1512794&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConversionException.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/ConversionException.java Sat Aug 10 16:40:56 2013 @@ -15,7 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration.convert; + +import org.apache.commons.configuration.ConfigurationRuntimeException; /** * Exception thrown when a property is incompatible with the type requested. Added: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/package.html URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/package.html?rev=1512794&view=auto ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/package.html (added) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/package.html Sat Aug 10 16:40:56 2013 @@ -0,0 +1,45 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +<html> +<head> +</head> +<body> + +<p> +This package contains interfaces and classes related to data type conversions. +</p> +<p> +An <code>AbstractConfiguration</code> object is associated with an object +responsible for data type conversions. Each conversion is done by this object. +By replacing the default conversion handler by a custom version, client +applications can adapt and extend the type conversions available. +</p> +<p> +Related to data type conversion is also the topic of list delimiter parsing +and splitting; before a string value can be converted to a target data type, +it must be clear whether it is to be interpreted as a single value or as a +list containing multiple values. In this package there are classes implementing +different strategies for list delimiter handling. Client code can choose the +one which is most suitable for the current use case. +</p> +<p> +<font size="-2">$Id$</font> +</p> + +</body> +</html> Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfiguration.java?rev=1512794&r1=1512793&r2=1512794&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfiguration.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractConfiguration.java Sat Aug 10 16:40:56 2013 @@ -31,6 +31,7 @@ import java.util.List; import junitx.framework.ListAssert; +import org.apache.commons.configuration.convert.ConversionException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; 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=1512794&r1=1512793&r2=1512794&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:40:56 2013 @@ -39,6 +39,7 @@ import java.util.StringTokenizer; import junitx.framework.ListAssert; +import org.apache.commons.configuration.convert.ConversionException; 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=1512794&r1=1512793&r2=1512794&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:40:56 2013 @@ -30,6 +30,7 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.Properties; +import org.apache.commons.configuration.convert.ConversionException; import org.junit.Before; import org.junit.Test; 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=1512794&r1=1512793&r2=1512794&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:40:56 2013 @@ -42,6 +42,7 @@ import java.util.NoSuchElementException; import junitx.framework.ArrayAssert; import junitx.framework.ListAssert; +import org.apache.commons.configuration.convert.ConversionException; import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java?rev=1512794&r1=1512793&r2=1512794&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java Sat Aug 10 16:40:56 2013 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertSam import java.lang.annotation.ElementType; import java.math.BigDecimal; +import org.apache.commons.configuration.convert.ConversionException; import org.junit.Test; /**