Return-Path: <mschachter@apache.org>
Mailing-List: contact struts-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list struts-dev@jakarta.apache.org
Received: (qmail 25491 invoked by uid 500); 7 Jan 2001 00:16:30 -0000
Delivered-To: apmail-jakarta-struts-cvs@apache.org
Received: (qmail 25483 invoked by uid 1207); 7 Jan 2001 00:16:30 -0000
Date: 7 Jan 2001 00:16:30 -0000
Message-ID: <20010107001630.25481.qmail@apache.org>
From: mschachter@apache.org
To: jakarta-struts-cvs@apache.org
Subject: cvs commit: jakarta-struts/web/upload/WEB-INF web.xml

mschachter    01/01/06 16:16:30

  Modified:    .        build.xml
               web/example index.jsp logon.jsp mainMenu.jsp
                        registration.jsp subscription.jsp
               web/example/WEB-INF web.xml
               web/upload upload.jsp
               web/upload/WEB-INF web.xml
  Log:
  Modified example app and upload app to use new struts-html tag library
  
  Revision  Changes    Path
  1.25      +393 -393  jakarta-struts/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/build.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build.xml	2000/12/28 00:17:54	1.24
  +++ build.xml	2001/01/07 00:16:28	1.25
  @@ -1,393 +1,393 @@
  -<project name="Struts" default="compile.library" basedir=".">
  -
  -  <!-- Initialization properties -->
  -  <property name="app.name"       value="struts"/>
  -  <property name="build.home"     value="../build/${app.name}"/>
  -  <property name="catalina.home"  value="../build/tomcat-4.0"/>
  -  <property name="debug"          value="true"/>
  -  <property name="deprecation"    value="false"/>
  -  <property name="dist.home"      value="../dist/${app.name}"/>
  -  <property name="optimize"       value="true"/>
  -  <property name="project.name"   value="jakarta-struts"/>
  -  <property name="project.version" value="1.0-dev"/>
  -  <property name="tomcat.home"    value="../build/tomcat"/>
  -
  -  <!-- BUILD:  Create directories and copy files for library -->
  -  <target name="prepare.library">
  -    <mkdir   dir="${build.home}"/>
  -    <mkdir   dir="${build.home}/library"/>
  -    <mkdir   dir="${build.home}/library/classes"/>
  -    <mkdir   dir="${build.home}/library/classes/META-INF"/>
  -    <mkdir   dir="${build.home}/library/classes/META-INF/tlds"/>
  -    <copy   file="src/conf/struts.tld"
  -          tofile="${build.home}/library/classes/META-INF/taglib.tld"/>
  -    <mkdir   dir="${build.home}/library/classes/org"/>
  -    <mkdir   dir="${build.home}/library/classes/org/apache"/>
  -    <mkdir   dir="${build.home}/library/classes/org/apache/struts"/>
  -    <mkdir   dir="${build.home}/library/classes/org/apache/struts/resources"/>
  -    <copy  todir="${build.home}/library/classes/org/apache/struts/resources">
  -      <fileset dir="src/conf" includes="**/*.dtd"/>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD:  Create directories and copy files for documentation app -->
  -  <target name="prepare.documentation">
  -    <mkdir   dir="${build.home}"/>
  -    <mkdir   dir="${build.home}/documentation"/>
  -    <mkdir   dir="${build.home}/documentation/dtds"/>
  -    <copy  todir="${build.home}/documentation/dtds">
  -      <fileset dir="src/conf" includes="**/*.dtd"/>
  -    </copy>
  -    <mkdir   dir="${build.home}/documentation/WEB-INF"/>
  -    <mkdir   dir="${build.home}/documentation/WEB-INF/classes"/>
  -    <mkdir   dir="${build.home}/documentation/WEB-INF/lib"/>
  -    <copy  todir="${build.home}/documentation">
  -      <fileset dir="web/documentation"/>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD:  Create directories and copy files for example application -->
  -  <target name="prepare.example">
  -    <mkdir   dir="${build.home}"/>
  -    <mkdir   dir="${build.home}/example"/>
  -    <mkdir   dir="${build.home}/example/WEB-INF"/>
  -    <mkdir   dir="${build.home}/example/WEB-INF/classes"/>
  -    <mkdir   dir="${build.home}/example/WEB-INF/lib"/>
  -    <copy  todir="${build.home}/example">
  -      <fileset dir="web/example"/>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD:  Create directories and copy files for test application -->
  -  <target name="prepare.test">
  -    <mkdir   dir="${build.home}"/>
  -    <mkdir   dir="${build.home}/test"/>
  -    <mkdir   dir="${build.home}/test/WEB-INF"/>
  -    <mkdir   dir="${build.home}/test/WEB-INF/classes"/>
  -    <mkdir   dir="${build.home}/test/WEB-INF/lib"/>
  -    <copy  todir="${build.home}/test">
  -      <fileset dir="web/test"/>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD:  Create directories and copy files for template example -->
  -  <target name="prepare.template">
  -    <mkdir   dir="${build.home}"/>
  -    <mkdir   dir="${build.home}/template"/>
  -    <mkdir   dir="${build.home}/template/css"/>
  -    <mkdir   dir="${build.home}/template/graphics"/>
  -    <mkdir   dir="${build.home}/template/WEB-INF"/>
  -    <mkdir   dir="${build.home}/template/WEB-INF/lib"/>
  -    <mkdir   dir="${build.home}/template/WEB-INF/tlds"/>
  -    <copy  todir="${build.home}/template">
  -      <fileset dir="web/template-example"/>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD: Create directories and copy files for upload example -->
  -  <target name="prepare.upload">
  -    <mkdir  dir="${build.home}"/>
  -    <mkdir  dir="${build.home}/upload"/>
  -    <mkdir  dir="${build.home}/upload/WEB-INF"/>
  -    <mkdir  dir="${build.home}/upload/WEB-INF/lib"/>
  -    <mkdir  dir="${build.home}/upload/WEB-INF/classes"/>
  -    <copy todir="${build.home}/upload">
  -        <fileset dir="web/upload" />
  -    </copy>
  -  </target>
  -
  -  <!-- DIST:  Create directories and copy files for distribution -->
  -  <target name="prepare.dist">
  -    <mkdir   dir="${dist.home}"/>
  -    <mkdir   dir="${dist.home}/etc"/>
  -    <mkdir   dir="${dist.home}/lib"/>
  -    <mkdir   dir="${dist.home}/src"/>
  -    <mkdir   dir="${dist.home}/web"/>
  -    <mkdir   dir="${dist.home}/webapps"/>
  -  </target>
  -
  -  <!-- BUILD:  Compile library directory components -->
  -  <target name="compile.library" depends="prepare.library">
  -    <javac srcdir="src/share"     destdir="${build.home}/library/classes"
  -           classpath="${servlet.jar}"
  -	   debug="${debug}" optimize="${optimize}"
  -     deprecation="${deprecation}"/>
  -    <copy   todir="${build.home}/library/classes">
  -      <fileset dir="src/share" includes="**/*.properties"/>
  -    </copy>
  -    <copy   todir="${build.home}/library">
  -      <fileset dir="src/conf" includes="*.dtd"/>
  -      <fileset dir="src/conf" includes="*.tld"/>
  -    </copy>
  -    <style basedir="src/doc" destdir="${build.home}/library"
  -         extension=".tld" style="stylesheets/tld.xsl"
  -          includes="struts-*.xml"/>
  -    <copy    todir="${build.home}/library/classes/META-INF/tlds">
  -      <fileset dir="${build.home}/library" includes="struts-*.tld"/>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD:  Compile documentation application components -->
  -  <target name="compile.documentation"
  -       depends="dist.library,prepare.documentation">
  -
  -    <!-- Compile beans and tags required by the documentation app -->
  -<!--
  -    <javac srcdir="src/documentation"
  -          destdir="${build.home}/documentation/WEB-INF/classes"
  -        classpath="${build.home}/library/classes:${servlet.jar}"
  -            debug="${debug}" optimize="${optimize}"
  -      deprecation="${deprecation}"/>
  --->
  -
  -    <!-- Copy Struts JAR file and TLDs to the documentation app -->
  -    <copy    file="${dist.home}/lib/${app.name}.jar"
  -           tofile="${build.home}/documentation/WEB-INF/lib/${app.name}.jar"/>
  -    <copy   todir="${build.home}/documentation/WEB-INF">
  -      <fileset dir="${dist.home}/lib" includes="*.tld"/>
  -    </copy>
  -
  -    <!-- Copy static documentation content -->
  -    <copy    file="TODO" tofile="${build.home}/documentation/todo.txt"/>
  -    <copy   todir="${build.home}/documentation">
  -      <fileset dir="web/documentation"/>
  -    </copy>
  -
  -    <!-- Create dynamically generated documentation -->
  -    <style   basedir="src/doc" destdir="${build.home}/documentation"
  -           extension=".html" style="stylesheets/struts.xsl" includes="*.xml"/>
  -    <copy      todir="${build.home}/documentation">
  -      <fileset   dir="src/doc">
  -        <include name="**/*.css"/>
  -        <include name="**/*.gif"/>
  -        <include name="**/*.html"/>
  -        <include name="**/*.jpg"/>
  -        <include name="**/*.js"/>
  -      </fileset>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD:  Compile example application components -->
  -  <target name="compile.example"
  -       depends="dist.library,prepare.example">
  -    <javac srcdir="src/example"
  -          destdir="${build.home}/example/WEB-INF/classes"
  -        classpath="${build.home}/library/classes:${servlet.jar}"
  -            debug="${debug}" optimize="${optimize}"
  -      deprecation="${deprecation}"/>
  -    <copy   todir="${build.home}/example/WEB-INF/classes">
  -      <fileset dir="src/example" includes="**/*.properties"/>
  -    </copy>
  -    <copy   todir="${build.home}/example">
  -      <fileset dir="web/example"/>
  -    </copy>
  -    <copy    file="${dist.home}/lib/${app.name}.jar"
  -           tofile="${build.home}/example/WEB-INF/lib/${app.name}.jar"/>
  -    <copy   todir="${build.home}/example/WEB-INF">
  -      <fileset dir="${dist.home}/lib" includes="*.tld"/>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD:  Compile template example application components -->
  -  <target name="compile.template"
  -       depends="dist.library,prepare.template">
  -    <copy   todir="${build.home}/template">
  -      <fileset dir="web/template-example"/>
  -    </copy>
  -    <copy    file="${dist.home}/lib/${app.name}.jar"
  -           tofile="${build.home}/template/WEB-INF/lib/${app.name}.jar"/>
  -    <copy   todir="${build.home}/template/WEB-INF/tlds">
  -      <fileset dir="${dist.home}/lib" includes="*.tld"/>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD: Compile upload example application components -->
  -  <target name="compile.upload"
  -          depends="dist.library,prepare.upload">
  -
  -      <javac srcdir="web/upload"
  -             destdir="${build.home}/upload/WEB-INF/classes"
  -             classpath="${build.home}/library/classes:${servlet.jar}"
  -             debug="${debug}" optimize="${optimize}"
  -       deprecation="${deprecation}"/>
  -      <copy todir="${build.home}/upload">
  -        <fileset dir="web/upload" />
  -      </copy>
  -      <copy file="${dist.home}/lib/${app.name}.jar"
  -            tofile="${build.home}/upload/WEB-INF/lib/${app.name}.jar"/>
  -      <copy file="${dist.home}/lib/${app.name}-form.tld"
  -            todir="${build.home}/upload/WEB-INF" />
  -  </target>
  -
  -  <!-- BUILD:  Compile test application components -->
  -  <target name="compile.test"
  -       depends="dist.library,prepare.test">
  -    <javac srcdir="src/test"
  -          destdir="${build.home}/test/WEB-INF/classes"
  -        classpath="${build.home}/library/classes:${servlet.jar}"
  -            debug="${debug}" optimize="${optimize}"
  -      deprecation="${deprecation}"/>
  -    <copy  todir="${build.home}/test/WEB-INF/classes">
  -      <fileset dir="src/test" includes="**/*.properties"/>
  -    </copy>
  -    <copy   todir="${build.home}/test">
  -      <fileset dir="web/test"/>
  -    </copy>
  -    <copy    file="${dist.home}/lib/${app.name}.jar"
  -           tofile="${build.home}/test/WEB-INF/lib/${app.name}.jar"/>
  -    <copy   todir="${build.home}/test/WEB-INF">
  -      <fileset dir="${dist.home}/lib" includes="*.tld"/>
  -    </copy>
  -  </target>
  -
  -  <!-- BUILD:  Create Javadoc documentation -->
  -  <target name="compile.javadoc">
  -    <delete   dir="${build.home}/documentation/api"/>
  -    <mkdir    dir="${build.home}/documentation/api"/>
  -    <javadoc sourcepath="src/share"
  -                destdir="${build.home}/documentation/api"
  -           packagenames="org.apache.struts.*"
  -	         author="true"
  -                private="true"
  -                version="true"
  -            windowtitle="Apache Struts API Documentation"
  -               doctitle="&lt;h1&gt;Apache Struts Framework&lt;/h1&gt;"
  -                 bottom="Copyright &#169; 2000 - Apache Software Foundation"/>
  -  </target>
  -
  -  <!-- DIST:  Construct library distributables -->
  -  <target name="dist.library" depends="prepare.dist,compile.library">
  -    <copy   todir="${dist.home}/lib">
  -      <fileset dir="${build.home}/library" includes="*.dtd"/>
  -      <fileset dir="${build.home}/library" includes="*.tld"/>
  -    </copy>
  -    <jar  jarfile="${dist.home}/lib/${app.name}.jar"
  -         manifest="src/conf/MANIFEST.MF"
  -          basedir="${build.home}/library/classes" includes="**"/>
  -  </target>
  -
  -  <!-- DIST:  Construct documentation distributables -->
  -  <target name="dist.documentation"
  -       depends="dist.library,compile.documentation,compile.javadoc">
  -    <jar  jarfile="${dist.home}/webapps/${app.name}-documentation.war"
  -          basedir="${build.home}/documentation" includes="**"/>
  -  </target>
  -
  -  <!-- DIST:  Construct example distributables -->
  -  <target name="dist.example" depends="dist.library,compile.example">
  -    <jar  jarfile="${dist.home}/webapps/${app.name}-example.war"
  -          basedir="${build.home}/example" includes="**"/>
  -  </target>
  -
  -  <!-- DIST:  Construct template example distributables -->
  -  <target name="dist.template" depends="dist.library,compile.template">
  -    <jar  jarfile="${dist.home}/webapps/${app.name}-template.war"
  -          basedir="${build.home}/template" includes="**"/>
  -  </target>
  -
  -  <!-- DIST:  Construct upload example distributables -->
  -  <target name="dist.upload" depends="dist.library,compile.upload">
  -    <jar jarfile="${dist.home}/webapps/${app.name}-upload.war"
  -         basedir="${build.home}/upload" includes="**"/>
  -  </target>
  -
  -  <!-- DIST:  Construct test distributables -->
  -  <target name="dist.test" depends="dist.library,compile.test">
  -    <jar  jarfile="${dist.home}/webapps/${app.name}-test.war"
  -          basedir="${build.home}/test" includes="**"/>
  -  </target>
  -
  -  <!-- DIST:  Copy sources -->
  -  <target name="dist.source" depends="prepare.dist">
  -    <copy   todir="${dist.home}/etc">
  -      <fileset dir="." includes="build.*"/>
  -    </copy>
  -    <copy    file="INSTALL" tofile="${dist.home}/INSTALL"/>
  -    <copy    file="LICENSE" tofile="${dist.home}/LICENSE"/>
  -    <copy    file="README"  tofile="${dist.home}/README"/>
  -    <copy    file="TODO"    tofile="${dist.home}/TODO"/>
  -    <copy   todir="${dist.home}/src">
  -      <fileset dir="src"/>
  -    </copy>
  -    <copy   todir="${dist.home}/web">
  -      <fileset dir="web"/>
  -    </copy>
  -  </target>
  -
  -  <!-- DIST:  Construct complete release distribution -->
  -  <target name="dist"
  -       depends="dist.library,dist.documentation,dist.example,dist.template,dist.upload,dist.test,dist.source"/>
  -
  -  <!-- DEPLOY:  Deploy these applications on Catalina -->
  -  <target name="deploy.catalina" depends="compile.documentation,compile.example,compile.template,compile.upload,compile.test">
  -    <mkdir   dir="${catalina.home}/webapps/struts-documentation"/>
  -    <copy  todir="${catalina.home}/webapps/struts-documentation">
  -      <fileset dir="${build.home}/documentation"/>
  -    </copy>
  -    <mkdir   dir="${catalina.home}/webapps/struts-example"/>
  -    <copy  todir="${catalina.home}/webapps/struts-example">
  -      <fileset dir="${build.home}/example"/>
  -    </copy>
  -    <mkdir   dir="${catalina.home}/webapps/struts-template"/>
  -    <copy  todir="${catalina.home}/webapps/struts-template">
  -      <fileset dir="${build.home}/template"/>
  -    </copy>
  -    <mkdir   dir="${catalina.home}/webapps/struts-test"/>
  -    <copy  todir="${catalina.home}/webapps/struts-test">
  -      <fileset dir="${build.home}/test"/>
  -    </copy>
  -  </target>
  -
  -  <!-- DEPLOY:  Deploy these applications on Tomcat -->
  -  <target name="deploy.tomcat" depends="compile.documentation,compile.example,compile.template,compile.upload,compile.test">
  -    <mkdir   dir="${tomcat.home}/webapps/struts-documentation"/>
  -    <copy  todir="${tomcat.home}/webapps/struts-documentation">
  -      <fileset dir="${build.home}/documentation"/>
  -    </copy>
  -    <mkdir   dir="${tomcat.home}/webapps/struts-example"/>
  -    <copy  todir="${tomcat.home}/webapps/struts-example">
  -      <fileset dir="${build.home}/example"/>
  -    </copy>
  -    <mkdir   dir="${tomcat.home}/webapps/struts-template"/>
  -    <copy  todir="${tomcat.home}/webapps/struts-template">
  -      <fileset dir="${build.home}/template"/>
  -    </copy>
  -    <mkdir   dir="${tomcat.home}/webapps/struts-test"/>
  -    <copy  todir="${tomcat.home}/webapps/struts-test">
  -      <fileset dir="${build.home}/test"/>
  -    </copy>
  -  </target>
  -
  -  <!-- UTILITY:  Display all targets intended for developer use -->
  -  <target name="targets">
  -    <echo message=""/>
  -    <echo message="ANT build for ${project.name} ${project.version}"/>
  -    <echo message=""/>
  -    <echo message="The following targets are available:"/>
  -    <echo message="  all                    Cleans and builds library and webapps"/>
  -    <echo message="  clean                  Cleans the build and distribution directories"/>
  -    <echo message="  compile.documentation  Builds the documentation webapp"/>
  -    <echo message="  compile.examples       Builds the examples webapp"/>
  -    <echo message="  compile.javadoc        Builds Javadoc API docs for Struts"/>
  -    <echo message="  compile.library        Builds the main packages"/>
  -    <echo message="  compile.template       Builds the template example webapp"/>
  -    <echo message="  compile.upload         Builds the upload example webapp"/>
  -    <echo message="  compile.test           Builds the tests webapp"/>
  -    <echo message="  deploy.catalina        Deploys build to Catalina build directory"/>
  -    <echo message="  deploy.tomcat          Depoys build to Tomcat build directory"/>
  -    <echo message="  dist                   Builds binary distribution in dist directory"/>
  -    <echo message=""/>
  -    <echo message="Default target is 'compile.library'"/>
  -  </target>
  -
  -  <!-- UTILITY:  Clean up build and distribution directories -->
  -  <target name="clean">
  -    <delete dir="${build.home}"/>
  -    <delete dir="${dist.home}"/>
  -  </target>
  -
  -  <!-- UTILITY:  All-in-one build target -->
  -  <target name="all"
  -       depends="clean,compile.library,compile.documentation,compile.example,compile.test"/>
  -
  -</project>
  +<project name="Struts" default="compile.library" basedir=".">
  +
  +  <!-- Initialization properties -->
  +  <property name="app.name"       value="struts"/>
  +  <property name="build.home"     value="../build/${app.name}"/>
  +  <property name="catalina.home"  value="../build/tomcat-4.0"/>
  +  <property name="debug"          value="true"/>
  +  <property name="deprecation"    value="false"/>
  +  <property name="dist.home"      value="../dist/${app.name}"/>
  +  <property name="optimize"       value="true"/>
  +  <property name="project.name"   value="jakarta-struts"/>
  +  <property name="project.version" value="1.0-dev"/>
  +  <property name="tomcat.home"    value="../build/tomcat"/>
  +
  +  <!-- BUILD:  Create directories and copy files for library -->
  +  <target name="prepare.library">
  +    <mkdir   dir="${build.home}"/>
  +    <mkdir   dir="${build.home}/library"/>
  +    <mkdir   dir="${build.home}/library/classes"/>
  +    <mkdir   dir="${build.home}/library/classes/META-INF"/>
  +    <mkdir   dir="${build.home}/library/classes/META-INF/tlds"/>
  +    <copy   file="src/conf/struts.tld"
  +          tofile="${build.home}/library/classes/META-INF/taglib.tld"/>
  +    <mkdir   dir="${build.home}/library/classes/org"/>
  +    <mkdir   dir="${build.home}/library/classes/org/apache"/>
  +    <mkdir   dir="${build.home}/library/classes/org/apache/struts"/>
  +    <mkdir   dir="${build.home}/library/classes/org/apache/struts/resources"/>
  +    <copy  todir="${build.home}/library/classes/org/apache/struts/resources">
  +      <fileset dir="src/conf" includes="**/*.dtd"/>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD:  Create directories and copy files for documentation app -->
  +  <target name="prepare.documentation">
  +    <mkdir   dir="${build.home}"/>
  +    <mkdir   dir="${build.home}/documentation"/>
  +    <mkdir   dir="${build.home}/documentation/dtds"/>
  +    <copy  todir="${build.home}/documentation/dtds">
  +      <fileset dir="src/conf" includes="**/*.dtd"/>
  +    </copy>
  +    <mkdir   dir="${build.home}/documentation/WEB-INF"/>
  +    <mkdir   dir="${build.home}/documentation/WEB-INF/classes"/>
  +    <mkdir   dir="${build.home}/documentation/WEB-INF/lib"/>
  +    <copy  todir="${build.home}/documentation">
  +      <fileset dir="web/documentation"/>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD:  Create directories and copy files for example application -->
  +  <target name="prepare.example">
  +    <mkdir   dir="${build.home}"/>
  +    <mkdir   dir="${build.home}/example"/>
  +    <mkdir   dir="${build.home}/example/WEB-INF"/>
  +    <mkdir   dir="${build.home}/example/WEB-INF/classes"/>
  +    <mkdir   dir="${build.home}/example/WEB-INF/lib"/>
  +    <copy  todir="${build.home}/example">
  +      <fileset dir="web/example"/>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD:  Create directories and copy files for test application -->
  +  <target name="prepare.test">
  +    <mkdir   dir="${build.home}"/>
  +    <mkdir   dir="${build.home}/test"/>
  +    <mkdir   dir="${build.home}/test/WEB-INF"/>
  +    <mkdir   dir="${build.home}/test/WEB-INF/classes"/>
  +    <mkdir   dir="${build.home}/test/WEB-INF/lib"/>
  +    <copy  todir="${build.home}/test">
  +      <fileset dir="web/test"/>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD:  Create directories and copy files for template example -->
  +  <target name="prepare.template">
  +    <mkdir   dir="${build.home}"/>
  +    <mkdir   dir="${build.home}/template"/>
  +    <mkdir   dir="${build.home}/template/css"/>
  +    <mkdir   dir="${build.home}/template/graphics"/>
  +    <mkdir   dir="${build.home}/template/WEB-INF"/>
  +    <mkdir   dir="${build.home}/template/WEB-INF/lib"/>
  +    <mkdir   dir="${build.home}/template/WEB-INF/tlds"/>
  +    <copy  todir="${build.home}/template">
  +      <fileset dir="web/template-example"/>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD: Create directories and copy files for upload example -->
  +  <target name="prepare.upload">
  +    <mkdir  dir="${build.home}"/>
  +    <mkdir  dir="${build.home}/upload"/>
  +    <mkdir  dir="${build.home}/upload/WEB-INF"/>
  +    <mkdir  dir="${build.home}/upload/WEB-INF/lib"/>
  +    <mkdir  dir="${build.home}/upload/WEB-INF/classes"/>
  +    <copy todir="${build.home}/upload">
  +        <fileset dir="web/upload" />
  +    </copy>
  +  </target>
  +
  +  <!-- DIST:  Create directories and copy files for distribution -->
  +  <target name="prepare.dist">
  +    <mkdir   dir="${dist.home}"/>
  +    <mkdir   dir="${dist.home}/etc"/>
  +    <mkdir   dir="${dist.home}/lib"/>
  +    <mkdir   dir="${dist.home}/src"/>
  +    <mkdir   dir="${dist.home}/web"/>
  +    <mkdir   dir="${dist.home}/webapps"/>
  +  </target>
  +
  +  <!-- BUILD:  Compile library directory components -->
  +  <target name="compile.library" depends="prepare.library">
  +    <javac srcdir="src/share"     destdir="${build.home}/library/classes"
  +           classpath="${servlet.jar}"
  +	   debug="${debug}" optimize="${optimize}"
  +     deprecation="${deprecation}"/>
  +    <copy   todir="${build.home}/library/classes">
  +      <fileset dir="src/share" includes="**/*.properties"/>
  +    </copy>
  +    <copy   todir="${build.home}/library">
  +      <fileset dir="src/conf" includes="*.dtd"/>
  +      <fileset dir="src/conf" includes="*.tld"/>
  +    </copy>
  +    <style basedir="src/doc" destdir="${build.home}/library"
  +         extension=".tld" style="stylesheets/tld.xsl"
  +          includes="struts-*.xml"/>
  +    <copy    todir="${build.home}/library/classes/META-INF/tlds">
  +      <fileset dir="${build.home}/library" includes="struts-*.tld"/>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD:  Compile documentation application components -->
  +  <target name="compile.documentation"
  +       depends="dist.library,prepare.documentation">
  +
  +    <!-- Compile beans and tags required by the documentation app -->
  +<!--
  +    <javac srcdir="src/documentation"
  +          destdir="${build.home}/documentation/WEB-INF/classes"
  +        classpath="${build.home}/library/classes:${servlet.jar}"
  +            debug="${debug}" optimize="${optimize}"
  +      deprecation="${deprecation}"/>
  +-->
  +
  +    <!-- Copy Struts JAR file and TLDs to the documentation app -->
  +    <copy    file="${dist.home}/lib/${app.name}.jar"
  +           tofile="${build.home}/documentation/WEB-INF/lib/${app.name}.jar"/>
  +    <copy   todir="${build.home}/documentation/WEB-INF">
  +      <fileset dir="${dist.home}/lib" includes="*.tld"/>
  +    </copy>
  +
  +    <!-- Copy static documentation content -->
  +    <copy    file="TODO" tofile="${build.home}/documentation/todo.txt"/>
  +    <copy   todir="${build.home}/documentation">
  +      <fileset dir="web/documentation"/>
  +    </copy>
  +
  +    <!-- Create dynamically generated documentation -->
  +    <style   basedir="src/doc" destdir="${build.home}/documentation"
  +           extension=".html" style="stylesheets/struts.xsl" includes="*.xml"/>
  +    <copy      todir="${build.home}/documentation">
  +      <fileset   dir="src/doc">
  +        <include name="**/*.css"/>
  +        <include name="**/*.gif"/>
  +        <include name="**/*.html"/>
  +        <include name="**/*.jpg"/>
  +        <include name="**/*.js"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD:  Compile example application components -->
  +  <target name="compile.example"
  +       depends="dist.library,prepare.example">
  +    <javac srcdir="src/example"
  +          destdir="${build.home}/example/WEB-INF/classes"
  +        classpath="${build.home}/library/classes:${servlet.jar}"
  +            debug="${debug}" optimize="${optimize}"
  +      deprecation="${deprecation}"/>
  +    <copy   todir="${build.home}/example/WEB-INF/classes">
  +      <fileset dir="src/example" includes="**/*.properties"/>
  +    </copy>
  +    <copy   todir="${build.home}/example">
  +      <fileset dir="web/example"/>
  +    </copy>
  +    <copy    file="${dist.home}/lib/${app.name}.jar"
  +           tofile="${build.home}/example/WEB-INF/lib/${app.name}.jar"/>
  +    <copy   todir="${build.home}/example/WEB-INF">
  +      <fileset dir="${dist.home}/lib" includes="*.tld"/>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD:  Compile template example application components -->
  +  <target name="compile.template"
  +       depends="dist.library,prepare.template">
  +    <copy   todir="${build.home}/template">
  +      <fileset dir="web/template-example"/>
  +    </copy>
  +    <copy    file="${dist.home}/lib/${app.name}.jar"
  +           tofile="${build.home}/template/WEB-INF/lib/${app.name}.jar"/>
  +    <copy   todir="${build.home}/template/WEB-INF/tlds">
  +      <fileset dir="${dist.home}/lib" includes="*.tld"/>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD: Compile upload example application components -->
  +  <target name="compile.upload"
  +          depends="dist.library,prepare.upload">
  +
  +      <javac srcdir="web/upload"
  +             destdir="${build.home}/upload/WEB-INF/classes"
  +             classpath="${build.home}/library/classes:${servlet.jar}"
  +             debug="${debug}" optimize="${optimize}"
  +       deprecation="${deprecation}"/>
  +      <copy todir="${build.home}/upload">
  +        <fileset dir="web/upload" />
  +      </copy>
  +      <copy file="${dist.home}/lib/${app.name}.jar"
  +            tofile="${build.home}/upload/WEB-INF/lib/${app.name}.jar"/>
  +      <copy file="${dist.home}/lib/${app.name}-html.tld"
  +            todir="${build.home}/upload/WEB-INF" />
  +  </target>
  +
  +  <!-- BUILD:  Compile test application components -->
  +  <target name="compile.test"
  +       depends="dist.library,prepare.test">
  +    <javac srcdir="src/test"
  +          destdir="${build.home}/test/WEB-INF/classes"
  +        classpath="${build.home}/library/classes:${servlet.jar}"
  +            debug="${debug}" optimize="${optimize}"
  +      deprecation="${deprecation}"/>
  +    <copy  todir="${build.home}/test/WEB-INF/classes">
  +      <fileset dir="src/test" includes="**/*.properties"/>
  +    </copy>
  +    <copy   todir="${build.home}/test">
  +      <fileset dir="web/test"/>
  +    </copy>
  +    <copy    file="${dist.home}/lib/${app.name}.jar"
  +           tofile="${build.home}/test/WEB-INF/lib/${app.name}.jar"/>
  +    <copy   todir="${build.home}/test/WEB-INF">
  +      <fileset dir="${dist.home}/lib" includes="*.tld"/>
  +    </copy>
  +  </target>
  +
  +  <!-- BUILD:  Create Javadoc documentation -->
  +  <target name="compile.javadoc">
  +    <delete   dir="${build.home}/documentation/api"/>
  +    <mkdir    dir="${build.home}/documentation/api"/>
  +    <javadoc sourcepath="src/share"
  +                destdir="${build.home}/documentation/api"
  +           packagenames="org.apache.struts.*"
  +	         author="true"
  +                private="true"
  +                version="true"
  +            windowtitle="Apache Struts API Documentation"
  +               doctitle="&lt;h1&gt;Apache Struts Framework&lt;/h1&gt;"
  +                 bottom="Copyright &#169; 2000 - Apache Software Foundation"/>
  +  </target>
  +
  +  <!-- DIST:  Construct library distributables -->
  +  <target name="dist.library" depends="prepare.dist,compile.library">
  +    <copy   todir="${dist.home}/lib">
  +      <fileset dir="${build.home}/library" includes="*.dtd"/>
  +      <fileset dir="${build.home}/library" includes="*.tld"/>
  +    </copy>
  +    <jar  jarfile="${dist.home}/lib/${app.name}.jar"
  +         manifest="src/conf/MANIFEST.MF"
  +          basedir="${build.home}/library/classes" includes="**"/>
  +  </target>
  +
  +  <!-- DIST:  Construct documentation distributables -->
  +  <target name="dist.documentation"
  +       depends="dist.library,compile.documentation,compile.javadoc">
  +    <jar  jarfile="${dist.home}/webapps/${app.name}-documentation.war"
  +          basedir="${build.home}/documentation" includes="**"/>
  +  </target>
  +
  +  <!-- DIST:  Construct example distributables -->
  +  <target name="dist.example" depends="dist.library,compile.example">
  +    <jar  jarfile="${dist.home}/webapps/${app.name}-example.war"
  +          basedir="${build.home}/example" includes="**"/>
  +  </target>
  +
  +  <!-- DIST:  Construct template example distributables -->
  +  <target name="dist.template" depends="dist.library,compile.template">
  +    <jar  jarfile="${dist.home}/webapps/${app.name}-template.war"
  +          basedir="${build.home}/template" includes="**"/>
  +  </target>
  +
  +  <!-- DIST:  Construct upload example distributables -->
  +  <target name="dist.upload" depends="dist.library,compile.upload">
  +    <jar jarfile="${dist.home}/webapps/${app.name}-upload.war"
  +         basedir="${build.home}/upload" includes="**"/>
  +  </target>
  +
  +  <!-- DIST:  Construct test distributables -->
  +  <target name="dist.test" depends="dist.library,compile.test">
  +    <jar  jarfile="${dist.home}/webapps/${app.name}-test.war"
  +          basedir="${build.home}/test" includes="**"/>
  +  </target>
  +
  +  <!-- DIST:  Copy sources -->
  +  <target name="dist.source" depends="prepare.dist">
  +    <copy   todir="${dist.home}/etc">
  +      <fileset dir="." includes="build.*"/>
  +    </copy>
  +    <copy    file="INSTALL" tofile="${dist.home}/INSTALL"/>
  +    <copy    file="LICENSE" tofile="${dist.home}/LICENSE"/>
  +    <copy    file="README"  tofile="${dist.home}/README"/>
  +    <copy    file="TODO"    tofile="${dist.home}/TODO"/>
  +    <copy   todir="${dist.home}/src">
  +      <fileset dir="src"/>
  +    </copy>
  +    <copy   todir="${dist.home}/web">
  +      <fileset dir="web"/>
  +    </copy>
  +  </target>
  +
  +  <!-- DIST:  Construct complete release distribution -->
  +  <target name="dist"
  +       depends="dist.library,dist.documentation,dist.example,dist.template,dist.upload,dist.test,dist.source"/>
  +
  +  <!-- DEPLOY:  Deploy these applications on Catalina -->
  +  <target name="deploy.catalina" depends="compile.documentation,compile.example,compile.template,compile.upload,compile.test">
  +    <mkdir   dir="${catalina.home}/webapps/struts-documentation"/>
  +    <copy  todir="${catalina.home}/webapps/struts-documentation">
  +      <fileset dir="${build.home}/documentation"/>
  +    </copy>
  +    <mkdir   dir="${catalina.home}/webapps/struts-example"/>
  +    <copy  todir="${catalina.home}/webapps/struts-example">
  +      <fileset dir="${build.home}/example"/>
  +    </copy>
  +    <mkdir   dir="${catalina.home}/webapps/struts-template"/>
  +    <copy  todir="${catalina.home}/webapps/struts-template">
  +      <fileset dir="${build.home}/template"/>
  +    </copy>
  +    <mkdir   dir="${catalina.home}/webapps/struts-test"/>
  +    <copy  todir="${catalina.home}/webapps/struts-test">
  +      <fileset dir="${build.home}/test"/>
  +    </copy>
  +  </target>
  +
  +  <!-- DEPLOY:  Deploy these applications on Tomcat -->
  +  <target name="deploy.tomcat" depends="compile.documentation,compile.example,compile.template,compile.upload,compile.test">
  +    <mkdir   dir="${tomcat.home}/webapps/struts-documentation"/>
  +    <copy  todir="${tomcat.home}/webapps/struts-documentation">
  +      <fileset dir="${build.home}/documentation"/>
  +    </copy>
  +    <mkdir   dir="${tomcat.home}/webapps/struts-example"/>
  +    <copy  todir="${tomcat.home}/webapps/struts-example">
  +      <fileset dir="${build.home}/example"/>
  +    </copy>
  +    <mkdir   dir="${tomcat.home}/webapps/struts-template"/>
  +    <copy  todir="${tomcat.home}/webapps/struts-template">
  +      <fileset dir="${build.home}/template"/>
  +    </copy>
  +    <mkdir   dir="${tomcat.home}/webapps/struts-test"/>
  +    <copy  todir="${tomcat.home}/webapps/struts-test">
  +      <fileset dir="${build.home}/test"/>
  +    </copy>
  +  </target>
  +
  +  <!-- UTILITY:  Display all targets intended for developer use -->
  +  <target name="targets">
  +    <echo message=""/>
  +    <echo message="ANT build for ${project.name} ${project.version}"/>
  +    <echo message=""/>
  +    <echo message="The following targets are available:"/>
  +    <echo message="  all                    Cleans and builds library and webapps"/>
  +    <echo message="  clean                  Cleans the build and distribution directories"/>
  +    <echo message="  compile.documentation  Builds the documentation webapp"/>
  +    <echo message="  compile.examples       Builds the examples webapp"/>
  +    <echo message="  compile.javadoc        Builds Javadoc API docs for Struts"/>
  +    <echo message="  compile.library        Builds the main packages"/>
  +    <echo message="  compile.template       Builds the template example webapp"/>
  +    <echo message="  compile.upload         Builds the upload example webapp"/>
  +    <echo message="  compile.test           Builds the tests webapp"/>
  +    <echo message="  deploy.catalina        Deploys build to Catalina build directory"/>
  +    <echo message="  deploy.tomcat          Depoys build to Tomcat build directory"/>
  +    <echo message="  dist                   Builds binary distribution in dist directory"/>
  +    <echo message=""/>
  +    <echo message="Default target is 'compile.library'"/>
  +  </target>
  +
  +  <!-- UTILITY:  Clean up build and distribution directories -->
  +  <target name="clean">
  +    <delete dir="${build.home}"/>
  +    <delete dir="${dist.home}"/>
  +  </target>
  +
  +  <!-- UTILITY:  All-in-one build target -->
  +  <target name="all"
  +       depends="clean,compile.library,compile.documentation,compile.example,compile.test"/>
  +
  +</project>
  
  
  
  1.12      +6 -6      jakarta-struts/web/example/index.jsp
  
  Index: index.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/index.jsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- index.jsp	2000/12/27 02:29:25	1.11
  +++ index.jsp	2001/01/07 00:16:28	1.12
  @@ -1,12 +1,12 @@
   <%@ page language="java" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  -<%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
  +<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
   
  -<form:html locale="true">
  +<html:html locale="true">
   <head>
   <title><bean:message key="index.title"/></title>
  -<form:base/>
  +<html:base/>
   </head>
   <body bgcolor="white">
   
  @@ -27,9 +27,9 @@
   
   <h3><bean:message key="index.heading"/></h3>
   <ul>
  -<li><form:link page="/editRegistration.do?action=Create"><bean:message key="index.registration"/></form:link></li>
  -<li><form:link page="/logon.jsp"><bean:message key="index.logon"/></form:link></li>
  +<li><html:link page="/editRegistration.do?action=Create"><bean:message key="index.registration"/></html:link></li>
  +<li><html:link page="/logon.jsp"><bean:message key="index.logon"/></html:link></li>
   </ul>
   
   </body>
  -</form:html>
  +</html:html>
  
  
  
  1.13      +10 -10    jakarta-struts/web/example/logon.jsp
  
  Index: logon.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/logon.jsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- logon.jsp	2000/12/27 02:29:25	1.12
  +++ logon.jsp	2001/01/07 00:16:28	1.13
  @@ -1,18 +1,18 @@
   <%@ page language="java" %>
   <%@ taglib uri="/WEB-INF/struts.tld" prefix="struts" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  -<%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
  +<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   
  -<form:html locale="true">
  +<html:html locale="true">
   <head>
   <title><bean:message key="logon.title"/></title>
  -<form:base/>
  +<html:base/>
   </head>
   <body bgcolor="white">
   
   <struts:errors/>
   
  -<form:form action="logon.do" focus="username">
  +<html:form action="logon.do" focus="username">
   <table border="0" width="100%">
   
     <tr>
  @@ -20,7 +20,7 @@
         <bean:message key="prompt.username"/>
       </th>
       <td align="left">
  -      <form:text property="username" size="16" maxlength="16"/>
  +      <html:text property="username" size="16" maxlength="16"/>
       </td>
     </tr>
   
  @@ -29,22 +29,22 @@
         <bean:message key="prompt.password"/>
       </th>
       <td align="left">
  -      <form:password property="password" size="16" maxlength="16"/>
  +      <html:password property="password" size="16" maxlength="16"/>
       </td>
     </tr>
   
     <tr>
       <td align="right">
  -      <form:submit property="submit" value="Submit"/>
  +      <html:submit property="submit" value="Submit"/>
       </td>
       <td align="left">
  -      <form:reset/>
  +      <html:reset/>
       </td>
     </tr>
   
   </table>
   
  -</form:form>
  +</html:form>
   
   </body>
  -</form:html>
  +</html:html>
  
  
  
  1.11      +6 -6      jakarta-struts/web/example/mainMenu.jsp
  
  Index: mainMenu.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/mainMenu.jsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mainMenu.jsp	2000/11/22 20:08:22	1.10
  +++ mainMenu.jsp	2001/01/07 00:16:28	1.11
  @@ -1,23 +1,23 @@
   <%@ page language="java" %>
   <%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  -<%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
  +<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <app:checkLogon/>
   <jsp:useBean id="user" scope="session" type="org.apache.struts.example.User"/>
   
  -<form:html>
  +<html:html>
   <head>
   <title><bean:message key="mainMenu.title"/></title>
  -<form:base/>
  +<html:base/>
   </head>
   <body bgcolor="white">
   
   <h3><bean:message key="mainMenu.heading"/>
   <jsp:getProperty name="user" property="username"/></h3>
   <ul>
  -<li><form:link page="/editRegistration.do?action=Edit"><bean:message key="mainMenu.registration"/></form:link></li>
  -<li><form:link page="/logoff.do"><bean:message key="mainMenu.logoff"/></form:link></li>
  +<li><html:link page="/editRegistration.do?action=Edit"><bean:message key="mainMenu.registration"/></html:link></li>
  +<li><html:link page="/logoff.do"><bean:message key="mainMenu.logoff"/></html:link></li>
   </ul>
   
   </body>
  -</form:html>
  +</html:html>
  
  
  
  1.16      +21 -21    jakarta-struts/web/example/registration.jsp
  
  Index: registration.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/registration.jsp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- registration.jsp	2000/12/08 04:34:04	1.15
  +++ registration.jsp	2001/01/07 00:16:28	1.16
  @@ -1,14 +1,14 @@
   <%@ page language="java" %>
   <%@ taglib uri="/WEB-INF/app.tld"    prefix="app" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  -<%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
  +<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
   <logic:equal name="registrationForm" property="action"
               scope="request" value="Edit">
     <app:checkLogon/>
   </logic:equal>
   
  -<form:html>
  +<html:html>
   <head>
   <logic:equal name="registrationForm" property="action"
               scope="request" value="Create">
  @@ -18,14 +18,14 @@
               scope="request" value="Edit">
     <title><bean:message key="registration.title.edit"/></title>
   </logic:equal>
  -<form:base/>
  +<html:base/>
   </head>
   <body bgcolor="white">
   
  -<form:errors/>
  +<html:errors/>
   
  -<form:form action="saveRegistration.do">
  -<form:hidden property="action"/>
  +<html:form action="saveRegistration.do">
  +<html:hidden property="action"/>
   <table border="0" width="100%">
   
     <tr>
  @@ -35,13 +35,13 @@
       <td align="left">
         <logic:equal name="registrationForm" property="action"
                     scope="request" value="Create">
  -        <form:text property="username" size="16" maxlength="16"/>
  +        <html:text property="username" size="16" maxlength="16"/>
         </logic:equal>
         <logic:equal name="registrationForm" property="action"
                     scope="request" value="Edit">
           <bean:write name="registrationForm" property="username"
                      scope="request" filter="true"/>
  -	<form:hidden property="username"/>
  +	<html:hidden property="username"/>
         </logic:equal>
       </td>
     </tr>
  @@ -51,7 +51,7 @@
         <bean:message key="prompt.password"/>
       </th>
       <td align="left">
  -      <form:password property="password" size="16" maxlength="16"/>
  +      <html:password property="password" size="16" maxlength="16"/>
       </td>
     </tr>
   
  @@ -60,7 +60,7 @@
         <bean:message key="prompt.password2"/>
       </th>
       <td align="left">
  -      <form:password property="password2" size="16" maxlength="16"/>
  +      <html:password property="password2" size="16" maxlength="16"/>
       </td>
     </tr>
   
  @@ -69,7 +69,7 @@
         <bean:message key="prompt.fullName"/>
       </th>
       <td align="left">
  -      <form:text property="fullName" size="50"/>
  +      <html:text property="fullName" size="50"/>
       </td>
     </tr>
   
  @@ -78,7 +78,7 @@
         <bean:message key="prompt.fromAddress"/>
       </th>
       <td align="left">
  -      <form:text property="fromAddress" size="50"/>
  +      <html:text property="fromAddress" size="50"/>
       </td>
     </tr>
   
  @@ -87,29 +87,29 @@
         <bean:message key="prompt.replyToAddress"/>
       </th>
       <td align="left">
  -      <form:text property="replyToAddress" size="50"/>
  +      <html:text property="replyToAddress" size="50"/>
       </td>
     </tr>
   
     <tr>
       <td align="right">
  -      <form:submit>
  +      <html:submit>
           <bean:message key="button.save"/>
  -      </form:submit>
  +      </html:submit>
       </td>
       <td align="left">
  -      <form:reset>
  +      <html:reset>
           <bean:message key="button.reset"/>
  -      </form:reset>
  +      </html:reset>
         &nbsp;
  -      <form:cancel>
  +      <html:cancel>
           <bean:message key="button.cancel"/>
  -      </form:cancel>
  +      </html:cancel>
       </td>
     </tr>
   
   </table>
  -</form:form>
  +</html:form>
   
   <logic:equal name="registrationForm" property="action"
               scope="request" value="Edit">
  @@ -172,4 +172,4 @@
   </logic:equal>
   
   </body>
  -</form:html>
  +</html:html>
  
  
  
  1.21      +25 -25    jakarta-struts/web/example/subscription.jsp
  
  Index: subscription.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/subscription.jsp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- subscription.jsp	2000/12/08 04:34:04	1.20
  +++ subscription.jsp	2001/01/07 00:16:29	1.21
  @@ -1,7 +1,7 @@
   <%@ page language="java" %>
   <%@ taglib uri="/WEB-INF/app.tld"    prefix="app" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  -<%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
  +<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
   <app:checkLogon/>
   
  @@ -13,7 +13,7 @@
     pageContext.setAttribute("serverTypes", list);
   %>
   
  -<form:html>
  +<html:html>
   <head>
   <logic:equal name="subscriptionForm" property="action"
               scope="request" value="Create">
  @@ -27,14 +27,14 @@
               scope="request" value="Edit">
     <title><bean:message key="subscription.title.edit"/></title>
   </logic:equal>
  -<form:base/>
  +<html:base/>
   </head>
   <body bgcolor="white">
   
  -<form:errors/>
  +<html:errors/>
   
  -<form:form action="saveSubscription.do" focus="host">
  -<form:hidden property="action"/>
  +<html:form action="saveSubscription.do" focus="host">
  +<html:hidden property="action"/>
   <table border="0" width="100%">
   
     <tr>
  @@ -51,7 +51,7 @@
         <bean:message key="prompt.mailHostname"/>
       </th>
       <td align="left">
  -      <form:textarea property="host" cols="50" rows="1"/>
  +      <html:textarea property="host" cols="50" rows="1"/>
       </td>
     </tr>
   
  @@ -60,7 +60,7 @@
         <bean:message key="prompt.mailUsername"/>
       </th>
       <td align="left">
  -      <form:text property="username" size="50"/>
  +      <html:text property="username" size="50"/>
       </td>
     </tr>
   
  @@ -69,7 +69,7 @@
         <bean:message key="prompt.mailPassword"/>
       </th>
       <td align="left">
  -      <form:password property="password" size="50"/>
  +      <html:password property="password" size="50"/>
       </td>
     </tr>
   
  @@ -78,10 +78,10 @@
         <bean:message key="prompt.mailServerType"/>
       </th>
       <td align="left">
  -      <form:select property="type">
  -        <form:options collection="serverTypes" property="value"
  +      <html:select property="type">
  +        <html:options collection="serverTypes" property="value"
                      labelProperty="label"/>
  -      </form:select>
  +      </html:select>
       </td>
     </tr>
   
  @@ -90,7 +90,7 @@
         <bean:message key="prompt.autoConnect"/>
       </th>
       <td align="left">
  -      <form:checkbox property="autoConnect"/>
  +      <html:checkbox property="autoConnect"/>
       </td>
     </tr>
   
  @@ -98,40 +98,40 @@
       <td align="right">
         <logic:equal name="subscriptionForm" property="action"
                     scope="request" value="Create">
  -        <form:submit>
  +        <html:submit>
             <bean:message key="button.save"/>
  -        </form:submit>
  +        </html:submit>
         </logic:equal>
         <logic:equal name="subscriptionForm" property="action"
                     scope="request" value="Delete">
  -        <form:submit>
  +        <html:submit>
             <bean:message key="button.confirm"/>
  -        </form:submit>
  +        </html:submit>
         </logic:equal>
         <logic:equal name="subscriptionForm" property="action"
                     scope="request" value="Edit">
  -        <form:submit>
  +        <html:submit>
             <bean:message key="button.save"/>
  -        </form:submit>
  +        </html:submit>
         </logic:equal>
       </td>
       <td align="left">
         <logic:notEqual name="subscriptionForm" property="action"
                        scope="request" value="Delete">
  -        <form:reset>
  +        <html:reset>
             <bean:message key="button.reset"/>
  -        </form:reset>
  +        </html:reset>
         </logic:notEqual>
         &nbsp;
  -      <form:cancel>
  +      <html:cancel>
           <bean:message key="button.cancel"/>
  -      </form:cancel>
  +      </html:cancel>
       </td>
     </tr>
   
   </table>
   
  -</form:form>
  +</html:form>
   
   </body>
  -</form:html>
  +</html:html>
  
  
  
  1.10      +2 -2      jakarta-struts/web/example/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/web.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- web.xml	2000/11/04 00:51:20	1.9
  +++ web.xml	2001/01/07 00:16:29	1.10
  @@ -72,8 +72,8 @@
     </taglib>
   
     <taglib>
  -    <taglib-uri>/WEB-INF/struts-form.tld</taglib-uri>
  -    <taglib-location>/WEB-INF/struts-form.tld</taglib-location>
  +    <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
  +    <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
     </taglib>
   
     <taglib>
  
  
  
  1.2       +22 -22    jakarta-struts/web/upload/upload.jsp
  
  Index: upload.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/upload/upload.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- upload.jsp	2000/12/19 19:23:05	1.1
  +++ upload.jsp	2001/01/07 00:16:29	1.2
  @@ -1,22 +1,22 @@
  -<%@ page language="java" %>
  -
  -<%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
  -
  -<!--
  -	The most important part is to declare your form's enctype to be "multipart/form-data",
  -	and to have a form:file element that maps to your ActionForm's FormFile property
  --->
  -  
  -  
  -<form:form action="upload.do" enctype="multipart/form-data">
  -
  -	Please enter some text, just to demonstrate the handling of text elements as opposed to file elements:<br />
  -	<form:text property="theText" /><br /><br />
  -	
  -	Please select the file that you would like to upload:<br />
  -	<form:file property="theFile" /><br /><br />
  -	
  -	<form:submit />
  -
  -
  -</form:form>
  \ No newline at end of file
  +<%@ page language="java" %>
  +
  +<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  +
  +<!--
  +	The most important part is to declare your form's enctype to be "multipart/form-data",
  +	and to have a form:file element that maps to your ActionForm's FormFile property
  +-->
  +  
  +  
  +<html:form action="upload.do" enctype="multipart/form-data">
  +
  +	Please enter some text, just to demonstrate the handling of text elements as opposed to file elements:<br />
  +	<html:text property="theText" /><br /><br />
  +	
  +	Please select the file that you would like to upload:<br />
  +	<html:file property="theFile" /><br /><br />
  +	
  +	<html:submit />
  +
  +
  +</html:form>
  \ No newline at end of file
  
  
  
  1.2       +52 -52    jakarta-struts/web/upload/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/upload/WEB-INF/web.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web.xml	2000/12/19 19:23:06	1.1
  +++ web.xml	2001/01/07 00:16:29	1.2
  @@ -1,52 +1,52 @@
  -<?xml version="1.0" encoding="ISO-8859-1"?>
  -
  -<!DOCTYPE web-app
  -  PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
  -  "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
  -
  -<web-app>
  -
  -
  -  <!-- Action Servlet Configuration -->
  -  <servlet>
  -    <servlet-name>action</servlet-name>
  -    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
  -    <init-param>
  -      <param-name>config</param-name>
  -      <param-value>/WEB-INF/struts-config.xml</param-value>
  -    </init-param>
  -    <init-param>
  -      <param-name>debug</param-name>
  -      <param-value>2</param-value>
  -    </init-param>
  -    <init-param>
  -      <param-name>detail</param-name>
  -      <param-value>2</param-value>
  -    </init-param>
  -    <init-param>
  -      <param-name>validate</param-name>
  -      <param-value>true</param-value>
  -    </init-param>
  -    <load-on-startup>1</load-on-startup>
  -  </servlet>
  -
  -
  -  <!-- Action Servlet Mapping -->
  -  <servlet-mapping>
  -    <servlet-name>action</servlet-name>
  -    <url-pattern>*.do</url-pattern>
  -  </servlet-mapping>
  -
  -
  -  <!-- The Welcome File List -->
  -  <welcome-file-list>
  -    <welcome-file>upload.jsp</welcome-file>
  -  </welcome-file-list>
  -
  -  
  -  <taglib>
  -    <taglib-uri>/WEB-INF/struts-form.tld</taglib-uri>
  -    <taglib-location>/WEB-INF/struts-form.tld</taglib-location>
  -  </taglib>
  -  
  -</web-app>
  +<?xml version="1.0" encoding="ISO-8859-1"?>
  +
  +<!DOCTYPE web-app
  +  PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
  +  "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
  +
  +<web-app>
  +
  +
  +  <!-- Action Servlet Configuration -->
  +  <servlet>
  +    <servlet-name>action</servlet-name>
  +    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
  +    <init-param>
  +      <param-name>config</param-name>
  +      <param-value>/WEB-INF/struts-config.xml</param-value>
  +    </init-param>
  +    <init-param>
  +      <param-name>debug</param-name>
  +      <param-value>2</param-value>
  +    </init-param>
  +    <init-param>
  +      <param-name>detail</param-name>
  +      <param-value>2</param-value>
  +    </init-param>
  +    <init-param>
  +      <param-name>validate</param-name>
  +      <param-value>true</param-value>
  +    </init-param>
  +    <load-on-startup>1</load-on-startup>
  +  </servlet>
  +
  +
  +  <!-- Action Servlet Mapping -->
  +  <servlet-mapping>
  +    <servlet-name>action</servlet-name>
  +    <url-pattern>*.do</url-pattern>
  +  </servlet-mapping>
  +
  +
  +  <!-- The Welcome File List -->
  +  <welcome-file-list>
  +    <welcome-file>upload.jsp</welcome-file>
  +  </welcome-file-list>
  +
  +  
  +  <taglib>
  +    <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
  +    <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
  +  </taglib>
  +  
  +</web-app>