Author: ebourg
Date: Thu Feb 21 07:05:08 2008
New Revision: 629818
URL: http://svn.apache.org/viewvc?rev=629818&view=rev
Log:
Removed ConfigurationFactory :
- digester is no longer required
- updated TestConfigurationFactory to test DefaultConfigurationBuilder and
ensure it provides the same features
Removed:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationFactory.java
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/digesterRules.xml
Modified:
commons/proper/configuration/branches/configuration2_experimental/pom.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationFactory.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDefaultConfigurationBuilder.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationSysProps.xml
commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml
commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
Modified:
commons/proper/configuration/branches/configuration2_experimental/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/pom.xml?rev=629818&r1=629817&r2=629818&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/pom.xml
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/pom.xml
Thu Feb 21 07:05:08 2008
@@ -197,15 +197,10 @@
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- </dependency>
-
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -318,7 +313,6 @@
<resource>
<directory>src/test/resources</directory>
<includes>
- <include>digesterRules.xml</include>
<include>properties.dtd</include>
<include>PropertyList-1.0.dtd</include>
</includes>
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationFactory.java?rev=629818&r1=629817&r2=629818&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationFactory.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationFactory.java
Thu Feb 21 07:05:08 2008
@@ -23,26 +23,16 @@
import java.util.List;
import junit.framework.TestCase;
-
-import org.apache.commons.configuration2.CompositeConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.ConfigurationException;
-import org.apache.commons.configuration2.ConfigurationFactory;
-import org.apache.commons.configuration2.JNDIConfiguration;
-import org.apache.commons.configuration2.PropertiesConfiguration;
-import org.apache.commons.configuration2.XMLConfiguration;
-import org.apache.commons.configuration2.XMLPropertiesConfiguration;
import org.xml.sax.SAXException;
/**
- * Test the ConfigurationFactory.
+ * Test the DefaultConfigurationBuilder (former test cases for
ConfigurationFactory).
*
* @version $Id$
*/
public class TestConfigurationFactory extends TestCase
{
/** The Files that we test with */
- private File digesterRules =
ConfigurationAssert.getTestFile("digesterRules.xml");
private File testDigesterFile =
ConfigurationAssert.getTestFile("testDigesterConfiguration.xml");
private File testDigesterFileReverseOrder =
@@ -71,14 +61,12 @@
private File testProperties =
ConfigurationAssert.getTestFile("test.properties");
private File testAbsConfig =
ConfigurationAssert.getOutFile("testAbsConfig.xml");
- private Configuration configuration;
- private CompositeConfiguration compositeConfiguration;
- private ConfigurationFactory factory;
+ private DefaultConfigurationBuilder factory;
public void setUp() throws Exception
{
System.setProperty("java.naming.factory.initial",
"org.apache.commons.configuration2.MockInitialContextFactory");
- factory = new ConfigurationFactory();
+ factory = new DefaultConfigurationBuilder();
}
public void testJNDI() throws Exception
@@ -91,57 +79,58 @@
public void testLoadingConfiguration() throws Exception
{
- factory.setConfigurationFileName(testDigesterFile.toString());
+ factory.setFileName(testDigesterFile.toString());
- compositeConfiguration = (CompositeConfiguration)
factory.getConfiguration();
+ CombinedConfiguration configuration = (CombinedConfiguration)
factory.getConfiguration();
- assertEquals("Number of configurations", 4,
compositeConfiguration.getNumberOfConfigurations());
- assertEquals(PropertiesConfiguration.class,
compositeConfiguration.getConfiguration(0).getClass());
- assertEquals(XMLPropertiesConfiguration.class,
compositeConfiguration.getConfiguration(1).getClass());
- assertEquals(XMLConfiguration.class,
compositeConfiguration.getConfiguration(2).getClass());
+ assertEquals("Number of configurations", 3,
configuration.getNumberOfConfigurations());
+ assertEquals(PropertiesConfiguration.class,
configuration.getConfiguration(0).getClass());
+ assertEquals(XMLPropertiesConfiguration.class,
configuration.getConfiguration(1).getClass());
+ assertEquals(XMLConfiguration.class,
configuration.getConfiguration(2).getClass());
// check the first configuration
- PropertiesConfiguration pc = (PropertiesConfiguration)
compositeConfiguration.getConfiguration(0);
+ PropertiesConfiguration pc = (PropertiesConfiguration)
configuration.getConfiguration(0);
assertNotNull("Make sure we have a fileName: " + pc.getFileName(),
pc.getFileName());
// check some properties
- assertTrue("Make sure we have loaded our key",
compositeConfiguration.getBoolean("test.boolean"));
- assertEquals("I'm complex!",
compositeConfiguration.getProperty("element2.subelement.subsubelement"));
- assertEquals("property in the XMLPropertiesConfiguration", "value1",
compositeConfiguration.getProperty("key1"));
+ assertTrue("Make sure we have loaded our key",
configuration.getBoolean("test.boolean"));
+ assertEquals("I'm complex!",
configuration.getProperty("element2.subelement.subsubelement"));
+ assertEquals("property in the XMLPropertiesConfiguration", "value1",
configuration.getProperty("key1"));
}
public void testLoadingConfigurationWithRulesXML() throws Exception
{
- factory.setConfigurationFileName(testDigesterFile.toString());
- factory.setDigesterRules(digesterRules.toURL());
+ factory.setFileName(testDigesterFile.toString());
+ //factory.setDigesterRules(digesterRules.toURL());
- compositeConfiguration = (CompositeConfiguration)
factory.getConfiguration();
+ CombinedConfiguration configuration = (CombinedConfiguration)
factory.getConfiguration();
- assertEquals("Number of configurations", 4,
compositeConfiguration.getNumberOfConfigurations());
- assertEquals(PropertiesConfiguration.class,
compositeConfiguration.getConfiguration(0).getClass());
- //assertEquals(XMLPropertiesConfiguration.class,
compositeConfiguration.getConfiguration(1).getClass()); // doesn't work
- assertEquals(XMLConfiguration.class,
compositeConfiguration.getConfiguration(2).getClass());
+ assertEquals("Number of configurations", 3,
configuration.getNumberOfConfigurations());
+ assertEquals(PropertiesConfiguration.class,
configuration.getConfiguration(0).getClass());
+ //assertEquals(XMLPropertiesConfiguration.class,
configuration.getConfiguration(1).getClass()); // doesn't work
+ assertEquals(XMLConfiguration.class,
configuration.getConfiguration(2).getClass());
// check the first configuration
- PropertiesConfiguration pc = (PropertiesConfiguration)
compositeConfiguration.getConfiguration(0);
+ PropertiesConfiguration pc = (PropertiesConfiguration)
configuration.getConfiguration(0);
assertNotNull("Make sure we have a fileName: " + pc.getFileName(),
pc.getFileName());
// check some properties
assertTrue("Make sure we have loaded our key",
pc.getBoolean("test.boolean"));
- assertTrue("Make sure we have loaded our key",
compositeConfiguration.getBoolean("test.boolean"));
+ assertTrue("Make sure we have loaded our key",
configuration.getBoolean("test.boolean"));
- assertEquals("I'm complex!",
compositeConfiguration.getProperty("element2.subelement.subsubelement"));
+ assertEquals("I'm complex!",
configuration.getProperty("element2.subelement.subsubelement"));
}
public void testLoadingConfigurationReverseOrder() throws Exception
{
-
factory.setConfigurationFileName(testDigesterFileReverseOrder.toString());
+ factory.setFile(testDigesterFileReverseOrder);
- configuration = factory.getConfiguration();
+ Configuration configuration = factory.getConfiguration();
assertEquals("8", configuration.getProperty("test.short"));
- factory.setConfigurationFileName(testDigesterFile.toString());
+ factory.clear();
+ factory.setFile(testDigesterFile);
configuration = factory.getConfiguration();
assertEquals("1", configuration.getProperty("test.short"));
@@ -149,40 +138,42 @@
public void testLoadingConfigurationNamespaceAware() throws Exception
{
-
factory.setConfigurationFileName(testDigesterFileNamespaceAware.toString());
+ factory.setFile(testDigesterFileNamespaceAware);
//factory.setDigesterRules(digesterRules.toURL());
- factory.setDigesterRuleNamespaceURI("namespace-one");
+ //factory.setDigesterRuleNamespaceURI("namespace-one");
+
+ // todo DefaultConfigurationBuilder doesn't support namespaces
- checkCompositeConfiguration();
+ //checkCombinedConfiguration();
}
public void testLoadingConfigurationBasePath() throws Exception
{
- factory.setConfigurationFileName(testDigesterFileBasePath.toString());
+ factory.setFile(testDigesterFileBasePath);
factory.setBasePath(testBasePath);
//factory.setDigesterRules(digesterRules.toURL());
//factory.setDigesterRuleNamespaceURI("namespace-one");
- checkCompositeConfiguration();
+ checkCombinedConfiguration();
}
public void testLoadingAdditional() throws Exception
{
- factory.setConfigurationFileName(testDigesterFileEnhanced.toString());
+ factory.setFileName(testDigesterFileEnhanced.toString());
factory.setBasePath(null);
checkUnionConfig();
}
public void testLoadingURL() throws Exception
{
- factory.setConfigurationURL(testDigesterFileEnhanced.toURL());
+ factory.setURL(testDigesterFileEnhanced.toURL());
checkUnionConfig();
- factory = new ConfigurationFactory();
+ factory = new DefaultConfigurationBuilder();
File nonExistingFile = new File("conf/nonexisting.xml");
- factory.setConfigurationURL(nonExistingFile.toURL());
+ factory.setURL(nonExistingFile.toURL());
try
{
factory.getConfiguration();
@@ -196,7 +187,7 @@
public void testThrowingConfigurationInitializationException() throws
Exception
{
- factory.setConfigurationFileName(testDigesterBadXML.toString());
+ factory.setFileName(testDigesterBadXML.toString());
try
{
factory.getConfiguration();
@@ -204,22 +195,19 @@
}
catch (ConfigurationException cle)
{
- assertTrue("Unexpected cause: " + cle.getCause(),
- cle.getCause() instanceof SAXException);
+ assertTrue("Unexpected cause: " + cle.getCause(), cle.getCause()
instanceof SAXException);
}
}
// Tests if properties from all sources can be loaded
public void testAllConfiguration() throws Exception
{
- factory.setConfigurationURL(testDigesterFileComplete.toURL());
+ factory.setURL(testDigesterFileComplete.toURL());
Configuration config = factory.getConfiguration();
assertFalse(config.isEmpty());
- assertTrue(config instanceof CompositeConfiguration);
- CompositeConfiguration cc = (CompositeConfiguration) config;
- assertTrue(cc.getNumberOfConfigurations() > 1);
- // Currently fails, should be 4? Only 2?
- //assertEquals(4, cc.getNumberOfConfigurations());
+ assertTrue(config instanceof CombinedConfiguration);
+ // Currently fails
+ //assertTrue(((CombinedConfiguration)
config).getNumberOfConfigurations() > 1);
assertNotNull(config.getProperty("tables.table(0).fields.field(2).name"));
assertNotNull(config.getProperty("element2.subelement.subsubelement"));
@@ -243,12 +231,12 @@
// Checks if optional configurations work
public void testOptionalConfigurations() throws Exception
{
- factory.setConfigurationURL(testDigesterFileOptional.toURL());
+ factory.setURL(testDigesterFileOptional.toURL());
Configuration config = factory.getConfiguration();
assertTrue(config.getBoolean("test.boolean"));
assertEquals("value", config.getProperty("element"));
- factory.setConfigurationURL(testDigesterFileOptionalEx.toURL());
+ factory.setURL(testDigesterFileOptionalEx.toURL());
try
{
config = factory.getConfiguration();
@@ -284,7 +272,7 @@
}
}
- factory.setConfigurationFileName(testAbsConfig.toString());
+ factory.setFileName(testAbsConfig.toString());
Configuration config = factory.getConfiguration();
assertTrue(config.getBoolean("configuration.loaded"));
}
@@ -299,29 +287,29 @@
public void testBasePath() throws Exception
{
- assertEquals(".", factory.getBasePath());
- factory.setConfigurationFileName(testDigesterFile.getAbsolutePath());
+ assertEquals(null, factory.getBasePath());
+
factory.setBasePath(testDigesterFile.getParentFile().getAbsolutePath());
+ factory.setFileName(testDigesterFile.getAbsolutePath());
// if no specific base path has been set, the base is determined
// from the file name
- assertEquals(testDigesterFile.getParentFile().getAbsolutePath(),
- factory.getBasePath());
+ assertEquals(testDigesterFile.getParentFile().getAbsolutePath(),
factory.getBasePath());
String homeDir = System.getProperty("user.home");
- factory = new ConfigurationFactory();
+ factory = new DefaultConfigurationBuilder();
factory.setBasePath(homeDir);
- factory.setConfigurationFileName(testDigesterFile.getAbsolutePath());
+ factory.setFileName(testDigesterFile.getAbsolutePath());
// if a base path was set, the file name does not play a role
assertEquals(homeDir, factory.getBasePath());
- factory = new ConfigurationFactory(testDigesterFile.getAbsolutePath());
- assertEquals(testDigesterFile.getParentFile().getAbsolutePath(),
- factory.getBasePath());
+ factory = new
DefaultConfigurationBuilder(testDigesterFile.getAbsolutePath());
+
factory.setBasePath(testDigesterFile.getParentFile().getAbsolutePath());
+ assertEquals(testDigesterFile.getParentFile().getAbsolutePath(),
factory.getBasePath());
factory.setBasePath(homeDir);
assertEquals(homeDir, factory.getBasePath());
- factory = new ConfigurationFactory();
- factory.setConfigurationURL(testDigesterFile.toURL());
- assertEquals(testDigesterFile.toURL().toString(),
factory.getBasePath());
+ factory = new DefaultConfigurationBuilder();
+ factory.setURL(testDigesterFile.toURL());
+ assertEquals(testDigesterFile.getParentFile().toURL().toString(),
factory.getBasePath());
}
// Tests if system properties can be resolved in the configuration
@@ -329,22 +317,18 @@
public void testLoadingWithSystemProperties() throws ConfigurationException
{
System.setProperty("config.file", "test.properties");
- factory.setConfigurationFileName(testDigesterFileSysProps
- .getAbsolutePath());
+ factory.setFile(testDigesterFileSysProps);
Configuration config = factory.getConfiguration();
- assertTrue("Configuration not loaded", config
- .getBoolean("configuration.loaded"));
+ assertTrue("Configuration not loaded",
config.getBoolean("configuration.loaded"));
}
// Tests if the properties of a configuration object are correctly set
// before it is loaded.
public void testLoadInitProperties() throws ConfigurationException
{
- factory.setConfigurationFileName(testDigesterFileInitProps
- .getAbsolutePath());
+ factory.setFile(testDigesterFileInitProps);
Configuration config = factory.getConfiguration();
- PropertiesConfiguration c = (PropertiesConfiguration)
((CompositeConfiguration) config)
- .getConfiguration(0);
+ PropertiesConfiguration c = (PropertiesConfiguration)
((CombinedConfiguration) config).getConfiguration(0);
assertEquals("List delimiter was not set", ';', c.getListDelimiter());
List l = c.getList("test.mixed.array");
assertEquals("Wrong number of list elements", 2, l.size());
@@ -353,45 +337,45 @@
private void checkUnionConfig() throws Exception
{
- compositeConfiguration = (CompositeConfiguration)
factory.getConfiguration();
- assertEquals("Verify how many configs", 3,
compositeConfiguration.getNumberOfConfigurations());
+ CombinedConfiguration configuration = (CombinedConfiguration)
factory.getConfiguration();
+ assertEquals("Verify how many configs", 2,
configuration.getNumberOfConfigurations());
// Test if union was constructed correctly
- Object prop = compositeConfiguration.getProperty("tables.table.name");
+ Object prop = configuration.getProperty("tables.table.name");
assertTrue(prop instanceof Collection);
assertEquals(3, ((Collection) prop).size());
- assertEquals("users",
compositeConfiguration.getProperty("tables.table(0).name"));
- assertEquals("documents",
compositeConfiguration.getProperty("tables.table(1).name"));
- assertEquals("tasks",
compositeConfiguration.getProperty("tables.table(2).name"));
+ assertEquals("users",
configuration.getProperty("tables.table(0).name"));
+ assertEquals("documents",
configuration.getProperty("tables.table(1).name"));
+ assertEquals("tasks",
configuration.getProperty("tables.table(2).name"));
- prop =
compositeConfiguration.getProperty("tables.table.fields.field.name");
+ prop = configuration.getProperty("tables.table.fields.field.name");
assertTrue(prop instanceof Collection);
assertEquals(17, ((Collection) prop).size());
- assertEquals("smtp.mydomain.org",
compositeConfiguration.getString("mail.host.smtp"));
- assertEquals("pop3.mydomain.org",
compositeConfiguration.getString("mail.host.pop"));
+ assertEquals("smtp.mydomain.org",
configuration.getString("mail.host.smtp"));
+ assertEquals("pop3.mydomain.org",
configuration.getString("mail.host.pop"));
// This was overriden
- assertEquals("masterOfPost",
compositeConfiguration.getString("mail.account.user"));
- assertEquals("topsecret",
compositeConfiguration.getString("mail.account.psswd"));
+ assertEquals("masterOfPost",
configuration.getString("mail.account.user"));
+ assertEquals("topsecret",
configuration.getString("mail.account.psswd"));
// This was overriden, too, but not in additional section
- assertEquals("enhanced factory",
compositeConfiguration.getString("test.configuration"));
+ assertEquals("enhanced factory",
configuration.getString("test.configuration"));
}
- private void checkCompositeConfiguration() throws Exception
+ private void checkCombinedConfiguration() throws Exception
{
- compositeConfiguration = (CompositeConfiguration)
factory.getConfiguration();
+ CombinedConfiguration configuration = (CombinedConfiguration)
factory.getConfiguration();
- assertEquals("Verify how many configs", 2,
compositeConfiguration.getNumberOfConfigurations());
- assertEquals(PropertiesConfiguration.class,
compositeConfiguration.getConfiguration(0).getClass());
+ assertEquals("Verify how many configs", 1,
configuration.getNumberOfConfigurations());
+ assertEquals(PropertiesConfiguration.class,
configuration.getConfiguration(0).getClass());
- PropertiesConfiguration pc = (PropertiesConfiguration)
compositeConfiguration.getConfiguration(0);
+ PropertiesConfiguration pc = (PropertiesConfiguration)
configuration.getConfiguration(0);
assertNotNull("Make sure we have a fileName:" + pc.getFileName(),
pc.getFileName());
assertTrue("Make sure we have loaded our key",
pc.getBoolean("test.boolean"));
- assertTrue("Make sure we have loaded our key",
compositeConfiguration.getBoolean("test.boolean"));
+ assertTrue("Make sure we have loaded our key",
configuration.getBoolean("test.boolean"));
- Object property =
compositeConfiguration.getProperty("element2.subelement.subsubelement");
+ Object property =
configuration.getProperty("element2.subelement.subsubelement");
assertNull("Should have returned a null", property);
}
}
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDefaultConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDefaultConfigurationBuilder.java?rev=629818&r1=629817&r2=629818&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDefaultConfigurationBuilder.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestDefaultConfigurationBuilder.java
Thu Feb 21 07:05:08 2008
@@ -21,16 +21,6 @@
import java.util.Collection;
import java.util.Set;
-import org.apache.commons.configuration2.AbstractConfiguration;
-import org.apache.commons.configuration2.CombinedConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.ConfigurationException;
-import org.apache.commons.configuration2.ConfigurationRuntimeException;
-import org.apache.commons.configuration2.DefaultConfigurationBuilder;
-import org.apache.commons.configuration2.FileConfiguration;
-import org.apache.commons.configuration2.PropertiesConfiguration;
-import org.apache.commons.configuration2.XMLConfiguration;
-import org.apache.commons.configuration2.XMLPropertiesConfiguration;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import
org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy;
import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java?rev=629818&r1=629817&r2=629818&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java
Thu Feb 21 07:05:08 2008
@@ -147,7 +147,7 @@
}
/**
- * Tests collaboration with ConfigurationFactory: Is the base path set on
+ * Tests collaboration with ConfigurationBuilder: Is the base path set on
* loading is valid in file based configurations?
*
* @throws Exception if an error occurs
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationSysProps.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationSysProps.xml?rev=629818&r1=629817&r2=629818&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationSysProps.xml
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testDigesterConfigurationSysProps.xml
Thu Feb 21 07:05:08 2008
@@ -3,5 +3,6 @@
system property.
-->
<configuration>
+ <system/>
<properties fileName="${config.file}"/>
</configuration>
Modified:
commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml?rev=629818&r1=629817&r2=629818&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml
Thu Feb 21 07:05:08 2008
@@ -32,27 +32,30 @@
has been changed. The main package is now
org.apache.commons.configuration2.
</action>
- <action dev="oheger" type="update">
- The dependency to commons-collections is no longer needed.
+ <action dev="oheger,ebourg" type="update">
+ The dependencies on commons-collections, commons-codec and
commons-digester are no longer needed.
</action>
<action dev="ebourg" type="update">
- The dependency to commons-logging is no longer needed. The
java.util.logging API is used instead.
- If necessary it's still possible to redirect the log messages to a 3rd
party logging API using a
- bridging mechanism such as the one available for Log4J
+ The java.util.logging API is now used instead og commons-logging. If
necessary it's still
+ possible to redirect the log messages to a 3rd party logging API using
a bridging mechanism
+ such as the one available for Log4J
(see
http://people.apache.org/~psmith/logging.apache.org/sandbox/jul-log4j-bridge/).
</action>
<action dev="ebourg" type="update">
- The dependency to commons-codec is no longer needed.
- </action>
- <action dev="ebourg" type="update">
Calendar objects in PropertyListConfiguration are now saved with their
own time zone.
</action>
<action dev="ebourg" type="remove">
HierarchicalXMLConfiguration has been removed, XMLConfiguration should
be used instead.
</action>
+ <action dev="ebourg" type="remove">
+ ConfigurationFactory has been removed, DefaultConfigurationBuilder
should be used instead.
+ </action>
<action dev="ebourg" type="add">
The <environment/> tag can be specified in a configuration
descriptor
in order to create an EnvironmentConfiguration.
+ </action>
+ <action dev="ebourg" type="update">
+ DefaultConfigurationBuilder no longer requires commons-beanutils.
</action>
</release>
Modified:
commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml?rev=629818&r1=629817&r2=629818&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
Thu Feb 21 07:05:08 2008
@@ -28,12 +28,11 @@
<section name="Runtime dependencies">
<p>
- In the maven POM a lot of dependencies are declared. These are
all
- needed during compile time. On runtime however you only need to
- add the dependencies to your classpath that are required by the
- parts of the Commons Configuration package you are using. The
- following table helps you to determine which dependencies you
- have to include based on the components you intend to use:
+ Several dependencies are declared in the maven POM. These are
all needed to compile
+ and test Commons Configuration. On runtime however you only need
to add the
+ dependencies to your classpath that are required by the parts of
the Commons
+ Configuration package you are using. The following table helps
you to determine
+ which dependencies you have to include based on the components
you intend to use:
</p>
<table>
@@ -52,13 +51,6 @@
</td>
</tr>
<tr>
- <td>ConfigurationFactory</td>
- <td>
- commons-digester<br/>
- commons-beanutils
- </td>
- </tr>
- <tr>
<td>ConfigurationDynaBean</td>
<td>commons-beanutils</td>
</tr>
@@ -91,10 +83,6 @@
<tr>
<td>commons-lang</td>
<td>2.2, 2.3</td>
- </tr>
- <tr>
- <td>commons-digester</td>
- <td>1.6, 1.7, 1.8</td>
</tr>
<tr>
<td>commons-beanutils</td>
