Author: oheger
Date: Sat Aug 10 16:49:31 2013
New Revision: 1512797
URL: http://svn.apache.org/r1512797
Log:
Moved PropertyConverter to convert package.
It will in future exclusively be used by classes in this package.
Added:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/PropertyConverter.java
- copied, changed from r1512796,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestPropertyConverter.java
- copied, changed from r1512796,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java
Removed:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.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
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DataConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.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=1512797&r1=1512796&r2=1512797&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:49:31 2013
@@ -34,6 +34,7 @@ import java.util.concurrent.atomic.Atomi
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.convert.PropertyConverter;
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=1512797&r1=1512796&r2=1512797&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:49:31 2013
@@ -33,6 +33,7 @@ import java.util.Locale;
import java.util.NoSuchElementException;
import org.apache.commons.configuration.convert.ConversionException;
+import org.apache.commons.configuration.convert.PropertyConverter;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils;
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java?rev=1512797&r1=1512796&r2=1512797&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java
Sat Aug 10 16:49:31 2013
@@ -20,7 +20,7 @@ import java.lang.reflect.Constructor;
import java.util.Collection;
import java.util.Collections;
-import org.apache.commons.configuration.PropertyConverter;
+import org.apache.commons.configuration.convert.PropertyConverter;
/**
* <p>
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java?rev=1512797&r1=1512796&r2=1512797&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java
Sat Aug 10 16:49:31 2013
@@ -26,8 +26,8 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationRuntimeException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.PropertyConverter;
import org.apache.commons.configuration.SubnodeConfiguration;
+import org.apache.commons.configuration.convert.PropertyConverter;
import org.apache.commons.configuration.tree.ConfigurationNode;
import org.apache.commons.configuration.tree.DefaultConfigurationNode;
Copied:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/PropertyConverter.java
(from r1512796,
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/convert/PropertyConverter.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/PropertyConverter.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java&r1=1512796&r2=1512797&rev=1512797&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/convert/PropertyConverter.java
Sat Aug 10 16:49:31 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.configuration;
+package org.apache.commons.configuration.convert;
import java.awt.Color;
import java.lang.reflect.Constructor;
@@ -32,7 +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.Configuration;
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/test/java/org/apache/commons/configuration/convert/TestPropertyConverter.java
(from r1512796,
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/convert/TestPropertyConverter.java?p2=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestPropertyConverter.java&p1=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertyConverter.java&r1=1512796&r2=1512797&rev=1512797&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/convert/TestPropertyConverter.java
Sat Aug 10 16:49:31 2013
@@ -15,7 +15,7 @@
* 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.assertSame;
@@ -23,7 +23,9 @@ import static org.junit.Assert.assertSam
import java.lang.annotation.ElementType;
import java.math.BigDecimal;
+import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.convert.ConversionException;
+import org.apache.commons.configuration.convert.PropertyConverter;
import org.junit.Test;
/**
