You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2008/04/06 22:10:10 UTC
svn commit: r645295 - in
/commons/proper/configuration/branches/configuration2_experimental/src:
main/java/org/apache/commons/configuration2/
main/java/org/apache/commons/configuration2/flat/
test/java/org/apache/commons/configuration2/ test/java/org/a...
Author: oheger
Date: Sun Apr 6 13:10:04 2008
New Revision: 645295
URL: http://svn.apache.org/viewvc?rev=645295&view=rev
Log:
Moved BaseConfiguration into flat package (a few additional changes were required to make the compiler happy)
Added:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/flat/BaseConfiguration.java
- copied, changed from r636104, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/flat/TestBaseConfiguration.java
- copied, changed from r636104, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
Removed:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractFileConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java
Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractFileConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractFileConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractFileConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractFileConfiguration.java Sun Apr 6 13:10:04 2008
@@ -35,6 +35,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import org.apache.commons.configuration2.reloading.InvariantReloadingStrategy;
import org.apache.commons.configuration2.reloading.ReloadingStrategy;
import org.apache.commons.lang.StringUtils;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java Sun Apr 6 13:10:04 2008
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.ListIterator;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
+
/**
* This Configuration class allows you to add multiple different types of Configuration
* to this CompositeConfiguration. If you add Configuration1, and then Configuration2,
Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java Sun Apr 6 13:10:04 2008
@@ -248,7 +248,7 @@
* @return the cloned object
* @throws CloneNotSupportedException if the object cannot be cloned
*/
- static Object clone(Object obj) throws CloneNotSupportedException
+ public static Object clone(Object obj) throws CloneNotSupportedException
{
if (obj instanceof Cloneable)
{
Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/flat/BaseConfiguration.java (from r636104, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/flat/BaseConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/flat/BaseConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java&r1=636104&r2=645295&rev=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/flat/BaseConfiguration.java Sun Apr 6 13:10:04 2008
@@ -15,13 +15,19 @@
* limitations under the License.
*/
-package org.apache.commons.configuration2;
+package org.apache.commons.configuration2.flat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
/**
* Basic configuration classe. Stores the configuration data but does not
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java Sun Apr 6 13:10:04 2008
@@ -21,15 +21,17 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.configuration2.AbstractConfiguration;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.configuration2.event.ConfigurationEvent;
import org.apache.commons.configuration2.event.ConfigurationListener;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import junit.framework.TestCase;
@@ -257,6 +259,54 @@
AbstractConfiguration config = setUpDestConfig();
config.append(null);
ConfigurationAssert.assertEquals(setUpDestConfig(), config);
+ }
+
+ public void testResolveContainerStore()
+ {
+ AbstractConfiguration config = new BaseConfiguration();
+
+ // array of objects
+ config.addPropertyDirect("array", new String[] { "foo", "bar" });
+
+ assertEquals("first element of the 'array' property", "foo", config.resolveContainerStore("array"));
+
+ // list of objects
+ List<String> list = new ArrayList<String>();
+ list.add("foo");
+ list.add("bar");
+ config.addPropertyDirect("list", list);
+
+ assertEquals("first element of the 'list' property", "foo", config.resolveContainerStore("list"));
+
+ // set of objects
+ Set<String> set = new LinkedHashSet<String>();
+ set.add("foo");
+ set.add("bar");
+ config.addPropertyDirect("set", set);
+
+ assertEquals("first element of the 'set' property", "foo", config.resolveContainerStore("set"));
+
+ // arrays of primitives
+ config.addPropertyDirect("array.boolean", new boolean[] { true, false });
+ assertEquals("first element of the 'array.boolean' property", true, config.getBoolean("array.boolean"));
+
+ config.addPropertyDirect("array.byte", new byte[] { 1, 2 });
+ assertEquals("first element of the 'array.byte' property", 1, config.getByte("array.byte"));
+
+ config.addPropertyDirect("array.short", new short[] { 1, 2 });
+ assertEquals("first element of the 'array.short' property", 1, config.getShort("array.short"));
+
+ config.addPropertyDirect("array.int", new int[] { 1, 2 });
+ assertEquals("first element of the 'array.int' property", 1, config.getInt("array.int"));
+
+ config.addPropertyDirect("array.long", new long[] { 1, 2 });
+ assertEquals("first element of the 'array.long' property", 1, config.getLong("array.long"));
+
+ config.addPropertyDirect("array.float", new float[] { 1, 2 });
+ assertEquals("first element of the 'array.float' property", 1, config.getFloat("array.float"), 0);
+
+ config.addPropertyDirect("array.double", new double[] { 1, 2 });
+ assertEquals("first element of the 'array.double' property", 1, config.getDouble("array.double"), 0);
}
/**
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java Sun Apr 6 13:10:04 2008
@@ -26,8 +26,8 @@
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.SAXSource;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.BaseConfigurationXMLReader;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import org.apache.commons.jxpath.JXPathContext;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java Sun Apr 6 13:10:04 2008
@@ -24,9 +24,9 @@
import java.util.NoSuchElementException;
import java.util.Properties;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConversionException;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import junit.framework.TestCase;
import junitx.framework.ObjectAssert;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java Sun Apr 6 13:10:04 2008
@@ -27,7 +27,6 @@
import java.util.NoSuchElementException;
import java.util.Collection;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.CompositeConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConfigurationConverter;
@@ -38,6 +37,7 @@
import org.apache.commons.configuration2.XMLConfiguration;
import org.apache.commons.configuration2.event.ConfigurationEvent;
import org.apache.commons.configuration2.event.ConfigurationListener;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import org.apache.commons.configuration2.reloading.FileAlwaysReloadingStrategy;
import junit.framework.TestCase;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java Sun Apr 6 13:10:04 2008
@@ -22,9 +22,9 @@
import java.util.Properties;
import junit.framework.TestCase;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConfigurationConverter;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
/**
* Tests the ConfigurationConverter class.
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java Sun Apr 6 13:10:04 2008
@@ -17,8 +17,8 @@
package org.apache.commons.configuration2;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.ConfigurationMap;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java Sun Apr 6 13:10:04 2008
@@ -19,8 +19,8 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.ConfigurationMap;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java Sun Apr 6 13:10:04 2008
@@ -23,12 +23,12 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConfigurationRuntimeException;
import org.apache.commons.configuration2.ConfigurationUtils;
import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import com.mockobjects.dynamic.Mock;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java Sun Apr 6 13:10:04 2008
@@ -33,6 +33,8 @@
import java.util.NoSuchElementException;
import javax.mail.internet.InternetAddress;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
+
import junit.framework.TestCase;
import junitx.framework.ArrayAssert;
import junitx.framework.ListAssert;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java Sun Apr 6 13:10:04 2008
@@ -22,12 +22,12 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.CompositeConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConfigurationConverter;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import junit.framework.TestCase;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java Sun Apr 6 13:10:04 2008
@@ -34,6 +34,7 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy;
import junit.framework.TestCase;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java Sun Apr 6 13:10:04 2008
@@ -21,6 +21,7 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import org.apache.commons.lang.StringUtils;
import junit.framework.TestCase;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java Sun Apr 6 13:10:04 2008
@@ -17,10 +17,10 @@
package org.apache.commons.configuration2;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConfigurationComparator;
import org.apache.commons.configuration2.StrictConfigurationComparator;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import junit.framework.TestCase;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java Sun Apr 6 13:10:04 2008
@@ -25,6 +25,8 @@
import java.util.NoSuchElementException;
import java.util.Set;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
+
import junit.framework.TestCase;
/**
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java Sun Apr 6 13:10:04 2008
@@ -24,9 +24,9 @@
import junit.framework.TestCase;
import junitx.framework.ObjectAssert;
import org.apache.commons.beanutils.DynaProperty;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.beanutils.ConfigurationDynaBean;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
/**
* <p>Test Case for the <code>ConfigurationDynaBean</code> implementation class.
Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/flat/TestBaseConfiguration.java (from r636104, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/flat/TestBaseConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/flat/TestBaseConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java&r1=636104&r2=645295&rev=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/flat/TestBaseConfiguration.java Sun Apr 6 13:10:04 2008
@@ -15,28 +15,25 @@
* limitations under the License.
*/
-package org.apache.commons.configuration2;
+package org.apache.commons.configuration2.flat;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Properties;
-import java.util.Set;
import java.util.StringTokenizer;
import junit.framework.TestCase;
import junitx.framework.ListAssert;
import junitx.framework.ObjectAssert;
-import org.apache.commons.configuration2.AbstractConfiguration;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConversionException;
+import org.apache.commons.configuration2.InterpolationTestHelper;
import org.apache.commons.configuration2.event.ConfigurationEvent;
import org.apache.commons.configuration2.event.ConfigurationListener;
@@ -691,54 +688,6 @@
assertEquals("long value", 0xFFFFFFFFFFFFFFFFL, config.getLong("number"));
assertEquals("long value", 0xFFFFFFFFFFFFFFFFL, config.getBigInteger("number").longValue());
- }
-
- public void testResolveContainerStore()
- {
- AbstractConfiguration config = new BaseConfiguration();
-
- // array of objects
- config.addPropertyDirect("array", new String[] { "foo", "bar" });
-
- assertEquals("first element of the 'array' property", "foo", config.resolveContainerStore("array"));
-
- // list of objects
- List<String> list = new ArrayList<String>();
- list.add("foo");
- list.add("bar");
- config.addPropertyDirect("list", list);
-
- assertEquals("first element of the 'list' property", "foo", config.resolveContainerStore("list"));
-
- // set of objects
- Set<String> set = new LinkedHashSet<String>();
- set.add("foo");
- set.add("bar");
- config.addPropertyDirect("set", set);
-
- assertEquals("first element of the 'set' property", "foo", config.resolveContainerStore("set"));
-
- // arrays of primitives
- config.addPropertyDirect("array.boolean", new boolean[] { true, false });
- assertEquals("first element of the 'array.boolean' property", true, config.getBoolean("array.boolean"));
-
- config.addPropertyDirect("array.byte", new byte[] { 1, 2 });
- assertEquals("first element of the 'array.byte' property", 1, config.getByte("array.byte"));
-
- config.addPropertyDirect("array.short", new short[] { 1, 2 });
- assertEquals("first element of the 'array.short' property", 1, config.getShort("array.short"));
-
- config.addPropertyDirect("array.int", new int[] { 1, 2 });
- assertEquals("first element of the 'array.int' property", 1, config.getInt("array.int"));
-
- config.addPropertyDirect("array.long", new long[] { 1, 2 });
- assertEquals("first element of the 'array.long' property", 1, config.getLong("array.long"));
-
- config.addPropertyDirect("array.float", new float[] { 1, 2 });
- assertEquals("first element of the 'array.float' property", 1, config.getFloat("array.float"), 0);
-
- config.addPropertyDirect("array.double", new double[] { 1, 2 });
- assertEquals("first element of the 'array.double' property", 1, config.getDouble("array.double"), 0);
}
/**
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java Sun Apr 6 13:10:04 2008
@@ -18,9 +18,9 @@
package org.apache.commons.configuration2.web;
import org.apache.commons.configuration2.AbstractConfiguration;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.MapConfiguration;
import org.apache.commons.configuration2.TestAbstractConfiguration;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import org.apache.commons.configuration2.web.AppletConfiguration;
import java.applet.Applet;
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java?rev=645295&r1=645294&r2=645295&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java Sun Apr 6 13:10:04 2008
@@ -23,10 +23,10 @@
import javax.servlet.ServletRequest;
import org.apache.commons.configuration2.AbstractConfiguration;
-import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConfigurationConverter;
import org.apache.commons.configuration2.TestAbstractConfiguration;
+import org.apache.commons.configuration2.flat.BaseConfiguration;
import org.apache.commons.lang.StringUtils;
import com.mockobjects.servlet.MockHttpServletRequest;