You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by rg...@apache.org on 2009/04/02 07:57:26 UTC
svn commit: r761172 - in
/commons/proper/configuration/branches/configuration2_experimental:
src/main/java/org/apache/commons/configuration2/
src/test/java/org/apache/commons/configuration2/ src/test/resources/ xdocs/
xdocs/userguide/
Author: rgoers
Date: Thu Apr 2 05:57:25 2009
New Revision: 761172
URL: http://svn.apache.org/viewvc?rev=761172&view=rev
Log:
Add documentation, allow FileSystem to be configured in DefaultConfigurationBuilder
Added:
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testFileSystem.xml (with props)
commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_filesystems.xml (with props)
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestVFSConfigurationBuilder.java
commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml
commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_combinedconfiguration.xml
commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_configurationbuilder.xml
commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_multitenant.xml
commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/user_guide.xml
Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java?rev=761172&r1=761171&r2=761172&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java Thu Apr 2 05:57:25 2009
@@ -347,6 +347,11 @@
static final String KEY_LOOKUP_KEY = XMLBeanDeclaration.ATTR_PREFIX + "prefix]";
/**
+ * Constance for the FileSystem.
+ */
+ static final String FILE_SYSTEM = SEC_HEADER + ".fileSystem";
+
+ /**
* Constant for the key of the result declaration. This key can point to a
* bean declaration, which defines properties of the resulting combined
* configuration.
@@ -499,17 +504,6 @@
}
/**
- * Sets the FileSystem to use for the created CombinedConfiguration
- * @param fileSystem The FileSystem to use.
- */
- public void setFileSystem(FileSystem fileSystem)
- {
- FileSystem.setDefaultFileSystem(fileSystem);
- }
-
-
-
- /**
* Adds a configuration provider for the specified tag. Whenever this tag is
* encountered in the configuration definition file this provider will be
* called to create the configuration object.
@@ -589,6 +583,7 @@
load();
}
+ initFileSystem();
initSystemProperties();
configureEntityResolver();
registerConfiguredProviders();
@@ -719,6 +714,16 @@
}
}
+ protected void initFileSystem() throws ConfigurationException
+ {
+ if (getMaxIndex(FILE_SYSTEM) == 0)
+ {
+ SubConfiguration config = configurationAt(FILE_SYSTEM);
+ XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
+ setFileSystem((FileSystem) BeanHelper.createBean(decl));
+ }
+ }
+
/**
* If a property file is configured add the properties to the System properties.
* @throws ConfigurationException if an error occurs.
@@ -1346,6 +1351,14 @@
ConfigurationDeclaration decl) throws Exception
{
AbstractConfiguration result = getEmptyConfiguration(decl);
+ if (result instanceof FileSystemBased)
+ {
+ DefaultConfigurationBuilder builder = decl.getConfigurationBuilder();
+ if (builder.getFileSystem() != null)
+ {
+ ((FileSystemBased)result).setFileSystem(builder.getFileSystem());
+ }
+ }
((FileConfiguration) result).load();
return result;
}
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestVFSConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestVFSConfigurationBuilder.java?rev=761172&r1=761171&r2=761172&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestVFSConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestVFSConfigurationBuilder.java Thu Apr 2 05:57:25 2009
@@ -21,6 +21,7 @@
import java.net.URL;
import java.util.Collection;
import java.util.Set;
+import java.util.List;
import junit.framework.TestCase;
@@ -74,6 +75,9 @@
private static final File MULTI_TENENT_FILE = ConfigurationAssert
.getTestFile("testMultiTenentConfigurationBuilder.xml");
+ private static final File FILESYSTEM_FILE = ConfigurationAssert
+ .getTestFile("testFileSystem.xml");
+
/** Constant for the name of an optional configuration.*/
private static final String OPTIONAL_NAME = "optionalConfig";
@@ -882,6 +886,71 @@
verify("1005", config, 50);
}
+ public void testSetFileSystem() throws Exception
+ {
+ factory.setFile(PROVIDER_FILE);
+ FileSystem fs = new VFSFileSystem();
+ factory.setFileSystem(fs);
+ FileSystem.resetDefaultFileSystem();
+ System.getProperties().remove("Id");
+
+ CombinedConfiguration config = factory.getConfiguration(true);
+ List<AbstractConfiguration> list = config.getConfigurations();
+ assertTrue("Incorrect number of configurations - " + list.size(), list.size() == 4);
+ for (AbstractConfiguration conf : list)
+ {
+ if (conf instanceof FileSystemBased)
+ {
+ assertTrue("Incorrect file system for Configuration " + conf,
+ ((FileSystemBased) conf).getFileSystem() == fs);
+ }
+ else if (conf instanceof CombinedConfiguration)
+ {
+ for (AbstractConfiguration sub : ((CombinedConfiguration)conf).getConfigurations())
+ {
+ if (sub instanceof FileSystemBased)
+ {
+ assertTrue("Incorrect file system for Configuration " + sub,
+ ((FileSystemBased) sub).getFileSystem() == fs);
+ }
+ }
+ }
+ }
+ }
+
+ public void testConfiguredFileSystem() throws Exception
+ {
+ factory.setFile(FILESYSTEM_FILE);
+ FileSystem.resetDefaultFileSystem();
+ System.getProperties().remove("Id");
+
+ CombinedConfiguration config = factory.getConfiguration(true);
+ FileSystem fs = factory.getFileSystem();
+ assertNotNull("No File System",fs);
+ assertTrue("Incorrect File System", fs instanceof VFSFileSystem);
+ List<AbstractConfiguration> list = config.getConfigurations();
+ assertTrue("Incorrect number of configurations - " + list.size(), list.size() == 4);
+ for (Configuration conf : list)
+ {
+ if (conf instanceof FileSystemBased)
+ {
+ assertTrue("Incorrect file system for Configuration " + conf,
+ ((FileSystemBased) conf).getFileSystem() == fs);
+ }
+ else if (conf instanceof CombinedConfiguration)
+ {
+ for (AbstractConfiguration sub : ((CombinedConfiguration) conf).getConfigurations())
+ {
+ if (sub instanceof FileSystemBased)
+ {
+ assertTrue("Incorrect file system for Configuration " + sub,
+ ((FileSystemBased) sub).getFileSystem() == fs);
+ }
+ }
+ }
+ }
+ }
+
private void verify(String key, CombinedConfiguration config, int rows)
{
System.setProperty("Id", key);
Added: commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testFileSystem.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testFileSystem.xml?rev=761172&view=auto
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testFileSystem.xml (added)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testFileSystem.xml Thu Apr 2 05:57:25 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!-- Test configuration definition file that demonstrates complex initialization -->
+<configuration>
+ <header>
+ <result delimiterParsingDisabled="true">
+ <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/>
+ <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>
+ </result>
+ <fileSystem config-class="org.apache.commons.configuration2.VFSFileSystem"/>
+ <providers>
+ <provider config-tag="test"
+ config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider"/>
+ </providers>
+ <combiner>
+ <override>
+ <list-nodes>
+ <node>table</node>
+ <node>list</node>
+ </list-nodes>
+ </override>
+ </combiner>
+ </header>
+ <system/>
+ <properties fileName="test.properties" throwExceptionOnMissing="true"
+ config-name="properties">
+ <reloadingStrategy config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"
+ refreshDelay="10000"/>
+ </properties>
+ <!-- Fetch the file name from a variable -->
+ <xml fileName="${test_file_xml}" config-name="xml">
+ <expressionEngine config-class="org.apache.commons.configuration2.expr.def.DefaultExpressionEngine"
+ propertyDelimiter="/" indexStart="[" indexEnd="]"/>
+ </xml>
+ <additional>
+ <xml config-name="combiner1" fileName="${test_file_combine}"/> -->
+ <xml config-name="combiner2" fileName="testcombine2.xml"/>
+ </additional>
+</configuration>
\ No newline at end of file
Propchange: commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testFileSystem.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml?rev=761172&r1=761171&r2=761172&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml Thu Apr 2 05:57:25 2009
@@ -32,22 +32,45 @@
<a href="http://ant.apache.org">Ant</a>.
</p>
</section>
-
- <section name="Maven Goals">
+ <section name="Maven 2">
<p>
- Maven 2 is our recommended build tool. To build the Configuration
- jar file, change into the directory where you unzipped the source
- distribution or where you checked out the sources from SVN and run
- "mvn package". The result will be in the (newly created) "target"
- subdirectory.
+ Commons Configuration uses Maven 2 as its build tool. To build the Configuration
+ jar, change into the directory where the source distribution resides and run
+ "mvn install". This will compile the source and tests, run the tests, and then
+ package the jar. The jar will also be copied into the local maven repository
+ for use by other builds.
</p>
<p>
- To build the Javadocs, run "maven javadoc".
- The result will be in "target/docs/apidocs".
+ To build the web site run "mvn site". When it completes the web site will reside in
+ the target/site directory and may be viewed by opening target/site/index.html.
</p>
+ </section>
+ <section name="Running Functional Tests">
<p>
- To build the full website, run "mvn site".
- The result will be in "target/docs".
+ <code>TestWebdavConfigurationBuilder</code> is a functional test that tests
+ DefaultConfigurationBuilder with the configuration files stored in a WebDAV
+ server. To run the test the steps that follow
+ <ol>
+ <li>Copy all the files in the conf directory to the WebDAV server. Not all the
+ files are required but it is generally easier to use a tool like cadaver
+ and do an mput than try to copy the required files individually.</li>
+ <li>Add the following to the profiles section of settings.xml in the Maven home
+ directory. Modify the urls to match your setup.
+<source><![CDATA[
+ <profile>
+ <profile>
+ <id>webdav</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <test.webdav.base>webdav://vfsusr:vfstest@192.168.10.133:80/conf</test.webdav.base>
+ </properties>
+ </profile>]]></source></li>
+ <li>run "mvn -P webdav test -Dtest=TestWebdavConfigurationBuilder". The test
+ can also be run using "mvn -P webdav test" but this will run all the unit tests
+ in addition to the WebDAV test.</li>
+ </ol>
</p>
</section>
@@ -64,26 +87,14 @@
<section name="Setting custom build parameters">
<p>
- Both the maven and the ant build script support a file called
+ The ant build script supports a file called
<code>build.properties</code> that can contain custom properties
definitions. If this file exists in the project's root directory,
it will be read and the properties it defines will be added to the
running build script. This mechanism allows for customizing the
build process without the need of changing the main build scripts.
</p>
-<!--
- <p>
- One use case for setting custom build properties would be to build
- for a specific JDK version: If you build the jar on a JDK 1.5 for
- instance, the classes won't be compatible with older JDK versions.
- To enforce compatibility you can create a <code>build.properties</code>
- file containing the following maven specific settings:
- </p>
- <source><![CDATA[
-maven.compile.source = 1.3
-maven.compile.target = 1.3
-]]></source>
--->
+
</section>
</body>
Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_combinedconfiguration.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_combinedconfiguration.xml?rev=761172&r1=761171&r2=761172&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_combinedconfiguration.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_combinedconfiguration.xml Thu Apr 2 05:57:25 2009
@@ -676,7 +676,10 @@
<p>
When merging elements attributes play a critical role. If an element has an attribute that
appears in both sources, the value of that attribute must be the same for the elements to be
- merged. Merging is only allowed between a single node in each of the files, so if an element
+ merged.
+ </p>
+ <p>
+ Merging is only allowed between a single node in each of the files, so if an element
in the first file matches more than one element in the second file no merging will take
place and the element from the first file (and its contents) are included and the elements
in the second file are not. If the element is marked as a list node then the elements from
Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_configurationbuilder.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_configurationbuilder.xml?rev=761172&r1=761171&r2=761172&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_configurationbuilder.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_configurationbuilder.xml Thu Apr 2 05:57:25 2009
@@ -308,8 +308,8 @@
<source><![CDATA[
<header>
<result delimiterParsingDisabled="true" forceReloadCheck="true">
- <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/>
- <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/>
+ <nodeCombiner config-class="org.apache.commons.configuration2.tree.OverrideCombiner"/>
+ <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>
</result>
<combiner>
<override>
@@ -354,7 +354,7 @@
<configuration>
<header>
<result delimiterParsingDisabled="true" forceReloadCheck="true">
- <expressionEngine config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/>
+ <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>
</result>
<combiner>
<additional>
@@ -368,7 +368,7 @@
<properties fileName="user.properties" throwExceptionOnMissing="true"
config-name="properties" config-optional="true">
<reloadingStrategy refreshDelay="10000"
- config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy"/>
+ config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"/>
</properties>
<xml fileName="settings.xml" config-name="xml"/>
</override>
Added: commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_filesystems.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_filesystems.xml?rev=761172&view=auto
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_filesystems.xml (added)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_filesystems.xml Thu Apr 2 05:57:25 2009
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<document>
+
+ <properties>
+ <title>File Systems</title>
+ <author email="rgoers@apache.org">Ralph Goers</author>
+ </properties>
+
+<body>
+ <section name="File Systems">
+ <p>
+ In its default mode of operation Commons Configuration supports retrieving and storing
+ configuration files either on a local file system or via http. However, Commons
+ Configuration provides support for allowing other File System adapters. All file
+ access is accomplished through the <code>FileSystem</code> interface so accessing files
+ using other mechanisms is possible.
+ </p>
+ <p>
+ Commons Configuration also provides a second FileSystem which allows retrieval using
+ <a href="http://commons.apache.org/vfs">Apache Commons VFS</a>. As of this writing
+ Commons VFS supports 18 protocols for manipulating files.
+ </p>
+ <subsection name="Configuration">
+ <p>
+ The FileSystem used by Commons Configuration can be set in one of several ways:
+ <ol>
+ <li>A system property named "org.apache.commons.configuration.filesystem" can be defined
+ with the full class name of the desired <code>FileSystem</code> implementation to set the
+ default <code>FileSystem</code>.</li>
+ <li><code>FileSystem.setDefaultFilesystem()</code> can be called to directly set the
+ default <code>FileSystem</code> implementation.</li>
+ <li><code>DefaultConfigurationBuilder.setFileSystem()</code> can be called to set the
+ FileSystem implementation. <code>DefaultConfiguratonBuilder</code> will use this for each
+ configuration it creates</li>
+ <li><code>DefaultConfigurationBuilder</code> can be configured with the <code>FileSystem</code>
+ to be used when creating each of the configurations.</li>
+ <li>Each Configuration referenced in <code>DefaultConfigurationBuilder's</code>
+ configuration can be configured with the <code>FileSystem</code> to use for that
+ configuration.</li>
+ <li>Call setFileSystem() directly on any Configuration that implements <code>FileSystemBased.</code>
+ Both <code>AbstractFileConfiguration</code> and <code>AbstractHierarchicalFileConfiguration</code>
+ implement <code>FileSystemBased</code></li>
+ </ol>
+ </p>
+ <p>
+ The example that follows shows how to add <code>FileSystem</code> configuration to
+ <code>DefaultConfigurationBuilder</code>.
+ </p>
+ <source><![CDATA[
+<configuration>
+ <header>
+ <result delimiterParsingDisabled="true" forceReloadCheck="true">
+ <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>
+ </result>
+ <fileSystem config-class="org.apache.commons.configuration2.VFSFileSystem"/>
+ </header>
+ <override>
+ <xml fileName="settings.xml" config-name="xml">
+ <fileSystem config-class="org.apache.commons.configuration2.DefaultFileSystem"/>
+ </xml>
+ </override>
+</configuration>
+]]></source>
+ </subsection>
+ <subsection name="File Options Provider">
+ <p>
+ Commons VFS allows options to the underlying file systems being used. Commons Configuration
+ allows applications to provide these by implementing the <code>FileOptionsProvider</code> interface
+ and registering the provider with the <code>FileSystem</code>. <code>FileOptionsProvider</code>
+ has a single method that must be implemented, <code>getOptions</code>, which returns a Map
+ containing the keys and values that the <code>FileSystem</code> might use. The getOptions
+ method is called as each configuration uses VFS to create a <code>FileOjbect</code> to
+ access the file. The map returned does not have to contain the same keys and/or values
+ each time it is called. For example, the value of the <code>currentUser</code> key can be
+ set to the id of the currently logged in user to allow a WebDAV save to record the userid
+ as a file attribute.
+ </p>
+ </subsection>
+ <subsection name="File Reloading Strategy">
+ <p>
+ The <code><a href="../apidocs/org/apache/commons/configuration/reloading/VFSFileMonitorReloadingStrategy.html">VFSFileMonitorReloadingStrategy</a></code>
+ can be used to cause Configurations accessed via the <code>VFSFileSystem</code> to be
+ monitored and reloaded when the files are modified. The example below shows how
+ <code>DefaultConfigurationBuilder</code> can be configured to use
+ <code>VFSFileMonitorReloadingStrategy</code>. While each declaration will result in
+ a new reloading strategy object, each instance will share a common <code>FileMonitor</code>.
+ The delay setting controls how often the <code>FileMonitor</code> checks for changes
+ and since there is only a single <code>FileMonitor</code>, only the largest value
+ specified on any <code>VFSFileMonitorReloadingStrategy</code> is used.
+ In the example below both test.properties and settings.xml would be checked for changes
+ once per minute.
+ </p>
+ <source><![CDATA[
+<configuration>
+ <header>
+ <result delimiterParsingDisabled="true" forceReloadCheck="true">
+ <expressionEngine config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>
+ </result>
+ <fileSystem config-class="org.apache.commons.configuration2.VFSFileSystem"/>
+ </header>
+ <override>
+ <properties fileName="test.properties" throwExceptionOnMissing="true">
+ <reloadingStrategy delay="60000"
+ config-class="org.apache.commons.configuration2.reloading.VFSFileMonitorReloadingStrategy"/>
+ </properties>
+ <xml fileName="settings.xml" config-name="xml">
+ <reloadingStrategy
+ config-class="org.apache.commons.configuration2.reloading.VFSFileMonitorReloadingStrategy"/>
+ </xml>
+ </override>
+</configuration>
+]]></source>
+ </subsection>
+ </section>
+
+</body>
+
+</document>
Propchange: commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_filesystems.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_multitenant.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_multitenant.xml?rev=761172&r1=761171&r2=761172&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_multitenant.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_multitenant.xml Thu Apr 2 05:57:25 2009
@@ -76,15 +76,15 @@
<configuration>
<header>
<result delimiterParsingDisabled="true" forceReloadCheck="true"
- config-class="org.apache.commons.configuration.DynamicCombinedConfiguration"
+ config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration"
keyPattern="$${sys:Id}">
<expressionEngine
- config-class="org.apache.commons.configuration.tree.xpath.XPathExpressionEngine"/>
+ config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>
</result>
<providers>
<provider config-tag="multifile"
- config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$FileConfigurationProvider"
- configurationClass="org.apache.commons.configuration.MultiFileHierarchicalConfiguration"/>
+ config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider"
+ configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
</providers>
</header>
<override>
@@ -132,7 +132,7 @@
<p>
<source><![CDATA[
<bean id="configurationBuilder"
- class="org.apache.commons.configuration.DefaultConfigurationBuilder">
+ class="org.apache.commons.configuration2.DefaultConfigurationBuilder">
<property name="fileName">
<value>configuration.xml</value>
</property>
@@ -141,7 +141,7 @@
factory-method="getConfiguration">
</bean>
<bean id="subcomponentConfig"
- class="org.apache.commons.configuration.PatternSubtreeConfigurationWrapper"
+ class="org.apache.commons.configuration2.PatternSubtreeConfigurationWrapper"
autowire='autodetect'>
<constructor-arg index="0">
<ref bean="applicationConfig"/>
Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/user_guide.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/user_guide.xml?rev=761172&r1=761171&r2=761172&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/user_guide.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/user_guide.xml Thu Apr 2 05:57:25 2009
@@ -84,13 +84,13 @@
<li><a href="howto_xml.html#Accessing_structured_properties">Accessing structured properties</a></li>
<li><a href="howto_xml.html#Adding_new_properties">Adding new properties</a></li>
<li><a href="howto_xml.html#Escaping_dot_characters_in_property_names">Escaping dot characters in property names</a></li>
+ <li><a href="howto_xml.html#Expression_engines">Expression engines</a></li>
+ <ul>
+ <li><a href="howto_xml.html#The_default_expression_engine">The default expression engine</a></li>
+ <li><a href="howto_xml.html#The_XPATH_expression_engine">The XPATH expression engine</a></li>
+ </ul>
+ <li><a href="howto_xml.html#Validation_of_XML_configuration_files">Validation of XML configuration files</a></li>
</ul>
- <li><a href="howto_xml.html#Expression_engines">Expression engines</a></li>
- <ul>
- <li><a href="howto_xml.html#The_default_expression_engine">The default expression engine</a></li>
- <li><a href="howto_xml.html#The_XPATH_expression_engine">The XPATH expression engine</a></li>
- </ul>
- <li><a href="howto_xml.html#Validation_of_XML_configuration_files">Validation of XML configuration files</a></li>
<li><a href="howto_compositeconfiguration.html#Composite_Configuration_Details">Composite Configuration Details</a></li>
<ul>
<li><a href="howto_compositeconfiguration.html#Setting_Up_Defaults">Setting Up Defaults</a></li>
@@ -114,18 +114,19 @@
<li><a href="howto_configurationfactory.html#The_configuration_definition_file">The configuration definition file</a></li>
<li><a href="howto_configurationfactory.html#Setting_up_a_ConfigurationFactory">Setting up a ConfigurationFactory</a></li>
<li><a href="howto_configurationfactory.html#Accessing_properties">Accessing properties</a></li>
+ <li><a href="howto_configurationfactory.html#Multiple_configuration_sources">Multiple configuration sources</a></li>
+ <ul>
+ <li><a href="howto_configurationfactory.html#Overriding_properties">Overriding properties</a></li>
+ <li><a href="howto_configurationfactory.html#Optional_configuration_sources">Optional configuration sources</a></li>
+ </ul>
+ <li><a href="howto_configurationfactory.html#Union_configuration">Union configuration</a></li>
+ <li><a href="howto_configurationfactory.html#Configuration_definition_file_reference">Configuration definition file reference</a></li>
+ <ul>
+ <li><a href="howto_configurationfactory.html#Setting_further_options">Setting further options</a></li>
+ <li><a href="howto_configurationfactory.html#Referencing_system_properties">Referencing system properties</a></li>
+ </ul>
</ul>
- <li><a href="howto_configurationfactory.html#Multiple_configuration_sources">Multiple configuration sources</a></li>
- <ul>
- <li><a href="howto_configurationfactory.html#Overriding_properties">Overriding properties</a></li>
- <li><a href="howto_configurationfactory.html#Optional_configuration_sources">Optional configuration sources</a></li>
- </ul>
- <li><a href="howto_configurationfactory.html#Union_configuration">Union configuration</a></li>
- <li><a href="howto_configurationfactory.html#Configuration_definition_file_reference">Configuration definition file reference</a></li>
- <ul>
- <li><a href="howto_configurationfactory.html#Setting_further_options">Setting further options</a></li>
- <li><a href="howto_configurationfactory.html#Referencing_system_properties">Referencing system properties</a></li>
- </ul>
+
<li><a href="howto_configurationbuilder.html#Using_DefaultConfigurationBuilder">Using DefaultConfigurationBuilder</a></li>
<ul>
<li><a href="howto_configurationbuilder.html#Differences_to_ConfigurationFactory">Differences to ConfigurationFactory</a></li>
@@ -154,6 +155,12 @@
<li><a href="howto_utilities.html#Interpolation_of_all_variables">Interpolation of all variables</a></li>
<li><a href="howto_utilities.html#Handling_of_runtime_exceptions">Handling of runtime exceptions</a></li>
</ul>
+ <li><a href="howto_filesystems.html#File_Systems">File Systems</a></li>
+ <ul>
+ <li><a href="howto_filesystems.html#File_Systems#Configuration">Configuration</a></li>
+ <li><a href="howto_filesystems.html#File_Systems#File_Options_Provider">File Options Provider</a></li>
+ <li><a href="howto_filesystems.html#File_Systems#File_Reloading_Strategy">File Reloading Strategy</a></li>
+ </ul>
</ul>
</section>