jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gl...@apache.org
Subject cvs commit: jakarta-taglibs/xtags build.xml
Date Sun, 01 Jul 2001 20:08:30 GMT
glenn       01/07/01 13:08:29

  Modified:    application build.xml
               benchmark build.xml
               bsf      build.xml
               datetime build.xml
               foundation build.xml
               gnat-tags build.xml
               input    build.xml
               io       build.xml
               jdbc     build.xml
               jndi     build.xml
               jspspec  build.xml
               log      build.xml
               mailer   build.xml
               page     build.xml
               random   build.xml
               regexp   build.xml
               request  build.xml
               response build.xml
               scrape   build.xml
               session  build.xml
               sql      build.xml
               utility  build.xml
               xsl      build.xml
               xtags    build.xml
  Log:
  Update build system
  
  Revision  Changes    Path
  1.6       +14 -12    jakarta-taglibs/application/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/application/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	2001/06/17 07:29:14	1.5
  +++ build.xml	2001/07/01 20:08:19	1.6
  @@ -42,10 +42,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -86,13 +85,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -124,8 +124,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -208,9 +212,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.4       +14 -12    jakarta-taglibs/benchmark/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/benchmark/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	2001/06/17 07:29:15	1.3
  +++ build.xml	2001/07/01 20:08:20	1.4
  @@ -40,10 +40,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -83,13 +82,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -120,8 +120,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -195,9 +199,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.7       +15 -13    jakarta-taglibs/bsf/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/bsf/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/06/17 07:29:16	1.6
  +++ build.xml	2001/07/01 20:08:20	1.7
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "bsf" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.6 2001/06/17 07:29:16 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.7 2001/07/01 20:08:20 glenn Exp $ -->
   <project name="bsf" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -43,10 +43,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -87,13 +86,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -124,8 +124,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -194,9 +198,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.8       +15 -13    jakarta-taglibs/datetime/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/datetime/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	2001/06/17 07:29:17	1.7
  +++ build.xml	2001/07/01 20:08:21	1.8
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "datetime" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.7 2001/06/17 07:29:17 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.8 2001/07/01 20:08:21 glenn Exp $ -->
   <project name="datetime" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -43,10 +43,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -87,13 +86,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -125,8 +125,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -215,9 +219,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.4       +17 -9     jakarta-taglibs/foundation/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/foundation/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	2001/06/17 07:29:17	1.3
  +++ build.xml	2001/07/01 20:08:22	1.4
  @@ -41,9 +41,8 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -84,13 +83,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -122,6 +122,16 @@
       <copy toDir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +<!--
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
  +      <param name="prefix" expression="../../"/>
  +    </style>
  +-->
       <copy toDir="${build.doc}">
         <fileset dir="${doc.src}/web"/>
       </copy>
  @@ -210,9 +220,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.5       +14 -12    jakarta-taglibs/gnat-tags/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/gnat-tags/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	2001/06/17 07:29:18	1.4
  +++ build.xml	2001/07/01 20:08:22	1.5
  @@ -39,10 +39,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!--  
           The following properties are specific to the gnat taglib and are used
  @@ -93,13 +92,14 @@
           dist.tld                Destination TLD file for tag library
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -132,8 +132,12 @@
         <fileset dir="${doc.src}/conf"/>
       </copy>
   <!--
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
   -->
  @@ -247,9 +251,7 @@
     
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   </project>
  
  
  
  1.7       +14 -12    jakarta-taglibs/input/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/input/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/06/17 07:29:19	1.6
  +++ build.xml	2001/07/01 20:08:23	1.7
  @@ -40,10 +40,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -83,13 +82,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -120,8 +120,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -195,9 +199,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.5       +2 -5      jakarta-taglibs/io/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/io/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	2001/05/07 14:31:39	1.4
  +++ build.xml	2001/07/01 20:08:23	1.5
  @@ -6,12 +6,9 @@
   
   <project name="io" default="main">
   
  -  <property name="library.pre" value="library.pre"/>
  -
  -  <target name="library.pre" depends="gen-docs"/>
  -
  +  <property name="gen-docs.present" value="true"/>
  +
     &common;
  -
   
   </project>
   
  
  
  
  1.6       +14 -12    jakarta-taglibs/jdbc/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/jdbc/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	2001/06/17 07:29:20	1.5
  +++ build.xml	2001/07/01 20:08:23	1.6
  @@ -43,10 +43,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -87,13 +86,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -125,8 +125,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -210,9 +214,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.5       +15 -13    jakarta-taglibs/jndi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/jndi/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	2001/06/17 07:29:21	1.4
  +++ build.xml	2001/07/01 20:08:24	1.5
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "jndi" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.4 2001/06/17 07:29:21 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.5 2001/07/01 20:08:24 glenn Exp $ -->
   <project name="jndi" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -44,10 +44,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -88,13 +87,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}-taglib.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -126,8 +126,12 @@
       <copy todir="${build.doc}/WEB-INF" >
           <fileset dir="${doc.src}/conf" />
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -232,9 +236,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.7       +15 -13    jakarta-taglibs/jspspec/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/jspspec/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/06/17 07:29:22	1.6
  +++ build.xml	2001/07/01 20:08:24	1.7
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "jspspec" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.6 2001/06/17 07:29:22 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.7 2001/07/01 20:08:24 glenn Exp $ -->
   <project name="jspspec" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -41,10 +41,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -84,13 +83,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -121,8 +121,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -191,9 +195,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.3       +1 -0      jakarta-taglibs/log/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/log/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	2001/06/26 18:50:07	1.2
  +++ build.xml	2001/07/01 20:08:24	1.3
  @@ -9,6 +9,7 @@
     <property environment="env"/>
     <property name="classpath" value="${env.SERVLET_JAR}:lib/log4j.jar" />
     <property name="library.pre" value="library.pre"/>
  +  <property name="gen-docs.present" value="true"/>
   
     <!-- =================================================================== -->
     <!-- copy the dom4j and log4j jars into the examples lib dir             -->
  
  
  
  1.7       +15 -13    jakarta-taglibs/mailer/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/mailer/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/06/17 07:29:24	1.6
  +++ build.xml	2001/07/01 20:08:25	1.7
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "mailer" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.6 2001/06/17 07:29:24 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.7 2001/07/01 20:08:25 glenn Exp $ -->
   <project name="mailer" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -41,10 +41,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -84,13 +83,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -122,8 +122,12 @@
       <copy todir="${build.doc}/WEB-INF">
   	<fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -209,9 +213,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.6       +14 -12    jakarta-taglibs/page/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/page/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	2001/06/17 07:29:25	1.5
  +++ build.xml	2001/07/01 20:08:25	1.6
  @@ -42,10 +42,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -86,13 +85,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -124,8 +124,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -209,9 +213,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.5       +15 -13    jakarta-taglibs/random/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/random/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	2001/06/17 07:29:26	1.4
  +++ build.xml	2001/07/01 20:08:26	1.5
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "random" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.4 2001/06/17 07:29:26 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.5 2001/07/01 20:08:26 glenn Exp $ -->
   <project name="random" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -41,10 +41,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -84,13 +83,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -122,8 +122,12 @@
       <copy todir="${build.doc}/WEB-INF">
   	<fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -209,9 +213,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <!--<delete dir="${build.doc}"/>-->
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.7       +14 -216   jakarta-taglibs/regexp/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/regexp/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/06/17 07:29:27	1.6
  +++ build.xml	2001/07/01 20:08:26	1.7
  @@ -1,225 +1,23 @@
  -<!-- ANT Build Script for the "regexp" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.6 2001/06/17 07:29:27 glenn Exp $ -->
  -<project name="regexp" default="main" basedir=".">
  +<?xml version="1.0"?>
   
  -    <!-- ******************** Adjustable Properties *********************** -->
  +<!DOCTYPE project [
  +    <!ENTITY common SYSTEM "file:../common.xml">
  +]>
   
  -    <!--
  +<project name="regexp" default="main">
   
  -        The following property values should be examined and customized
  -        for each custom tag library subproject.
  +  <property file="../build.properties"/>
  +  <property name="classpath" value="${servlet.jar}:${jakarta-oro2.jar}"/>
   
  -        ant.home                    Home directory for the ANT build tool
  -                                    This is normally defaulted from the
  -                                    ANT_HOME environment variable in the
  -                                    build script.
  +  <property name="checkRequirements.pre" value="checkRequirements.pre"/>
   
  -        servlet.jar                 Pathname of the servlet API classes
  -                                    you are using to compile, such as the
  -                                    one that comes with Tomcat.  This is
  -                                    normally defaulted from the SERVLET_JAR
  -                                    environment variable in the build script.
  -
  -        taglib.name                 Base name of this tag library subproject.
  -
  -    -->
  -
  -    <property name="taglib.name"    value="regexp"/>
  -    <property name="ant.home"       value="../../jakarta-ant"/>
  -    <property name="servlet.jar"    value="../../jakarta-servletapi/lib/servlet.jar"/>
  -    <property name="oro.jar"    value="../../jakarta-oro/jakarta-oro-2.0.jar"/>
  -
  -
  -    <!-- ****************** Project Standard Properties ******************* -->
  -
  -    <!--
  -
  -        The following property values reflect the standard directory
  -        organization for the jakarta-taglibs project, and should not
  -        be changed or overridden.
  -
  -        build.dir                   Base directory for build targets
  -        dist.dir                    Base directory for distribution targets
  -        taglibs.xsl                 Taglibs stylesheet
  -
  -    -->
  -
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  -
  -    <!-- *********************** Default Properties ********************** -->
  -
  -    <!--
  -
  -        The following property values reflect the recommended directory
  -        structure for each custom tag library subproject.  You should only
  -        need to adjust or override them if you use a different organization.
  -
  -        conf.src                    Library configuration source directory
  -        doc.src                     Documentation app source directory
  -        examples.src                Examples app source directory
  -        library.src                 Library Java source directory
  -
  -    -->
  -
  -    <property name="conf.src"       value="conf"/>
  -    <property name="doc.src"        value="doc"/>
  -    <property name="examples.src"   value="examples"/>
  -    <property name="library.src"    value="src"/>
  -    <property name="lib.src"        value="lib"/>
  -
  -
  -    <!-- ********************* Derived Properties ************************* -->
  -
  -    <!--
  -
  -        These property values are derived from the previously defined values,
  -        and should not normally be overridden from the command line.
  -
  -        build.doc                   Target directory for documentation app
  -        build.examples              Target directory for examples app
  -        build.library               Target directory for tag library
  -        dist.doc                    Destination WAR for documentation app
  -        dist.examples               Destination WAR for examples app
  -        dist.library                Destination JAR for tag library
  -        dist.tld                    Destination TLD file for tag library
  -
  -    -->
  -
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  -    <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
  -    <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
  -    <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
  -    <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  -
  -
  -  <!-- ********************** Destination Preparation ********************* -->
  -
  -  <target name="prepare">
  -    <!-- Set up build directories -->
  -    <mkdir dir="${build.dir}"/>
  -    <mkdir dir="${build.doc}"/>
  -    <mkdir dir="${build.doc}/javadoc"/>
  -    <mkdir dir="${build.doc}/WEB-INF"/>
  -    <mkdir dir="${build.doc}/WEB-INF/classes"/>
  -    <mkdir dir="${build.doc}/WEB-INF/lib"/>
  -    <mkdir dir="${build.examples}"/>
  -    <mkdir dir="${build.examples}/WEB-INF"/>
  -    <mkdir dir="${build.examples}/WEB-INF/classes"/>
  -    <mkdir dir="${build.examples}/WEB-INF/lib"/>
  -    <mkdir dir="${build.library}"/>
  -    <mkdir dir="${build.library}/META-INF"/>
  -    <!-- Set up distribution directory -->
  -    <mkdir dir="${dist.dir}"/>
  -    <mkdir dir="${dist.dir}/${taglib.name}"/>
  -  </target>
  -
  -
  -  <!-- **************** Compile Tag Library Components ******************** -->
  -
  -  <!-- Compile the documentation application -->
  -  <target name="documentation" depends="prepare">
  -    <copy todir="${build.doc}/WEB-INF">
  -      <fileset dir="${doc.src}/conf"/>
  -    </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  -      <param name="prefix" expression="../../"/>
  -    </style>
  -    <copy todir="${build.doc}">
  -      <fileset dir="${doc.src}/web">
  -        <include name="**/*.html"/>
  -      </fileset>
  -    </copy>
  -    <javadoc packagenames="org.apache.taglibs.regexp.*"
  -	     classpath="${servlet.jar}:${oro.jar}"
  -             sourcepath="src"
  -             destdir="${build.doc}/javadoc"
  -             author="true"   
  -             version="true"
  -	     use="true"
  -             windowtitle="Jakarta REGEXP custom tag library API"
  -             doctitle="Jakarta REGEXP custom tag library"
  -             bottom="Copyright &#169; 2000 Apache Software Foundation. All Rights Reserved."
  -    />
  -  </target>
  -
  -  <!-- Compile the examples application -->
  -  <target name="examples" depends="library-dist">
  -    <copy todir="${build.examples}/WEB-INF">
  -      <fileset dir="${examples.src}/conf"/>
  -    </copy>
  -    <copy todir="${build.examples}">
  -      <fileset dir="${examples.src}/web"/>
  -    </copy>
  -    <copy file="${dist.dir}/request/request.jar"
  -	      tofile="${build.examples}/WEB-INF/lib/request.jar"/>
  -    <copy file="${dist.dir}/request/request.tld"
  -              tofile="${build.examples}/WEB-INF/request.tld"/>
  -    <copy file="${conf.src}/regexp.tld" tofile="${dist.tld}"/>
  -    <copy file="${dist.tld}"
  -              tofile="${build.examples}/WEB-INF/${taglib.name}.tld"/>
  -    <copy file="${dist.library}"
  -              tofile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
  -    <copy file="${examples.src}/web/regexp.jsp"
  -              tofile="${build.examples}/regexp.txt"/>
  -    <copy file="${oro.jar}"
  -              tofile="${build.examples}/WEB-INF/lib/jakarta-oro-2.0.jar"/>
  -  </target>
  -
  -  <!-- Compile the tag library itself -->
  -  <target name="library" depends="prepare">
  -    <copy file="${conf.src}/regexp.tld"
  -              tofile="${build.library}/META-INF/taglib.tld"/>
  -    <javac srcdir="${library.src}" destdir="${build.library}"
  -           classpath="${servlet.jar}:${oro.jar}" debug="on"/>
  -  </target>
  -
  -  <!-- Compile the library as well as the associated applications -->
  -  <target name="main" depends="library,documentation,examples"/>
  -
  -
  -  <!-- ******************* Create Distribution Files ********************** -->
  -
  -  <!-- Create the documentation application WAR file -->
  -  <target name="documentation-dist" depends="documentation">
  -    <jar jarfile="${dist.doc}" basedir="${build.doc}" excludes="intro.html"/>
  -    <mkdir dir="${taglibs.doc}"/>
  -    <copy todir="${taglibs.doc}">
  -      <fileset dir="${build.doc}">
  -        <exclude name="WEB-INF"/>     
  -      </fileset>
  -    </copy>
  -  </target>
  -
  -  <!-- Create the examples application WAR file -->
  -  <target name="examples-dist" depends="examples">
  -    <jar jarfile="${dist.examples}" basedir="${build.examples}"/>
  -  </target>
  -
  -  <!-- Create the library distribution files -->
  -  <target name="library-dist" depends="library">
  -    <jar jarfile="${dist.library}" basedir="${build.library}"/>
  -    <copy file="${conf.src}/${taglib.name}.tld" tofile="${dist.tld}"/>
  +  <target name="checkRequirements.pre">
  +    <antcall target="checkRequiredFile">
  +       <param name="file" value="${jakarta-oro2.jar}"/>
  +       <param name="fail.message" value="a jar file containing the jakarta-oro-2 classes is required to compile the regexp taglib. please define the property jakarta-oro-2.jar in your build.properties file and ensure that the file exists"/>
  +    </antcall>
     </target>
  -
  -  <!-- Create the entire set of distribution files -->
  -  <target name="dist" depends="library-dist,examples-dist,documentation-dist"/>
  -
   
  -
  -  <!-- ************************ Utility Commands ************************** -->
  -
  -  <!-- Delete output directories and files so we can build from scratch -->
  -  <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  -    <delete dir="${dist.dir}/${taglib.name}"/>
  -  </target>
  +  &common;
   
   </project>
  
  
  
  1.8       +15 -13    jakarta-taglibs/request/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/request/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	2001/06/17 07:29:29	1.7
  +++ build.xml	2001/07/01 20:08:26	1.8
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "request" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.7 2001/06/17 07:29:29 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.8 2001/07/01 20:08:26 glenn Exp $ -->
   <project name="request" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -44,10 +44,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -88,13 +87,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -126,8 +126,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -210,9 +214,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.8       +15 -13    jakarta-taglibs/response/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/response/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	2001/06/17 07:29:30	1.7
  +++ build.xml	2001/07/01 20:08:27	1.8
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "response" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.7 2001/06/17 07:29:30 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.8 2001/07/01 20:08:27 glenn Exp $ -->
   <project name="response" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -43,10 +43,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -87,13 +86,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -125,8 +125,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -217,9 +221,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.7       +15 -13    jakarta-taglibs/scrape/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/scrape/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/06/17 07:29:34	1.6
  +++ build.xml	2001/07/01 20:08:27	1.7
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "scrape" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.6 2001/06/17 07:29:34 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.7 2001/07/01 20:08:27 glenn Exp $ -->
   <project name="scrape" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -43,10 +43,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -86,13 +85,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -124,8 +124,12 @@
       <copy todir="${build.doc}/WEB-INF">
   	<fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -231,9 +235,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.9       +15 -13    jakarta-taglibs/session/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/session/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	2001/06/17 07:29:38	1.8
  +++ build.xml	2001/07/01 20:08:28	1.9
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "session" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.8 2001/06/17 07:29:38 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.9 2001/07/01 20:08:28 glenn Exp $ -->
   <project name="session" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -43,10 +43,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -87,13 +86,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -125,8 +125,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -209,9 +213,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.7       +15 -13    jakarta-taglibs/sql/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/sql/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/06/17 07:29:39	1.6
  +++ build.xml	2001/07/01 20:08:28	1.7
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "sql" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.6 2001/06/17 07:29:39 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.7 2001/07/01 20:08:28 glenn Exp $ -->
   <project name="jspspec" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -41,10 +41,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -84,13 +83,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -121,8 +121,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -191,9 +195,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.8       +15 -13    jakarta-taglibs/utility/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/utility/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	2001/06/17 07:29:43	1.7
  +++ build.xml	2001/07/01 20:08:28	1.8
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "utility" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.7 2001/06/17 07:29:43 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.8 2001/07/01 20:08:28 glenn Exp $ -->
   <project name="utility" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -41,10 +41,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
       <!-- *********************** Default Properties ********************** -->
   
  @@ -84,13 +83,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -121,8 +121,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -194,9 +198,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.7       +15 -13    jakarta-taglibs/xsl/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/xsl/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/06/17 07:29:44	1.6
  +++ build.xml	2001/07/01 20:08:29	1.7
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "xsl" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.6 2001/06/17 07:29:44 glenn Exp $ -->
  +<!-- $Id: build.xml,v 1.7 2001/07/01 20:08:29 glenn Exp $ -->
   <project name="xsl" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -48,10 +48,9 @@
   
       -->
   
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
  -    <property name="taglibs.xsl"    value="../../../src/doc/stylesheets/taglibs.xsl"/>
  +    <property name="build.dir"      value="../build"/>
  +    <property name="dist.dir"       value="../dist"/>
  +    <property name="taglibs.xsl"    value="../src/doc/stylesheets/taglibs.xsl"/>
   
   
       <!-- *********************** Default Properties ********************** -->
  @@ -93,13 +92,14 @@
   
       -->
   
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}/${taglib.name}"/>
       <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
       <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
       <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
       <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +    <property name="taglibs.doc"    value="${dist.dir}/doc/doc/${taglib.name}-doc"/>
   
   
     <!-- ********************** Destination Preparation ********************* -->
  @@ -130,8 +130,12 @@
       <copy todir="${build.doc}/WEB-INF">
         <fileset dir="${doc.src}/conf"/>
       </copy>
  -    <style   basedir="${doc.src}/web" destdir="${build.doc}"
  -      extension=".html" style="${taglibs.xsl}" includes="*.xml">
  +    <!-- intro.xml isn't part of the documentation application,
  +         this is just a handy place to build it for the web site. -->
  +    <style in="xml/intro.xml"
  +           destdir="${build.doc}"
  +           out="${build.doc}/intro.html"
  +           style="${taglibs.xsl}">
         <param name="prefix" expression="../../"/>
       </style>
       <copy todir="${build.doc}">
  @@ -212,9 +216,7 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <delete dir="${build.doc}"/>
  -    <delete dir="${build.examples}"/>
  -    <delete dir="${build.library}"/>
  +    <delete dir="${build.dir}/${taglib.name}"/>
       <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
  
  
  
  1.7       +1 -0      jakarta-taglibs/xtags/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/xtags/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/06/05 09:14:57	1.6
  +++ build.xml	2001/07/01 20:08:29	1.7
  @@ -9,6 +9,7 @@
     <property environment="env"/>
     <property name="classpath" value="${env.SERVLET_JAR}:lib/dom4j.jar:lib/jaxp.jar:lib/log4j-core.jar:lib/xalan.jar" />
     <property name="library.pre" value="library.pre"/>
  +  <property name="gen-docs.present" value="true"/>
   
     <!-- =================================================================== -->
     <!-- copy the dom4j and log4j jars into the examples lib dir             -->
  
  
  

Mime
View raw message