You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/16 09:29:23 UTC

cvs commit: jakarta-cactus/documentation/docs/xdocs/integration/ant task_cactifywar.xml task_webxmlmerge.xml

cmlenz      2003/05/16 00:29:23

  Modified:    documentation/docs/xdocs/integration/ant task_cactifywar.xml
                        task_webxmlmerge.xml
  Log:
  Add note about <xmlcatalog>
  
  Revision  Changes    Path
  1.2       +19 -0     jakarta-cactus/documentation/docs/xdocs/integration/ant/task_cactifywar.xml
  
  Index: task_cactifywar.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/integration/ant/task_cactifywar.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- task_cactifywar.xml	14 May 2003 21:07:58 -0000	1.1
  +++ task_cactifywar.xml	16 May 2003 07:29:23 -0000	1.2
  @@ -202,6 +202,25 @@
   
           </section>
   
  +        <section title="xmlcatalog">
  +
  +          <p>
  +            The <code>xmlcatalog</code> element can be used to perform Entity
  +            and DTD resolution. This is a built-in Ant type. See the
  +            <link href="ext:ant_manual">Ant Manual</link> for details.
  +          </p>
  +
  +          <note>
  +            The <strong>cactifywar</strong> task resolves the DTDs of web-app
  +            descriptors (version 2.2 as well as 2.3) automatically to copies
  +            stored in the JAR. So normally, you shouldn't need to specify a
  +            nested <code>xmlcatalog</code> element. Further, actually
  +            specifying it will disable the default behaviour, and you'll need
  +            to provide the web-app DTDs yourself.
  +          </note>
  +
  +        </section>
  +
         </section>
   
         <section title="Examples">
  
  
  
  1.4       +9 -0      jakarta-cactus/documentation/docs/xdocs/integration/ant/task_webxmlmerge.xml
  
  Index: task_webxmlmerge.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/integration/ant/task_webxmlmerge.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- task_webxmlmerge.xml	15 May 2003 20:22:43 -0000	1.3
  +++ task_webxmlmerge.xml	16 May 2003 07:29:23 -0000	1.4
  @@ -132,6 +132,15 @@
             <link href="ext:ant">Ant documentation</link> for details.
           </p>
   
  +        <note>
  +          The <strong>webxmlmerge</strong> task resolves the DTDs of web-app
  +          descriptors (version 2.2 as well as 2.3) automatically to copies
  +          stored in the JAR. So normally, you shouldn't need to specify a
  +          nested <code>xmlcatalog</code> element. Further, actually
  +          specifying it will disable the default behaviour, and you'll need
  +          to provide the web-app DTDs yourself.
  +        </note>
  +
         </section>
   
       </section>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org