leosimons 2003/02/20 06:16:02 Modified: configuration build.xml configuration/src/xdocs configuration-merger.xml index.xml Added: configuration/src/xdocs book.xml tabs.xml Removed: configuration/src/xdocs menu.xml Log: forrestize Revision Changes Path 1.15 +1 -1 avalon-excalibur/configuration/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/avalon-excalibur/configuration/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- build.xml 7 Feb 2003 22:12:57 -0000 1.14 +++ build.xml 20 Feb 2003 14:16:01 -0000 1.15 @@ -358,7 +358,7 @@ <target name="docs" depends="setup-filters"> <!-- depends="javadocs" description="Generates the Docs" --> <mkdir dir="${docs.dir}"/> - <ant antfile="${basedir}/../cocoonbuild.xml"/> + <ant antfile="${basedir}/../forrestbuild.xml"/> <copy todir="${docs.dir}"> <fileset dir="${build.docs}"> 1.3 +16 -16 avalon-excalibur/configuration/src/xdocs/configuration-merger.xml Index: configuration-merger.xml =================================================================== RCS file: /home/cvs/avalon-excalibur/configuration/src/xdocs/configuration-merger.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configuration-merger.xml 26 Jul 2002 15:48:01 -0000 1.2 +++ configuration-merger.xml 20 Feb 2003 14:16:01 -0000 1.3 @@ -8,14 +8,14 @@ </authors> </header> <body> - <s1 title="What is the Configuration Merger?"> + <section><title>What is the Configuration Merger?</title> <p> The Configuration Merger can take two Configurations, a <em>base</em> and a <em>layer</em>. It will then <strong>merge</strong> the layer onto the base </p> - </s1> + </section> - <s1 title="Why not CascadingConfiguration?"> + <section><title>Why not CascadingConfiguration?</title> <p>There was a <link href="http://marc.theaimsgroup.com/?t=101359616800001&r=1&w=2">long thread</link> on what the rules for cascading should be. @@ -26,9 +26,9 @@ mentioned in the link above, which is namely the following situation: <source> - Layer: <a><b x="1"/></a> + Layer: <a><b x="http://avalon.apache.org/excalibur/></a> Base: <a><b/></a> - Result: <a><b x="1"/><b/></a> + Result: <a><b x="http://avalon.apache.org/excalibur/><b/></a> </source> when using Configuration.getChild(name), CascadingConfiguration would do the @@ -37,9 +37,9 @@ serialize the merged configurations when validating them. In the above example, the result expected should probably be the same as the layer. </p> - </s1> + </section> - <s1 title="Merging children in a deterministic manner"> + <section><title>Merging children in a deterministic manner</title> <p> But how do we know that's what the user wants? We don't (at least I'm missing the ESP module for my computer). The answer? <strong>metadata</strong> @@ -58,7 +58,7 @@ the result will be: <source> - <a><b x="1"/></a> + <a><b x="http://avalon.apache.org/excalibur/></a> </source> </p> @@ -75,7 +75,7 @@ a problem. </p> - <s2 title="What if there are multiple children with the same getName()"> + <section><title>What if there are multiple children with the same getName()</title> <p> There is a solution. It is possible to define a <strong>key attibute</strong> using the magic attribute <em>excalibur-configuration:key-attribute</em> @@ -91,21 +91,21 @@ <b x="1" excalibur-configuration:merge="true" excalibur-configuration:key-attribute="x"> <c> </b> - <b x="2"/> + <b x="http://avalon.apache.org/excalibur/> </a> Base: <a> - <b x="1"/> - <b x="2"/> + <b x="http://avalon.apache.org/excalibur/> + <b x="http://avalon.apache.org/excalibur/> </a> </source> - Thus in order to merge <b x="1"/>, the name must be the same + Thus in order to merge <b x="http://avalon.apache.org/excalibur/>, the name must be the same <strong>and</strong> the <em>x</em> attribute must have the same value. </p> - </s2> - </s1> + </section> + </section> </body> <footer> 1.8 +15 -15 avalon-excalibur/configuration/src/xdocs/index.xml Index: index.xml =================================================================== RCS file: /home/cvs/avalon-excalibur/configuration/src/xdocs/index.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- index.xml 13 Nov 2002 03:28:29 -0000 1.7 +++ index.xml 20 Feb 2003 14:16:01 -0000 1.8 @@ -9,14 +9,14 @@ </authors> </header> <body> - <s1 title="Introduction"> + <section><title>Introduction</title> <p> The Configuration package contains extensions to the Avalon Framework supporting configuration management. </p> - </s1> - <s1 title="Resources"> - <s2 title="CascadingConfiguration"> + </section> + <section><title>Resources</title> + <section><title>CascadingConfiguration</title> <p> Provides support for the creation of a base and default parent relationship between two configuration instances. This is helpful when you have a default @@ -28,8 +28,8 @@ configuration. Both base and parent configuration reference can be classic or cascading enabling the creation of complex configuration graphs. </p> - </s2> - <s2 title="ConfigurationUtil"> + </section> + <section><title>ConfigurationUtil</title> <p> Provides a static list operation that is helpful in debugging. The list operation generates a simple string representation of a configuration. @@ -41,8 +41,8 @@ <p> Additionally, provide an method to test the equality of two Configuration objects </p> - </s2> - <s2 title="ConfigurationMerger"> + </section> + <section><title>ConfigurationMerger</title> <p> Similar to the CascadingConfiguration in that it takes two Configuration's and makes one. The ConfigurationMerger can take a "layer" and a "base" and merge @@ -51,20 +51,20 @@ Configuration.getChildren() based off of meta-attributes that can exist in the layer. </p> - </s2> - <s2 title="ConfigurationSplitter"> + </section> + <section><title>ConfigurationSplitter</title> <p> Given a Configuration and a "base", generate the "layer" that when passed to the ConfigurationMerger will yield the original Configuration. </p> - </s2> - <s2 title="ConfigurationValidator"> + </section> + <section><title>ConfigurationValidator</title> <p> A set of tools to apply various XML schema languages to Configuration objects to verify their validity. </p> - </s2> - </s1> + </section> + </section> </body> <footer> <legal> 1.6 +7 -14 avalon-excalibur/configuration/src/xdocs/book.xml 1.1 avalon-excalibur/configuration/src/xdocs/tabs.xml Index: tabs.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" "tab-cocoon-v10.dtd"> <tabs software="Excalibur configuration" title="Excalibur configuration" copyright="Foo" xmlns:xlink="http://www.w3.org/1999/xlink"> <tab label="Avalon Home" href="http://avalon.apache.org/"/> <tab label="Framework" href="http://avalon.apache.org/framework/"/> <tab label="Components" href="http://avalon.apache.org/components/"/> <tab label="Phoenix" href="http://avalon.apache.org/phoenix/"/> <tab label="SECA" href="http://avalon.apache.org/seca/"/> <tab label="Apps" href="http://avalon.apache.org/apps/"/> </tabs>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]