tbennett 2004/04/29 14:58:49 Modified: merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset include.xml index.xml navigation.xml Added: merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset exclude.xml Log: fileset docs update for the merlin site Revision Changes Path 1.2 +7 -4 avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/include.xml Index: include.xml =================================================================== RCS file: /home/cvs/avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/include.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- include.xml 8 Apr 2004 08:10:04 -0000 1.1 +++ include.xml 29 Apr 2004 21:58:49 -0000 1.2 @@ -23,6 +23,7 @@ <title>Include Directive</title> <authors> <person name="Stephen McConnell" email="[EMAIL PROTECTED]"/> + <person name="Timothy Bennett" email="[EMAIL PROTECTED]"/> </authors> </header> @@ -31,7 +32,7 @@ <section name="Include Declarations"> <subsection name="Description"> - <p>Declaration of a jar files to include within the scope of a fileset.</p> + <p>Declaration of jar files to include within the scope of a fileset.</p> </subsection> <subsection name="Attributes"> @@ -41,17 +42,19 @@ <tr> <td>name</td><td>yes</td> <td> - The name of the file file include. + The name of the file to include. Ant-like wildcard patterns are + supported. </td> </tr> </table> </subsection> <subsection name="Sample XML"> + This example includes all the jar files in the lib directory and in all + its subdirectories. <source> <fileset dir="<font color="darkred">lib</font>"> - <include name="<font color="darkred">avalon-framework-impl-4.1.5.jar</font>"/> - <include name="<font color="darkred">logkit-2.0.jar</font>"/> + <include name="<font color="darkred">**/*.jar</font>"/> </fileset> </source> </subsection> 1.2 +23 -5 avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/index.xml Index: index.xml =================================================================== RCS file: /home/cvs/avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/index.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.xml 8 Apr 2004 08:10:04 -0000 1.1 +++ index.xml 29 Apr 2004 21:58:49 -0000 1.2 @@ -23,6 +23,7 @@ <title>Fileset Directive</title> <authors> <person name="Stephen McConnell" email="[EMAIL PROTECTED]"/> + <person name="Timothy Bennett" email="[EMAIL PROTECTED]"/> </authors> </header> @@ -45,7 +46,10 @@ base directory for the resolution of included entries. If the supplied value is a relative path, the path will be resolved relative to the <a href="../../../../../system/properties.html"> - merlin.anchor</a> system parameter. + merlin.anchor</a> system parameter. If no include directives are + contained in the fileset specification, then the fileset behavior + defaults to adding the directory specified by the dir attribute + to the classpath. </td> </tr> </table> @@ -57,18 +61,32 @@ <tr> <td><a href="include.html">include</a></td><td>0..n</td> <td> - Declaration of a jar file withing the filset directory to be - included within the classloader. + Declaration of jar file(s) within the fileset directory to be + included in the classloader. Ant-like wildcard patterns are + supported. + </td> + </tr> + <tr> + <td><a href="exclude.html">exclude</a></td><td>0..n</td> + <td> + Declaration of jar file(s) within the fileset directory to be + excluded from the classloader. Ant-like wildcard patterns are + supported. </td> </tr> </table> </subsection> <subsection name="Sample XML"> + This example includes all the jar files in the lib directory and in all + its subdirectories, includes the my-class.class file in the lib directory, + and excludes all files in the lib directory that contain the -dev string + in its filename. <source> <fileset dir="<font color="darkred">lib</font>"> - <include name="<font color="darkred">avalon-framework.jar</font>"/> - <include name="<font color="darkred">logkit.jar</font>"/> + <include name="<font color="darkred">**/*.jar</font>"/> + <include name="<font color="darkred">my-class.class</font>"/> + <exclude name="<font color="darkred">*-dev*</font>"/> </fileset> </source> </subsection> 1.2 +2 -0 avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/navigation.xml Index: navigation.xml =================================================================== RCS file: /home/cvs/avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/navigation.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- navigation.xml 8 Apr 2004 08:10:04 -0000 1.1 +++ navigation.xml 29 Apr 2004 21:58:49 -0000 1.2 @@ -53,6 +53,8 @@ href="/reference/containment/directives/classloader/classpath/fileset/index.html"> <item name="fileset" href="/reference/containment/directives/classloader/classpath/fileset/include.html"/> + <item name="fileset" + href="/reference/containment/directives/classloader/classpath/fileset/exclude.html"/> </item> </item> <item name="library" href="/reference/containment/directives/classloader/extensions.html"/> 1.1 avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/exclude.xml Index: exclude.xml =================================================================== <?xml version="1.0"?> <!-- Copyright 2004 Apache Software Foundation Licensed 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> <header> <title>Exclude Directive</title> <authors> <person name="Stephen McConnell" email="[EMAIL PROTECTED]"/> <person name="Timothy Bennett" email="[EMAIL PROTECTED]"/> </authors> </header> <body> <section name="Exclude Declarations"> <subsection name="Description"> <p>Declaration of jar files to exclude from the scope of a fileset.</p> </subsection> <subsection name="Attributes"> <table> <tr><th>Attribute</th><th>Required</th><th>Description</th></tr> <tr> <td>name</td><td>yes</td> <td> The name of the file to exclude. Ant-like wildcard patterns are supported. </td> </tr> </table> </subsection> <subsection name="Sample XML"> This example includes all the jar files in the lib directory and in all its subdirectories and excludes all files in the lib directory that contain the -dev string in its filename <source> <fileset dir="<font color="darkred">lib</font>"> <include name="<font color="darkred">**/*.jar</font>"/> <exclude name="<font color="darkred">*-dev*</font>"/> </fileset> </source> </subsection> </section> </body> </document>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]