diff -Nurb contrib.orig/wml/build-webapp.xml contrib/wml/build-webapp.xml
--- contrib.orig/wml/build-webapp.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/build-webapp.xml	2003-02-04 12:02:41.000000000 -0500
@@ -0,0 +1,355 @@
+<project name="Generic Webapp" default="compile" basedir=".">
+
+<!--
+        This is a generic build.xml file for Ant that can be used to develop
+        any web application that conforms to the following requirements:
+
+        - Web sources appear in the directory specified by the "webapp.web"
+          property, in exactly the hierarchy to be present in the created
+          web application archive.
+
+        - Java sources (if any) appear in the directory specified by the
+          "webapp.src" property, which will be compiled into the
+          "WEB-INF/classes" directory of the resulting web application.
+
+        - You must specify a "servlet.jar" property that defines the path
+          of the servlet API classes you will compile against.
+
+        - If you want to copy Struts libraries and TLD files to your web
+          application, set the "struts.libs" property to the pathname of a
+          directory containing struts.jar and the associated *.tld files.
+
+        - If you want to copy additional JAR files into the WEB-INF/lib
+          directory of your web app, set the "webapp.libs" property to the
+          pathname of a directory containing the JAR files to be copied.
+
+-->
+
+
+<!-- ========== Prerequisite Properties =================================== -->
+
+<!--
+        These properties MUST be set on the "ant" command line, the "antrc"
+        properties file in your home directory, or from settings in a superior
+        build.xml script, if you wish to take advantage of the corresponding
+        functionality.
+
+        compile.classpath             The class path containing external
+                                      JAR files and directories required for
+                                      compiling this web application.  Note
+                                      that struts.jar will automatically be
+                                      added if "struts.lib" is defined, and
+                                      dependent JAR files will be added if
+                                      "webapp.libs" is defined.
+
+        build.home                    Base directory into which we are building
+                                      the Struts components.
+
+        commons-beanutils.jar         (required).  The path to the JAR file
+                                      of the Jakarta Commons Beanutils
+                                      package (version 1.0 or later).
+
+        commons-collections.jar       (required).  The path to the JAR file
+                                      of the Jakarta Commons Collections
+                                      package (version 1.0 or later).
+
+        commons-dbcp.jar              (required).  The path to the JAR file
+                                      of the Jakarta Commons DBCP
+                                      package (version 1.0 or later).
+
+        commons-digester.jar          (required).  The path to the JAR file
+                                      of the Jakarta Commons Digester
+                                      package (version 1.0 or later).
+
+        commons-fileupload.jar        (required).  The path to the JAR file
+                                      of the Jakarta Commons FileUpload
+                                      package (version 1.0 or later)
+
+        commons-lang.jar              (required).  The path to the JAR file
+                                      of the Jakarta Commons Lang
+                                      package (version 1.0 or later).
+
+        commons-logging.jar           (required).  The path to the JAR file
+                                      of the Jakarta Commons Logging
+                                      package (version 1.0 or later).
+
+        commons-pool.jar              (required).  The path to the JAR file
+                                      of the Jakarta Commons POOL
+                                      package (version 1.0 or later).
+
+        commons-resources.jar         (required).  The path to the JAR file
+                                      of the Jakarta Commons Resources
+                                      package (version 1.0 or later).
+
+        commons-validator.jar         (required).  The path to the JAR file
+                                      of the Jakarta Commons VALIDATOR
+                                      package (version 1.0 or later).
+
+        servlet.jar                   MUST be set to the pathname of the
+                                      servlet API classes you wish to
+                                      compile against.
+
+        struts.libs                   If specified, must be the pathname of a
+                                      directory from which "struts.jar" will be
+                                      copied to your WEB-INF/lib directory, and
+                                      from which all TLD files will be copied
+                                      to your WEB-INF directory.  Also, the
+                                      struts.jar file will automatically be
+                                      added to your compile classpath.
+
+        webapp.libs                   If specified, must be the pathname of a
+                                      directory from which all available
+                                      "*.jar" files are copied to the web
+                                      application's WEB-INF/lib directory.
+                                      Also, any JAR files found here will
+                                      automatically be added to your compile
+                                      classpath.
+
+        webapp.name                   MUST be set to the base name of the web
+                                      application archive file that will be
+                                      created for this web application.
+
+        webapp.suppress               Set this property to an arbitrary value
+                                      (such as "true") if you do NOT want the
+                                      source code for your web application
+                                      copied to the WEB-INF/src directory.
+
+        webapp.war                    If specified, overrides the default name
+                                      of the web application archive file to be
+                                      created for this webapp.  Default value
+                                      is "struts-${webapp.name}.war".
+
+-->
+
+<property name="build.home"            value="target" />
+<property name="servlet.jar"          value="../jakarta-servletapi/lib/servlet.jar"/>
+
+
+
+<!-- ========== Initialization Properties ================================= -->
+
+
+<!--
+        These property values may optionally be overridden with property
+        settings from an "ant" command line, the "antrc" properties file
+        in your home directory, or from settings in a superior build.xml
+        script.
+-->
+
+
+
+<!-- Should Java compilations set the debug compiler option? -->
+<property name="compile.debug"         value="true" />
+
+<!-- Should Java compilations set the deprecation compiler option? -->
+<property name="compile.deprecation"   value="false" />
+
+<!-- Should Java compilations set the optimize compiler option? -->
+<property name="compile.optimize"      value="true" />
+
+<!-- The base directory for distribution targets -->
+<property name="dist.home"             value="dist" />
+
+<!-- The source directory for Java compilations related to this webapp -->
+<property name="webapp.src"            value="src/${webapp.name}" />
+
+<!-- The version number of this particular web application -->
+<property name="webapp.version"        value="1.0" />
+
+<!-- The name of the web application archive file to be produced -->
+<property name="webapp.war"            value="${webapp.name}.war" />
+
+<!-- The source directory for copying static web resources and files -->
+<property name="webapp.web"            value="web/${webapp.name}" />
+
+
+<!-- ========== Derived Properties ======================================== -->
+
+
+<!--
+        These property values are derived from values defined above, and
+        generally should NOT be overridden by command line settings
+-->
+
+<!-- The target directory for building the packed web application -->
+<property name="webapp.dist"           value="${dist.home}/webapps" />
+
+<!-- The target directory for building the unpacked web application -->
+<property name="webapp.target"         value="${build.home}/${webapp.name}" />
+
+<!-- The class path used for compiling this library -->
+<path id="classpath">
+  <pathelement location="${commons-beanutils.jar}"/>
+  <pathelement location="${commons-collections.jar}"/>
+  <pathelement location="${commons-dbcp.jar}"/>
+  <pathelement location="${commons-digester.jar}"/>
+  <pathelement location="${commons-fileupload.jar}"/>
+  <pathelement location="${commons-lang.jar}"/>
+  <pathelement location="${commons-logging.jar}"/>
+  <pathelement location="${commons-pool.jar}"/>
+  <pathelement location="${commons-resources.jar}"/>
+  <pathelement location="${commons-validator.jar}"/>
+  <pathelement location="${jdbc20ext.jar}"/>
+  <pathelement location="${servlet.jar}"/>
+  <pathelement location="${struts.libs}/struts.jar"/>
+  <pathelement location="${struts.libs}/struts-wml.jar"/>
+  <pathelement location="${webapp.libs}"/>
+  <pathelement path="${compile.classpath}"/>
+</path>
+
+
+<!-- ========== Executable Targets ======================================== -->
+
+
+<!--
+        The "init" target evaluates "available" expressions as necessary
+        to modify the behavior of this script.
+-->
+<target name="init">
+
+  <echo    message="Processing webapp ${webapp.name}"/>
+
+  <!-- Do we need to copy dependent libraries? -->
+  <available property="copy.libs"        file="${webapp.libs}" />
+
+  <!-- Do we need to compile the Java sources for this web application? -->
+  <available property="webapp.compile"   file="${webapp.src}" />
+
+  <!-- Should we copy Struts library and TLD files? -->
+  <available property="webapp.struts"    file="${struts.libs}" />
+
+</target>
+
+
+<!--
+        The "prepare" target creates a directory structure in the build target
+        area for the unpacked files associated with this web application
+-->
+<target name="prepare" depends="init"
+        description="Prepare target directory">
+  <echo    message="Processing webapp ${webapp.name}"/>
+  <mkdir   dir="${webapp.target}" />
+  <mkdir   dir="${webapp.target}/WEB-INF" />
+  <mkdir   dir="${webapp.target}/WEB-INF/classes" />
+  <mkdir   dir="${webapp.target}" />
+</target>
+
+
+<!--
+        The "libs" target copies specified library JAR files (if any) from the
+        "${webapp.libs} directory into the WEB-INF/lib directory of this app.
+-->
+
+<target name="libs" depends="prepare" if="copy.libs"
+        description="Copy dependent libraries">
+  <echo    message="Processing webapp ${webapp.name}"/>
+  <mkdir   dir="${webapp.target}/WEB-INF/lib" />
+  <copy  todir="${webapp.target}/WEB-INF/lib">
+    <fileset dir="${webapp.libs}" includes="*.jar"/>
+  </copy>
+</target>
+
+
+<!--
+        The "source" target copies the Java source code of your web application
+        into the build target area, IF AND ONLY IF the "webapp.source"
+        property has been set to an arbitrary value.
+-->
+
+<target name="source" depends="prepare" if="webapp.compile"
+        unless="webapp.suppress"
+        description="Copy Java sources">
+  <echo    message="Processing webapp ${webapp.name}"/>
+  <mkdir   dir="${webapp.target}/WEB-INF/src"/>
+  <copy  todir="${webapp.target}/WEB-INF/src">
+    <fileset dir="${webapp.src}"/>
+  </copy>
+</target>
+
+
+<!--
+        The "struts" target copies the Struts library JAR file and TLDs
+        into the build target area.
+-->
+<target name="struts" depends="prepare" if="webapp.struts"
+        description="Copy Struts library and TLD files">
+  <echo    message="Processing webapp ${webapp.name}"/>
+  <copy  todir="${webapp.target}/WEB-INF">
+    <fileset dir="${struts.libs}" includes="*.tld"/>
+  </copy>
+  <copy  todir="${webapp.target}/WEB-INF">
+	  <fileset dir="${build.home}/library" includes="*.tld"/>
+  </copy>
+  <mkdir   dir="${webapp.target}/WEB-INF/lib"/>
+  <copy  todir="${webapp.target}/WEB-INF/lib">
+    <fileset dir="${struts.libs}" includes="commons-*.jar"/>
+    <fileset dir="${struts.libs}" includes="jakarta-oro.jar"/>
+    <fileset dir="${struts.libs}" includes="struts.jar"/>
+    <fileset dir="${build.home}/library" includes="struts-wml.jar"/>
+  </copy>
+</target>
+
+<!--
+        The "static" target copies the static web resources portion of your
+        web application source into the build target area.
+-->
+<target name="static" depends="prepare,source,libs,struts"
+        description="Copy static files">
+  <echo    message="Processing webapp ${webapp.name}"/>
+  <copy  todir="${webapp.target}">
+    <fileset dir="${webapp.web}"/>
+  </copy>
+</target>
+
+
+<!--
+        The "compile" target compiles the Java source code of your web
+        application, if and only if the specified source directory
+        actually exists.
+-->
+<target name="compile" depends="static" if="webapp.compile"
+        description="Compile Java sources">
+  <echo    message="Processing webapp ${webapp.name}"/>
+  <javac  srcdir="${webapp.src}"
+         destdir="${webapp.target}/WEB-INF/classes"
+           debug="${compile.debug}"
+     deprecation="${compile.deprecation}"
+        optimize="${compile.optimize}">
+    <classpath refid="classpath"/>
+  </javac>
+  <copy    todir="${webapp.target}/WEB-INF/classes">
+    <fileset dir="${webapp.src}">
+      <exclude name="**/*.java"/>
+    </fileset>
+  </copy>
+</target>
+
+
+
+<!--
+        The "dist" target creates a web application archive containing
+        your completed web application, suitable for deployment on any
+        compatible servlet container.
+-->
+<target name="dist" depends="compile"
+        description="Create web application archive">
+  <echo    message="Processing webapp ${webapp.name}"/>
+  <jar  jarfile="${webapp.dist}/${webapp.war}"
+        basedir="${webapp.target}"/>
+</target>
+
+
+<!--
+        The "clean" task deletes any created directories that have resulted
+        from running any of the other targets in this script.
+-->
+
+<target name="clean"
+        description="Clean build and distribution directories">
+  <echo    message="Processing webapp ${webapp.name}"/>
+  <delete   dir="${webapp.target}" />
+  <delete  file="${webapp.dist}/${webapp.war}"/>
+</target>
+
+
+</project>
diff -Nurb contrib.orig/wml/build-webapps.xml contrib/wml/build-webapps.xml
--- contrib.orig/wml/build-webapps.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/build-webapps.xml	2003-02-04 11:56:20.000000000 -0500
@@ -0,0 +1,284 @@
+<project name="Struts Web Applications" default="compile" basedir=".">
+
+
+<!--
+        This is a build file that creates all of the web applications included
+        in a Struts distribution, using the generic "build-webapp.xml" script
+        for the details
+-->
+
+
+<!-- ========== Prerequisite Properties =================================== -->
+
+
+<!--
+        These properties MUST be set on the "ant" command line, the "antrc"
+        properties file in your home directory, or from settings in a superior
+        build.xml script.
+
+        build.home                    Base directory into which we are building
+                                      the Struts components.
+
+        compile.classpath             If specified, contains a set of JAR files
+                                      and/or directories to be added to the
+                                      compilation classpath.
+
+        servlet.jar                   The pathname of the servlet API classes
+                                      that you wish to compile against.
+
+        struts.libs                   The directory containing struts.jar and
+                                      the associated TLD files.
+
+        webapp.libs                   If specified, must be the pathname of a
+                                      directory from which all available
+                                      "*.jar" files are copied to the web
+                                      application's WEB-INF/lib directory.
+-->
+
+<property name="build.home"           value="${basedir}/target"/>
+<property name="servlet.jar"          value="../jakarta-servletapi/lib/servlet.jar"/>
+<property name="struts.libs"          value="${build.home}/library"/>
+
+
+
+<!-- ========== Initialization Properties ================================= -->
+
+
+<!--
+        These property values may optionally be overridden with property
+        settings from an "ant" command line, the "antrc" properties file
+        in your home directory, or from settings in a superior build.xml
+        script.
+-->
+
+
+<!-- Should Java compilations set the debug compiler option? -->
+<property name="compile.debug"         value="true" />
+
+<!-- Should Java compilations set the deprecation compiler option? -->
+<property name="compile.deprecation"   value="false" />
+
+<!-- Should Java compilations set the optimize compiler option? -->
+<property name="compile.optimize"      value="true" />
+
+<!-- The base directory for distribution targets -->
+<property name="dist.home"             value="${basedir}/dist" />
+
+<!-- The directory into which Struts JAR and TLD files have been created -->
+<property name="struts.home"           value="${build.home}/library" />
+
+<!-- Directory where core struts library configurations files are stored -->
+<property name="conf.share.dir" value="${basedir}/conf/share"/>
+
+<!-- Doc directory -->
+<property name="doc.dir" value="doc"/>
+
+
+<!-- ========== Executable Targets ======================================== -->
+
+
+<!--
+        The "static.generic" target causes the "static" target of each
+        individual web application to be executed.
+-->
+<target name="static.generic">
+  <ant  antfile="build-webapp.xml"    target="static">
+    <property name="webapp.name"      value="struts-wml-exercise-taglib"/>
+  </ant>
+</target>
+
+
+<!--
+        The "static" target causes non-generic static activity required
+        for specific tag libraries to be executed.
+-->
+<target name="static" depends="static.generic"
+        description="Copy static resources for individual web applications">
+    <!-- Copy DTDs for Struts constructs -->
+    <copy  todir="${build.home}/struts-wml-documentation/dtds">
+      <fileset dir="${conf.share.dir}" includes="**/*.dtd"/>
+    </copy>
+</target>
+
+
+<!--
+        The "compile.generic" target causes the "compile" target of each
+        individual web application to be executed.
+-->
+<target name="compile.generic">
+  <ant  antfile="build-webapp.xml"    target="compile">
+    <property name="webapp.name"      value="struts-wml-exercise-taglib"/>
+  </ant>
+</target>
+
+
+<!--
+        The "compile" target causes non-generic compile activity required
+        for specific tag libraries to be executed.
+-->
+<target name="compile" depends="compile.generic"
+        description="Compile individual web applications">
+    <!-- Create the taglib documentation -->
+    <style   basedir="${doc.dir}" destdir="${build.home}/struts-wml-documentation"
+           extension=".html" style="${doc.dir}/stylesheets/struts.xsl"
+            includes="*.xml"/>
+    <!-- Create the proposals -->
+<!--
+    <style   basedir="${doc.dir}/proposals"
+             destdir="${build.home}/struts-wml-documentation/proposals"
+           extension=".html" style="${doc.dir}/stylesheets/proposals.xsl"
+            includes="*.xml"/>
+-->
+    <!-- Create the user guide -->
+    <style   basedir="${doc.dir}/userGuide"
+             destdir="${build.home}/struts-wml-documentation/userGuide"
+           extension=".html" style="${doc.dir}/stylesheets/userGuide.xsl"
+            includes="*.xml"/>
+    <!-- Copy the basic documentation files -->
+    <copy      todir="${build.home}/struts-wml-documentation">
+      <fileset   dir="${doc.dir}">
+        <include name="**/*.css"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.html"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.js"/>
+      </fileset>
+    </copy>
+    <!-- Copy the basic user guide files -->
+    <copy      todir="${build.home}/struts-wml-documentation/userGuide">
+      <fileset   dir="${doc.dir}/userGuide">
+        <include name="**/*.css"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.html"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.js"/>
+      </fileset>
+    </copy>
+    <!-- Copy the proposal files -->
+<!--
+    <copy      todir="${build.home}/struts-wml-documentation/proposals">
+      <fileset   dir="${doc.dir}/proposals">
+        <include name="**/*.css"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.html"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.js"/>
+      </fileset>
+    </copy>
+-->
+    <!-- Copy the basic user guide files -->
+    <copy      todir="${build.home}/struts-wml-documentation/userGuide">
+      <fileset   dir="${doc.dir}/userGuide">
+        <include name="**/*.css"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.html"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.js"/>
+      </fileset>
+    </copy>
+    <!-- Create the Tiles documentation -->
+<!--
+    <style   basedir="${doc.dir}/tiles"
+             destdir="${build.home}/tiles-documentation"
+           extension=".html" style="${doc.dir}/stylesheets/tiles.xsl"
+            includes="*.xml"/>
+-->
+    
+    <!-- Compile Tiles contrib -->
+<!--
+    <ant  antFile="build.xml"  dir="contrib/tiles"  target="compile.for.struts">
+      <property name="struts.home"      value="${struts.home}"/>
+      <property name="struts.libs"      value="${struts.libs}"/>
+      <property name="build.home"       value="${build.home}/tiles"/>
+      <property name="dist.home"        value="${dist.home}"/>
+      <property name="app.name"         value="tiles"/>
+      <property name="project.name"     value="Tiles"/>
+    </ant>  
+-->
+
+</target>
+
+
+<!--
+        The "dist.generic" target causes the "dist" target of each
+        individual web application to be executed.
+-->
+<target name="dist.generic">
+  <ant  antfile="build-webapp.xml"    target="dist">
+    <property name="webapp.name"      value="struts-wml-exercise-taglib"/>
+    <property name="webapp.war"       value="struts-wml-exercise-taglib.war"/>
+  </ant>
+  <ant  antfile="build-webapp.xml"    target="dist">
+    <property name="webapp.name"      value="struts-wml-documentation"/>
+    <property name="webapp.war"       value="struts-wml-documentation.war"/>
+  </ant>
+</target>
+
+
+<!--
+        The "dist" target causes non-generic dist activity required
+        for specific tag libraries to be executed.
+-->
+<target name="dist" depends="dist.generic"
+        description="Create distribution output of web applications">
+        
+    <!-- Compile Tiles dist -->
+<!--
+    <ant  antFile="build.xml"  dir="contrib/tiles"  target="dist.for.struts">
+      <property name="struts.home"      value="${struts.home}"/>
+      <property name="struts.libs"      value="${struts.libs}"/>
+      <property name="build.home"       value="${build.home}/tiles"/>
+      <property name="dist.home"        value="${dist.home}"/>
+      <property name="app.name"         value="tiles"/>
+      <property name="project.name"     value="Tiles"/>
+    </ant>
+-->
+
+</target>
+
+
+<!--
+        The "clean.generic" target causes the "clean" target of each
+        individual web application to be executed.
+-->
+<target name="clean.generic">
+  <ant  antfile="build-webapp.xml"    target="clean">
+    <property name="webapp.name"      value="blank"/>
+  </ant>
+  <ant  antfile="build-webapp.xml"    target="clean">
+    <property name="webapp.name"      value="struts-wml-documentation"/>
+  </ant>
+  <ant  antfile="build-webapp.xml"    target="clean">
+    <property name="webapp.name"      value="example"/>
+  </ant>
+  <ant  antfile="build-webapp.xml"    target="clean">
+    <property name="webapp.name"      value="struts-wml-exercise-taglib"/>
+  </ant>
+  <ant  antfile="build-webapp.xml"    target="clean">
+    <property name="webapp.name"      value="template-example"/>
+  </ant>
+  <!--ant  antfile="build-webapp.xml"    target="clean">
+    <property name="webapp.name"      value="test"/>
+  </ant-->
+  <ant  antfile="build-webapp.xml"    target="clean">
+    <property name="webapp.name"      value="tiles-documentation"/>
+  </ant>
+  <ant  antfile="build-webapp.xml"    target="clean">
+    <property name="webapp.name"      value="upload"/>
+  </ant>
+  <ant  antfile="build-webapp.xml"    target="clean">
+    <property name="webapp.name"      value="validator"/>
+  </ant>
+</target>
+
+
+<!--
+        The "clean" target causes non-generic clean activity required
+        for specific tag libraries to be executed.
+-->
+<target name="clean" depends="clean.generic"
+        description="Clean output for individual web applications">
+</target>
+
+
+</project>
diff -Nurb contrib.orig/wml/build.properties.sample contrib/wml/build.properties.sample
--- contrib.orig/wml/build.properties.sample	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/build.properties.sample	2003-02-04 12:26:30.000000000 -0500
@@ -0,0 +1,49 @@
+# -----------------------------------------------------------------------------
+# build.properties.sample
+#
+# This is an example "build.properties" file, used to customize building
+# struts-wml for your local environment.  Copy this file to "build.properties"
+# in the same directory that contains the "build.xml" file, then make any
+# changes you need.
+#
+# $Id: build.properties.sample,v 1.2 2002/12/22 06:13:08 martinc Exp $
+# -----------------------------------------------------------------------------
+
+struts.libs	= <path to struts distribution library>
+# We expect to find ${struts.libs}/struts.jar and *.tld
+
+servlet.jar	= <path to servlet.jar>
+
+jdbc20ext.jar	= <path to JDBC 2.0 extension jar>
+
+# The JAR file containing version 1.0 (or later) of the Beanutils package
+# from the Jakarta Commons project.
+commons-beanutils.jar	= <path to commons-beanutils.jar>
+
+# The JAR file containing version 1.0 (or later) of the Collections package
+# from the Jakarta Commons project.
+commons-collections.jar	= <path to commons-collections.jar>
+
+# The JAR file containing version 1.0 (or later) of the DBCP package
+# from the Jakarta Commons project.
+commons-dbcp.jar	= <path to commons-dbcp.jar>
+
+# The JAR file containing version 1.0 (or later) of the Digester package
+# from the Jakarta Commons project.
+commons-digester.jar	= <path to commons.digester.jar>
+
+# The JAR file containing version 1.0 (or later) of the Logging package
+# from the Jakarta Commons project.
+commons-logging.jar	= <path to commons-logging.jar>
+
+# The JAR file containing version 1.0 (or later) of the POOL package
+# from the Jakarta Commons project.
+commons-pool.jar	= <path to commons-pool.jar>
+
+# The JAR file containing a recent version of the VALIDATOR package
+# from the Jakarta Commons project.
+commons-validator.jar	= <path to commons-validator.jar>
+
+# The JAR file containing version 2.06 (or later) of 
+# the the Jakarta ORO project.
+jakarta-oro.jar	= <path to jakarta-oro.jar>
diff -Nurb contrib.orig/wml/build.xml contrib/wml/build.xml
--- contrib.orig/wml/build.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/build.xml	2003-02-04 11:54:15.000000000 -0500
@@ -0,0 +1,489 @@
+<project name="struts-wml" default="compile.library" basedir=".">
+ <!--
+
+ Main build.xml for building "struts-wml", which is a tag library to
+ allow typical Struts appliations to target WML output instead of
+ HTML or XHTML.
+
+ This build.xml will build:
+ - core struts-wml library and TLD
+ - documentation
+ - struts-wml web application
+ - run unit tests
+
+ This script will delegate some of its work to sub-build.xml files.
+
+ -->
+ <!-- ========== Prerequisite Properties =================================== -->
+
+ <!--
+
+ These properties MUST be set on the "ant" command line, a "build.properties"
+ file in the base directory, or a "build.properties" file in your user home
+ directory.
+
+        jdbc20ext.jar                 (required).  The path to the JAR file
+                                      for the JDBC 2.0 Optional Package APIs.
+
+        servlet.jar                   (required).  The path to the Servlet API
+                                      classes to compile against (currently,
+                                      either version 2.2 or 2.3 supported).
+
+        struts.jar                    The path to the base Struts jar file.
+
+        commons-beanutils.jar         The path to the JAR file of the Jakarta
+                                      Commons BeanUtils package (version 1.0
+                                      or later).
+ -->
+
+ <!-- Load local and user build preferences -->
+ <property file="${user.home}/build.properties"/>
+ <property file="../../build.properties"/>
+ <property file="build.properties"/>
+
+ <!-- Default values for unspecified properties -->
+ <property name="jdbc20ext.jar" value="../jdbc2_0-stdext.jar"/>
+ <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
+ <property name="struts.jar" value="${struts.libs}/struts.jar"/>
+ <property name="commons-beanutils.jar"
+           value="../jakarta-commons/beanutils/dist/lib/beanutils.jar"/>
+
+ <!-- ========== Initialization Properties ================================= -->
+
+ <!--
+ These property values may optionally be overridden with property settings from
+ an "ant" command line, the "build.properties" file in this directory, the
+ "build.properties" file in your home directory, or from settings in a superior
+ build.xml script.
+ -->
+
+ <!-- Output directory name for all files generated by the build process -->
+<!-- <property name="build.home" value="${basedir}/contrib/wml/target"/> -->
+ <property name="build.home" value="${basedir}/target"/>
+
+ <!-- Should Java compilations set the debug compiler option? -->
+ <property name="compile.debug" value="true" />
+
+ <!-- Should Java compilations set the deprecation compiler option? -->
+ <property name="compile.deprecation" value="true" />
+
+ <!-- Should Java compilations set the optimize compiler option? -->
+ <property name="compile.optimize" value="true" />
+
+ <!-- Name of the core struts library -->
+ <property name="app.name" value="struts-wml"/>
+
+ <!-- Name of the project -->
+ <property name="project.name" value="jakarta-struts-wml"/>
+
+ <!-- Version of the project -->
+ <property name="project.version" value="1.0"/>
+
+ <!-- ========== Derived Properties ======================================== -->
+
+ <!--
+ These property values are derived from values defined above, and generally
+ should NOT be overridden by command line settings
+ -->
+
+ <!-- The base directory for distribution targets -->
+ <property name="dist.home" value="dist" />
+
+ <!-- The base directory for release targets -->
+ <property name="release.home" value="release" />
+
+ <!-- Source directory -->
+ <property name="src.dir" value="src"/>
+
+ <!-- Source directory for core struts library -->
+ <property name="src.share.dir" value="${src.dir}/share"/>
+
+ <!-- Source directory for non-Cactus unit tests -->
+ <property name="src.test.dir" value="${src.dir}/test"/>
+
+ <!-- Directory where core struts library configurations files are stored -->
+ <property name="conf.share.dir" value="conf/share"/>
+
+ <!-- Directory where test configurations files are stored -->
+ <property name="conf.test.dir" value="conf/test"/>
+
+ <!-- Directory where binary release files are staged -->
+ <property name="stage.bin.dir" value="${release.home}/stage/bin"/>
+
+ <!-- Directory where library release files are staged -->
+ <property name="stage.lib.dir" value="${release.home}/stage/lib"/>
+
+ <!-- Directory where source release files are staged -->
+ <property name="stage.src.dir" value="${release.home}/stage/src"/>
+
+ <!-- Directory where release builds are prepared for upload -->
+ <property name="upload.dir" value="${release.home}/upload"/>
+
+ <!-- Base file name for upload files -->
+ <property name="upload.file.base" value="${project.name}-${project.version}"/>
+
+ <!-- Doc directory -->
+ <property name="doc.dir" value="doc"/>
+
+ <!-- Web directory -->
+ <property name="web.dir" value="web"/>
+
+ <!-- Compilation Classpath -->
+ <path id="compile.classpath">
+  <pathelement location="${commons-beanutils.jar}"/>
+  <pathelement location="${commons-collections.jar}"/>
+  <pathelement location="${commons-dbcp.jar}"/>
+  <pathelement location="${commons-digester.jar}"/>
+  <pathelement location="${commons-logging.jar}"/>
+  <pathelement location="${commons-pool.jar}"/>
+  <pathelement location="${commons-validator.jar}"/>
+  <pathelement location="${jdbc20ext.jar}"/>
+  <pathelement location="${servlet.jar}"/>
+  <pathelement location="${struts.jar}"/>
+ </path>
+
+ <!-- ========== Executable Targets ======================================== -->
+
+ <!--
+ The "init" target evaluates "available" expressions as necessary to modify the
+ behavior of this script and print some information on screen
+ -->
+
+ <target name="init">
+  <echo message="--------- ${project.name} ${project.version} ---------"/>
+  <echo message=""/>
+
+  <echo message="java.class.path = ${java.class.path}"/>
+  <echo message="java.home = ${java.home}"/>
+  <echo message="user.home = ${user.home}"/>
+  <echo message="struts.jar = ${struts.jar}"/>
+
+  <tstamp>
+      <format property="year" pattern="yyyy"/>
+  </tstamp>
+ </target>
+
+ <!-- 
+ Create directories and copy files for the wml library
+ -->
+
+ <target name="prepare.library" depends="init">
+  <mkdir dir="${build.home}/library/classes/META-INF"/>
+  <mkdir dir="${build.home}/library/classes/META-INF/tlds"/>
+  <copy file="${struts.jar}" tofile="${build.home}/library/struts.jar"/>
+  <copy file="${commons-beanutils.jar}"
+        tofile="${build.home}/library/commons-beanutils.jar"/>
+  <copy file="${commons-collections.jar}"
+        tofile="${build.home}/library/commons-collections.jar"/>
+  <copy file="${commons-dbcp.jar}"
+        tofile="${build.home}/library/commons-dbcp.jar"/>
+  <copy file="${commons-digester.jar}"
+        tofile="${build.home}/library/commons-digester.jar"/>
+  <copy file="${commons-fileupload.jar}"
+        tofile="${build.home}/library/commons-fileupload.jar"/>
+  <copy file="${commons-lang.jar}"
+        tofile="${build.home}/library/commons-lang.jar"/>
+  <copy file="${commons-logging.jar}"
+        tofile="${build.home}/library/commons-logging.jar"/>
+  <copy file="${commons-pool.jar}"
+        tofile="${build.home}/library/commons-pool.jar"/>
+  <copy file="${commons-resources.jar}"
+        tofile="${build.home}/library/commons-resources.jar"/>
+  <copy file="${commons-validator.jar}"
+        tofile="${build.home}/library/commons-validator.jar"/>
+  <copy file="${jakarta-oro.jar}"
+        tofile="${build.home}/library/jakarta-oro.jar"/>
+  <copy file="${jdbc20ext.jar}"
+        tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
+ </target>
+
+<!-- 
+        Prepare static directories for web applications
+-->
+    <target name="static.webapps">
+        <ant antfile="build-webapps.xml" target="static"/>
+    </target>
+
+<!--
+        Compile code for web applications
+-->
+    <target name="compile.webapps" depends="compile.library,static.webapps"
+     description="Compile Struts web applications">
+        <ant antfile="build-webapps.xml" target="compile"/>
+    </target>
+
+<!--
+        Construct distributable web applications
+-->
+    <target name="dist.webapps" depends="compile.webapps,compile.javadoc">
+        <ant antfile="build-webapps.xml" target="dist"/>
+    </target>
+
+ <!--
+ Compile wml library directory components
+ -->
+ <target name="compile.library" depends="prepare.library"
+         description="Compile struts-wml library files">
+  <javac srcdir="${src.share.dir}" destdir="${build.home}/library/classes"
+         debug="${compile.debug}" optimize="${compile.optimize}"
+         deprecation="${compile.deprecation}">
+   <classpath refid="compile.classpath"/>
+  </javac>
+  <style basedir="${doc.dir}/userGuide" destdir="${build.home}/library"
+         extension=".tld" style="${doc.dir}/stylesheets/tld.xsl"
+         includes="struts-*.xml"/>
+  <copy todir="${build.home}/library/classes/META-INF/tlds">
+   <fileset dir="${build.home}/library" includes="struts-*.tld"/>
+  </copy>
+  <jar jarfile="${build.home}/library/${app.name}.jar"
+       basedir="${build.home}/library/classes" includes="**"/>
+ </target>
+
+ <!--
+ Create Javadoc documentation
+ -->
+ <target name="compile.javadoc" description="Generate JavaDoc API docs">
+  <delete dir="${build.home}/struts-wml-documentation/api"/>
+  <mkdir dir="${build.home}/struts-wml-documentation/api"/>
+  <javadoc sourcepath="${src.share.dir}"
+           destdir="${build.home}/struts-wml-documentation/api"
+           classpath="${servlet.jar}:${jdbc20ext.jar}:${struts.jar}"
+           packagenames="org.apache.struts.taglib.*" author="true" private="true"
+           use="true"
+           version="true"
+           windowtitle="Apache struts-wml API Documentation"
+           doctitle="&lt;h1&gt;Apache struts-wml Framework (Version ${project.version})&lt;/h1&gt;"
+           bottom="Copyright &#169; 2000-${year} - Apache Software Foundation">
+           <classpath refid="compile.classpath"/>
+  </javadoc>
+ </target>
+
+ <!--
+ Create directories and copy files for distribution
+ -->
+ <target name="prepare.dist" depends="init">
+  <mkdir dir="${dist.home}"/>
+  <mkdir dir="${dist.home}/lib"/>
+  <mkdir dir="${dist.home}/webapps"/>
+ </target>
+
+ <!--
+ Construct library distributables
+ -->
+
+ <target name="dist.library" depends="prepare.dist,compile.library">
+  <copy todir="${dist.home}/lib">
+	<fileset dir="${build.home}/library" includes="*.jar"/>
+	<fileset dir="${build.home}/library" includes="*.tld"/>
+	<fileset dir="${build.home}/library" includes="*.xml"/>
+  </copy>
+ </target>
+
+ <!--
+ Copy sources for distribution
+ -->
+ <target name="dist.source" depends="prepare.dist">
+ </target>
+
+ <!--
+ Construct complete binary distribution
+ -->
+ <target name="dist" depends="dist.library,dist.webapps,dist.source"
+         description="Construct binary distribution"/>
+
+ <!--
+ Construct complete release distributions
+ -->
+ <target name="release" depends="clean,dist"
+         description="Construct release distribution">
+  <mkdir dir="${stage.bin.dir}/${upload.file.base}"/>
+  <mkdir dir="${stage.lib.dir}/${upload.file.base}-lib"/>
+  <mkdir dir="${stage.src.dir}/${upload.file.base}-src"/>
+  <copy todir="${stage.bin.dir}/${upload.file.base}">
+   <fileset dir="${dist.home}"/>
+  </copy>
+  <copy todir="${stage.lib.dir}/${upload.file.base}-lib">
+	<fileset dir="${dist.home}/lib"/>
+  </copy>
+  <copy todir="${stage.src.dir}/${upload.file.base}-src">
+   <fileset dir=".">
+	 <exclude name="build.properties"/>
+	 <exclude name="target/**"/>
+	 <exclude name="dist/**"/>
+	 <exclude name="release/**"/>
+	</fileset>
+  </copy>
+  <mkdir dir="${upload.dir}"/>
+  <zip zipfile="${upload.dir}/${upload.file.base}.zip"
+		 basedir="${stage.bin.dir}"/>
+  <zip zipfile="${upload.dir}/${upload.file.base}-lib.zip"
+		 basedir="${stage.lib.dir}"/>
+  <zip zipfile="${upload.dir}/${upload.file.base}-src.zip"
+		 basedir="${stage.src.dir}"/>
+  <tar tarfile="${upload.dir}/${upload.file.base}.tar"
+		 basedir="${stage.bin.dir}"
+		 longfile="gnu"/>
+  <tar tarfile="${upload.dir}/${upload.file.base}-lib.tar"
+		 basedir="${stage.lib.dir}"
+		 longfile="gnu"/>
+  <tar tarfile="${upload.dir}/${upload.file.base}-src.tar"
+		 basedir="${stage.src.dir}"
+		 longfile="gnu"/>
+  <gzip src="${upload.dir}/${upload.file.base}.tar"
+		  zipfile="${upload.dir}/${upload.file.base}.tar.gz"/>
+  <gzip src="${upload.dir}/${upload.file.base}-lib.tar"
+		  zipfile="${upload.dir}/${upload.file.base}-lib.tar.gz"/>
+  <gzip src="${upload.dir}/${upload.file.base}-src.tar"
+		  zipfile="${upload.dir}/${upload.file.base}-src.tar.gz"/>
+ </target>
+
+ <!--
+ Clean up build and distribution directories
+ -->
+ <target name="clean"
+         description="Clean build and distribution directories">
+  <delete dir="${build.home}"/>
+  <delete dir="${dist.home}"/>
+  <delete dir="${release.home}"/>
+ </target>
+
+ <!--
+ All-in-one build target
+ -->
+ <target name="all" depends="clean,compile.library,compile.webapps"
+         description="Clean and build library and web applications"/>
+
+<!--
+        Compile Website documenation
+-->
+
+<target name="clean.website" depends="clean,compile.website"/>
+<target name="compile.website" 
+        description="Compile main website">
+    <!-- Create the taglib documentation -->
+    <style   basedir="${doc.dir}" destdir="${build.home}/struts-wml-documentation"
+           extension=".html" style="stylesheets/struts.xsl" includes="*.xml"/>
+    <!-- Create the proposals -->
+    <style   basedir="${doc.dir}/proposals"
+             destdir="${build.home}/struts-wml-documentation/proposals"
+           extension=".html" style="../stylesheets/proposals.xsl"
+            includes="*.xml"/>
+    <!-- Create the user guide -->
+    <style   basedir="${doc.dir}/userGuide"
+             destdir="${build.home}/struts-wml-documentation/userGuide"
+           extension=".html" style="../stylesheets/userGuide.xsl"
+            includes="*.xml"/>
+    <!-- Copy the basic documentation files -->
+    <copy      todir="${build.home}/struts-wml-documentation">
+      <fileset   dir="${doc.dir}">
+        <include name="**/*.css"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.html"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.js"/>
+      </fileset>
+    </copy>
+    <!-- Copy the basic user guide files -->
+    <copy      todir="${build.home}/struts-wml-documentation/userGuide">
+      <fileset   dir="${doc.dir}/userGuide">
+        <include name="**/*.css"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.html"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.js"/>
+      </fileset>
+    </copy>
+    <!-- Copy the proposal files -->
+    <copy      todir="${build.home}/struts-wml-documentation/proposals">
+      <fileset   dir="${doc.dir}/proposals">
+        <include name="**/*.css"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.html"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.js"/>
+      </fileset>
+    </copy>
+    <!-- Copy the basic user guide files -->
+    <copy      todir="${build.home}/struts-wml-documentation/userGuide">
+      <fileset   dir="${doc.dir}/userGuide">
+        <include name="**/*.css"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.html"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.js"/>
+      </fileset>
+    </copy>
+</target>
+
+<!--
+        Run tests on all servers not commented out in the build.properties file.
+-->
+
+    <!-- =================== Cactus-Based Tests on Tomcat ================= -->
+
+
+    <target name="test.tomcat.all"
+         depends="skip.tomcat.32,test.tomcat.32,
+                  skip.tomcat.40,test.tomcat.40,
+                  skip.tomcat.41,test.tomcat.41"
+     description="Run Cactus-based unit tests on all servlet engines">
+    </target>
+
+
+    <target name="skip.tomcat.32" unless="tomcat.home.32">
+        <echo message="*****************************************************"/>
+        <echo message="WARNING : Property 'tomcat.home.32' has not been set."/>
+        <echo message="          No test will be run on that servlet engine."/>
+        <echo message="*****************************************************"/>
+        <echo message=""/>
+    </target>
+
+    <target name="test.tomcat.32" if="tomcat.home.32"
+         depends="skip.tomcat.32,compile.library"
+     description="Run Cactus-based unit tests on Tomcat 3.2">
+        <echo message="tomcat.home.32 = ${tomcat.home.32}"/>
+        <ant antfile="build-tests.xml" target="test.tomcat.32"/>
+    </target>
+
+
+    <target name="skip.tomcat.40" unless="tomcat.home.40">
+        <echo message="*****************************************************"/>
+        <echo message="WARNING : Property 'tomcat.home.40' has not been set."/>
+        <echo message="          No test will be run on that servlet engine."/>
+        <echo message="*****************************************************"/>
+        <echo message=""/>
+    </target>
+
+    <target name="test.tomcat.40" if="tomcat.home.40"
+         depends="skip.tomcat.40,compile.library"
+     description="Run Cactus-based unit tests on Tomcat 4.0">
+        <echo message="tomcat.home.40 = ${tomcat.home.40}"/>        
+        <ant antfile="build-tests.xml" target="test.tomcat.40"/>
+    </target>
+
+
+    <target name="skip.tomcat.41" unless="tomcat.home.41">
+        <echo message="*****************************************************"/>
+        <echo message="WARNING : Property 'tomcat.home.41' has not been set."/>
+        <echo message="          No test will be run on that servlet engine."/>
+        <echo message="*****************************************************"/>
+        <echo message=""/>
+    </target>
+
+    <target name="test.tomcat.41" if="tomcat.home.41"
+         depends="skip.tomcat.41,compile.library"
+     description="Run unit tests on Tomcat 4.1">
+        <echo message="tomcat.home.41 = ${tomcat.home.41}"/>        
+        <ant antfile="build-tests.xml" target="test.tomcat.41"/>
+    </target>
+
+
+    <!-- ========== Non-Cactus Unit Tests ================================= -->
+
+    <target name="test.junit" depends="compile.library"
+     description="Run non-Cactus JUnit tests">
+      <ant antfile="build-tests.xml" target="test.junit"/>
+    </target>
+
+</project>
+
diff -Nurb contrib.orig/wml/doc/index.xml contrib/wml/doc/index.xml
--- contrib.orig/wml/doc/index.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/index.xml	2003-02-04 11:26:41.000000000 -0500
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<document url="./index.xml">
+
+<!--
+// ======================================================================== 78
+-->
+
+<properties>
+  <title>The Apache Struts Web Application Framework WML Tag Library</title>
+  <author>Craig R. McClanahan</author>
+  <author>Ted Husted</author>
+  <author>Martin Cooper</author>
+  <author>James Holmes</author>
+  <author>Mitchell Morris</author>
+</properties>
+
+<body>
+  <section name="Welcome to Struts WML" href="Welcome">
+    <p>Welcome to Struts WML!
+      The goal of this project is to extend the Struts open source framework
+      to include delivering WML applications.</p>
+    
+    <p>When building a WML application, the vast majority of the work is
+      exactly the same as it is when delivering an HTML application. The
+      intent of this tag library is to allow (as much as possible) the
+      same basic ideas of Struts applications in a small footprint WML
+      package.</p>
+
+    <p>Struts is part of the <a href="http://jakarta.apache.org">Apache
+	Jakarta Project</a>, sponsored by the
+      <a href="http://www.apache.org">Apache Software Foundation</a>. The
+      official Struts home page is at
+      <a href="http://jakarta.apache.org/struts">
+	http://jakarta.apache.org/struts</a>.</p>
+  </section>
+    
+  <section>
+    <p>Available documents:
+      <ul>
+	<li><a href="userGuide/struts-wml.html">The user's guide</a></li>
+	<li><a href="api/index.html">taglib javadocs</a></li>
+      </ul>
+    </p>
+  </section>
+
+</body>
+</document>
diff -Nurb contrib.orig/wml/doc/project.xml contrib/wml/doc/project.xml
--- contrib.orig/wml/doc/project.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/project.xml	2002-12-30 22:12:12.000000000 -0500
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project 
+	name="Struts Framework"
+    href="http://jakarta.apache.org/struts"
+    image="images/struts.gif"
+    >
+
+    <title>
+    	Apache Struts Web Application Framework
+    	</title>
+
+    <menu name="Struts">
+        <item 
+        	name="Welcome"
+        	href="index.html"
+        	/>
+        <item 
+        	name="Learning"                
+        	href="learning.html"
+        	/>
+        <item 
+        	name="Acquiring"               
+        	href="acquiring.html"
+        	/>
+        <item 
+        	name="Using"                   
+        	href="using.html"
+        	/>
+        <item 
+        	name="Who We Are"              
+        	href="volunteers.html"
+        	/>
+        <item 
+        	name="Roadmap"
+            href="status.html"
+            />
+</menu>
+
+    <menu name="Community">
+        <item 
+        	name="News &amp; Status"
+        	href="news/index.html"
+        	/>
+        <item 
+        	name="Resources"               
+        	href="resources/index.html"
+        	/>
+        <item 
+        	name="List Archive"            
+        	href="http://nagoya.apache.org/eyebrowse/SummarizeList?listId=42"
+        	/>
+        <item 
+        	name="Known Issues"			 
+        	href="http://jakarta.apache.org/site/bugs.html"
+        	/>              
+    </menu>
+
+    <menu name="Download">
+        <item 
+        	name="Binaries"                
+        	href="http://jakarta.apache.org/site/binindex.html"
+        	/>
+        <item 
+        	name="Source Code"             
+        	href="http://jakarta.apache.org/site/sourceindex.html"
+        	/>
+        <item 
+        	name="CVS Repository"          
+        	href="http://cvs.apache.org/viewcvs/jakarta-struts/"
+        	/>
+    </menu>
+
+    <menu name="Nightly Build">
+        <item 
+        	name="User and Developer Guides"
+            href="userGuide/index.html"
+            />
+        <item 
+        	name="Javadoc"
+            href="api/index.html"
+            />
+        <item 
+        	name="FAQs and Howtos"         
+        	href="faqs/index.html"
+        	/>
+    </menu>
+
+    <menu name="Beta Release (1.1-b3)">
+        <item 
+        	name="Release Notes"
+            href="userGuide/release-notes-1.1-b3.html"
+            />
+        <item 
+        	name="Release Plan"
+            href="proposals/release-plan-1.1b3.html"
+            />
+    </menu>
+
+    <menu name="Stable Release (1.0.2)">
+        <item 
+        	name="Welcome page"
+            href="http://jakarta.apache.org/struts/doc-1.0.2/index.html"
+            />
+        <item 
+        	name="User Guide"
+            href="http://jakarta.apache.org/struts/doc-1.0.2/userGuide/index.html"
+            />
+        <item 
+        	name="Javadoc"
+            href="http://jakarta.apache.org/struts/doc-1.0.2/api/index.html"
+            />
+        <item 
+        	name="Release Notes"
+            href="http://jakarta.apache.org/struts/doc-1.0.2/release-notes-1.0.2.html"
+            />
+        <item 
+        	name="Installation"
+            href="http://jakarta.apache.org/struts/doc-1.0.2/installation.html"
+            />
+    </menu>
+
+
+</project>
+
+
+
+
+
+
diff -Nurb contrib.orig/wml/doc/stylesheets/faqs.xsl contrib/wml/doc/stylesheets/faqs.xsl
--- contrib.orig/wml/doc/stylesheets/faqs.xsl	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/stylesheets/faqs.xsl	2003-01-07 00:57:36.000000000 -0500
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Content Stylesheet for Struts User's Guide -->
+<!-- $Id: faqs.xsl,v 1.3 2003/01/07 05:57:36 martinc Exp $ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+
+  <!-- Output method -->
+  <xsl:output method="html" indent="no"/>
+  
+
+  <!-- Defined variables -->
+  <xsl:variable name="body-bg"   select="'#ffffff'"/>
+  <xsl:variable name="body-fg"   select="'#000000'"/>
+  <xsl:variable name="body-link" select="'#023264'"/>
+  <xsl:variable name="banner-bg" select="'#023264'"/>
+  <xsl:variable name="banner-fg" select="'#ffffff'"/>
+
+
+  <!-- Process an entire document into an HTML page -->
+  <xsl:template match="document">
+    <xsl:variable name="project"
+                select="document('../faqs/project.xml')/project"/>
+    <html>
+    <head>
+
+    <xsl:for-each select="properties/author">
+    <xsl:variable name="author">
+      <xsl:value-of select="."/>
+    </xsl:variable>
+    <meta name="author" content="{$author}"/>
+    </xsl:for-each>
+
+    <!-- <link rel="stylesheet" type="text/css" href="default.css"/> -->
+    <xsl:choose>
+      <xsl:when test="properties/title">
+        <title><xsl:value-of select="properties/title"/></title>
+      </xsl:when>
+      <xsl:when test="body/title">
+        <title><xsl:value-of select="body/title"/></title>
+      </xsl:when>
+      <xsl:otherwise>
+        <title><xsl:value-of select="$project/title"/></title>
+      </xsl:otherwise>
+    </xsl:choose>
+    </head>
+
+    <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
+          alink="{$body-link}" vlink="{$body-link}">
+ 
+    <table border="0" width="100%" cellspacing="5">
+
+      <tr><td colspan="2">
+        <a href="http://jakarta.apache.org">
+        <img src="../images/jakarta-logo.gif" align="left" border="0"/>
+        </a>
+        <a href="http://jakarta.apache.org/struts">
+        <img src="../images/struts.gif" align="right" border="0"/>
+        </a>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr>
+        <td width="120" valign="top">
+          <xsl:apply-templates select="$project"/>
+        </td>
+
+        <td valign="top">
+          <xsl:apply-templates select="body"/>
+        </td>
+      </tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <div align="center"><font color="{$body-link}" size="-1"><em>
+        Copyright (c) 2000-2003, Apache Software Foundation
+        </em></font></div>
+        <img src="../images/struts-power.gif" align="right" border="0"/>
+      </td></tr>
+
+    </table>
+    </body>
+    </html>
+
+  </xsl:template>
+
+
+  <!-- Process the project element for the navigation bar -->
+  <xsl:template match="project">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+
+  <!-- Process an entire chapter (assumes one chapter per page) -->
+  <xsl:template match="chapter">
+    <xsl:element name="a">
+      <xsl:attribute name="name">
+        <xsl:value-of select="@href" />
+      </xsl:attribute>
+    </xsl:element>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td><p>Contributors: </p><ul>
+    <xsl:for-each select="/document/properties/author">
+    <li><xsl:value-of select="."/></li>
+    </xsl:for-each>
+    </ul>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="section" />
+  </xsl:template>
+
+
+  <!-- Process a menu for the navigation bar -->
+  <xsl:template match="menu">
+    <table border="0" cellspacing="5">
+      <tr>
+        <th colspan="2" align="left">
+          <font color="{$body-link}"><strong>
+            <xsl:value-of select="@name"/>
+          </strong></font>
+        </th>
+      </tr>
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a menu item for the navigation bar -->
+  <xsl:template match="item">
+    <tr>
+      <td align="center" width="15"></td>
+      <td>
+        <font size="-1">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a href="{$href}"><xsl:value-of select="@name"/></a>
+        </font>
+      </td>
+    </tr>
+  </xsl:template>
+
+
+  <!-- Process a documentation section -->
+  <xsl:template match="section">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates/>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a tag library section -->
+  <xsl:template match="taglib">
+    <table border="0" cellspacing="5" cellpadding="5" width="98%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="display-name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="2" cellpadding="2">
+            <tr>
+              <th width="15%"><a name="index"></a>Tag Name</th>
+              <th>Description</th>
+            </tr>
+            <xsl:for-each select="tag">
+              <xsl:sort select="name"/>
+              <tr>
+                <td align="center">
+                  <xsl:variable name="name">
+                    <xsl:value-of select="name"/>
+                  </xsl:variable>
+                  <a href="#{$name}"><xsl:value-of select="name"/></a>
+                </td>
+                <td>
+                  <xsl:value-of select="summary"/>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="tag">
+      <xsl:sort select="name"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
+  <!-- Process an individual tag -->
+  <xsl:template match="tag">
+    <xsl:variable name="name">
+      <xsl:value-of select="name"/>
+    </xsl:variable>
+    <a name="{$name}"></a>
+    <table border="0" cellspacing="2" cellpadding="2">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif">
+          <strong><xsl:value-of select="name"/></strong> -
+          <xsl:value-of select="summary"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:if test="deprecated">
+            <p><font color="red"><strong>DEPRECATED: </strong></font>
+            <xsl:value-of select="deprecated"/></p>
+          </xsl:if>
+          <xsl:if test="since">
+            <p>Since:  <xsl:value-of select="since"/></p>
+          </xsl:if>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <xsl:if test="not(@document-attributes)">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+      <xsl:if test="@document-attributes='true'">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+    </table>
+    <p><a href="#index">Back to top</a></p>
+  </xsl:template>
+
+
+  <!-- Create the table of documentation for a tag -->
+  <xsl:template name="document-tag-attributes">
+    <tr><td>
+      <blockquote>
+        <table border="1" cellspacing="2" cellpadding="2">
+          <tr>
+            <th width="15%">Attribute Name</th>
+            <th>Description</th>
+          </tr>
+          <xsl:for-each select="attribute">
+            <xsl:sort select="name"/>
+            <tr>
+              <td align="center">
+                <xsl:value-of select="name"/>
+              </td>
+              <td>
+                <xsl:if test="deprecated">
+                  <p><font color="red"><strong>DEPRECATED: </strong></font>
+                  <xsl:value-of select="deprecated"/></p>
+                </xsl:if>
+                <xsl:if test="since">
+                  <p>Since:  <xsl:value-of select="since"/></p>
+                </xsl:if>
+                <xsl:apply-templates select="info"/>
+                <xsl:variable name="required">
+                  <xsl:value-of select="required"/>
+                </xsl:variable>
+                <xsl:if test="default">
+                  [<xsl:value-of select="default"/>]
+                </xsl:if>
+                <xsl:if test="required='true'">
+                  (REQUIRED)
+                </xsl:if>
+                <xsl:if test="rtexprvalue='true'">
+                  (RT EXPR)
+                </xsl:if>
+              </td>
+            </tr>
+          </xsl:for-each>
+        </table>
+      </blockquote>
+    </td></tr>
+  </xsl:template>
+
+
+  <!-- Process everything else by just passing it through -->
+  <xsl:template match="*|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()"/>
+    </xsl:copy>
+  </xsl:template>
+
+
+</xsl:stylesheet>
diff -Nurb contrib.orig/wml/doc/stylesheets/news.xsl contrib/wml/doc/stylesheets/news.xsl
--- contrib.orig/wml/doc/stylesheets/news.xsl	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/stylesheets/news.xsl	2003-01-07 00:57:36.000000000 -0500
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Content Stylesheet for Struts User's Guide -->
+<!-- $Id: news.xsl,v 1.3 2003/01/07 05:57:36 martinc Exp $ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+
+  <!-- Output method -->
+  <xsl:output method="html" indent="no"/>
+  
+
+  <!-- Defined variables -->
+  <xsl:variable name="body-bg"   select="'#ffffff'"/>
+  <xsl:variable name="body-fg"   select="'#000000'"/>
+  <xsl:variable name="body-link" select="'#023264'"/>
+  <xsl:variable name="banner-bg" select="'#023264'"/>
+  <xsl:variable name="banner-fg" select="'#ffffff'"/>
+
+
+  <!-- Process an entire document into an HTML page -->
+  <xsl:template match="document">
+    <xsl:variable name="project"
+                select="document('../news/project.xml')/project"/>
+    <html>
+    <head>
+
+    <xsl:for-each select="properties/author">
+    <xsl:variable name="author">
+      <xsl:value-of select="."/>
+    </xsl:variable>
+    <meta name="author" content="{$author}"/>
+    </xsl:for-each>
+
+    <!-- <link rel="stylesheet" type="text/css" href="default.css"/> -->
+    <xsl:choose>
+      <xsl:when test="properties/title">
+        <title><xsl:value-of select="properties/title"/></title>
+      </xsl:when>
+      <xsl:when test="body/title">
+        <title><xsl:value-of select="body/title"/></title>
+      </xsl:when>
+      <xsl:otherwise>
+        <title><xsl:value-of select="$project/title"/></title>
+      </xsl:otherwise>
+    </xsl:choose>
+    </head>
+
+    <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
+          alink="{$body-link}" vlink="{$body-link}">
+ 
+    <table border="0" width="100%" cellspacing="5">
+
+      <tr><td colspan="2">
+        <a href="http://jakarta.apache.org">
+        <img src="../images/jakarta-logo.gif" align="left" border="0"/>
+        </a>
+        <a href="http://jakarta.apache.org/struts">
+        <img src="../images/struts.gif" align="right" border="0"/>
+        </a>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr>
+        <td width="120" valign="top">
+          <xsl:apply-templates select="$project"/>
+        </td>
+
+        <td valign="top">
+          <xsl:apply-templates select="body"/>
+        </td>
+      </tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <div align="center"><font color="{$body-link}" size="-1"><em>
+        Copyright (c) 2000-2003, Apache Software Foundation
+        </em></font></div>
+        <img src="../images/struts-power.gif" align="right" border="0"/>
+      </td></tr>
+
+    </table>
+    </body>
+    </html>
+
+  </xsl:template>
+
+
+  <!-- Process the project element for the navigation bar -->
+  <xsl:template match="project">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+
+  <!-- Process an entire chapter (assumes one chapter per page) -->
+  <xsl:template match="chapter">
+    <xsl:element name="a">
+      <xsl:attribute name="name">
+        <xsl:value-of select="@href" />
+      </xsl:attribute>
+    </xsl:element>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td><p>Contributors: </p><ul>
+    <xsl:for-each select="/document/properties/author">
+    <li><xsl:value-of select="."/></li>
+    </xsl:for-each>
+    </ul>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="section" />
+  </xsl:template>
+
+
+  <!-- Process a menu for the navigation bar -->
+  <xsl:template match="menu">
+    <table border="0" cellspacing="5">
+      <tr>
+        <th colspan="2" align="left">
+          <font color="{$body-link}"><strong>
+            <xsl:value-of select="@name"/>
+          </strong></font>
+        </th>
+      </tr>
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a menu item for the navigation bar -->
+  <xsl:template match="item">
+    <tr>
+      <td align="center" width="15"></td>
+      <td>
+        <font size="-1">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a href="{$href}"><xsl:value-of select="@name"/></a>
+        </font>
+      </td>
+    </tr>
+  </xsl:template>
+
+
+  <!-- Process a documentation section -->
+  <xsl:template match="section">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates/>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a tag library section -->
+  <xsl:template match="taglib">
+    <table border="0" cellspacing="5" cellpadding="5" width="98%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="display-name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="2" cellpadding="2">
+            <tr>
+              <th width="15%"><a name="index"></a>Tag Name</th>
+              <th>Description</th>
+            </tr>
+            <xsl:for-each select="tag">
+              <xsl:sort select="name"/>
+              <tr>
+                <td align="center">
+                  <xsl:variable name="name">
+                    <xsl:value-of select="name"/>
+                  </xsl:variable>
+                  <a href="#{$name}"><xsl:value-of select="name"/></a>
+                </td>
+                <td>
+                  <xsl:value-of select="summary"/>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="tag">
+      <xsl:sort select="name"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
+  <!-- Process an individual tag -->
+  <xsl:template match="tag">
+    <xsl:variable name="name">
+      <xsl:value-of select="name"/>
+    </xsl:variable>
+    <a name="{$name}"></a>
+    <table border="0" cellspacing="2" cellpadding="2">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif">
+          <strong><xsl:value-of select="name"/></strong> -
+          <xsl:value-of select="summary"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:if test="deprecated">
+            <p><font color="red"><strong>DEPRECATED: </strong></font>
+            <xsl:value-of select="deprecated"/></p>
+          </xsl:if>
+          <xsl:if test="since">
+            <p>Since:  <xsl:value-of select="since"/></p>
+          </xsl:if>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <xsl:if test="not(@document-attributes)">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+      <xsl:if test="@document-attributes='true'">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+    </table>
+    <p><a href="#index">Back to top</a></p>
+  </xsl:template>
+
+
+  <!-- Create the table of documentation for a tag -->
+  <xsl:template name="document-tag-attributes">
+    <tr><td>
+      <blockquote>
+        <table border="1" cellspacing="2" cellpadding="2">
+          <tr>
+            <th width="15%">Attribute Name</th>
+            <th>Description</th>
+          </tr>
+          <xsl:for-each select="attribute">
+            <xsl:sort select="name"/>
+            <tr>
+              <td align="center">
+                <xsl:value-of select="name"/>
+              </td>
+              <td>
+                <xsl:if test="deprecated">
+                  <p><font color="red"><strong>DEPRECATED: </strong></font>
+                  <xsl:value-of select="deprecated"/></p>
+                </xsl:if>
+                <xsl:if test="since">
+                  <p>Since:  <xsl:value-of select="since"/></p>
+                </xsl:if>
+                <xsl:apply-templates select="info"/>
+                <xsl:variable name="required">
+                  <xsl:value-of select="required"/>
+                </xsl:variable>
+                <xsl:if test="default">
+                  [<xsl:value-of select="default"/>]
+                </xsl:if>
+                <xsl:if test="required='true'">
+                  (REQUIRED)
+                </xsl:if>
+                <xsl:if test="rtexprvalue='true'">
+                  (RT EXPR)
+                </xsl:if>
+              </td>
+            </tr>
+          </xsl:for-each>
+        </table>
+      </blockquote>
+    </td></tr>
+  </xsl:template>
+
+
+  <!-- Process everything else by just passing it through -->
+  <xsl:template match="*|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()"/>
+    </xsl:copy>
+  </xsl:template>
+
+
+</xsl:stylesheet>
diff -Nurb contrib.orig/wml/doc/stylesheets/proposals.xsl contrib/wml/doc/stylesheets/proposals.xsl
--- contrib.orig/wml/doc/stylesheets/proposals.xsl	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/stylesheets/proposals.xsl	2003-01-07 00:57:36.000000000 -0500
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Content Stylesheet for Struts User's Guide -->
+<!-- $Id: proposals.xsl,v 1.3 2003/01/07 05:57:36 martinc Exp $ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+
+  <!-- Output method -->
+  <xsl:output method="html" indent="no"/>
+  
+
+  <!-- Defined variables -->
+  <xsl:variable name="body-bg"   select="'#ffffff'"/>
+  <xsl:variable name="body-fg"   select="'#000000'"/>
+  <xsl:variable name="body-link" select="'#023264'"/>
+  <xsl:variable name="banner-bg" select="'#023264'"/>
+  <xsl:variable name="banner-fg" select="'#ffffff'"/>
+
+
+  <!-- Process an entire document into an HTML page -->
+  <xsl:template match="document">
+    <xsl:variable name="project"
+                select="document('../proposals/project.xml')/project"/>
+    <html>
+    <head>
+    <meta name="author" content="{properties/author/.}"/>
+    <!-- <link rel="stylesheet" type="text/css" href="default.css"/> -->
+    <xsl:choose>
+      <xsl:when test="properties/title">
+        <title><xsl:value-of select="properties/title"/></title>
+      </xsl:when>
+      <xsl:when test="body/title">
+        <title><xsl:value-of select="body/title"/></title>
+      </xsl:when>
+      <xsl:otherwise>
+        <title><xsl:value-of select="$project/title"/></title>
+      </xsl:otherwise>
+    </xsl:choose>
+    </head>
+
+    <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
+          alink="{$body-link}" vlink="{$body-link}">
+
+    <table border="0" width="100%" cellspacing="5">
+
+      <tr><td colspan="2">
+        <a href="http://jakarta.apache.org">
+        <img src="../images/jakarta-logo.gif" align="left" border="0"/>
+        </a>
+        <a href="http://jakarta.apache.org/struts">
+        <img src="../images/struts.gif" align="right" border="0"/>
+        </a>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr>
+        <td width="120" valign="top">
+          <xsl:apply-templates select="$project"/>
+        </td>
+
+        <td valign="top">
+          <xsl:apply-templates select="body"/>
+        </td>
+      </tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <div align="center"><font color="{$body-link}" size="-1">Struts Nightly Build<br/>
+        <em>
+        Copyright (c) 2000-2003, Apache Software Foundation
+        </em></font></div>
+        <img src="../images/struts-power.gif" align="right" border="0"/>
+      </td></tr>
+
+    </table>
+    </body>
+    </html>
+
+  </xsl:template>
+
+
+  <!-- Process the project element for the navigation bar -->
+  <xsl:template match="project">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+
+  <!-- Process an entire chapter (assumes one chapter per page) -->
+  <xsl:template match="chapter">
+    <xsl:element name="a">
+      <xsl:attribute name="name">
+        <xsl:value-of select="@href" />
+      </xsl:attribute>
+    </xsl:element>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="section" />
+  </xsl:template>
+
+
+  <!-- Process a menu for the navigation bar -->
+  <xsl:template match="menu">
+    <table border="0" cellspacing="5">
+      <tr>
+        <th colspan="2" align="left">
+          <font color="{$body-link}"><strong>
+            <xsl:value-of select="@name"/>
+          </strong></font>
+        </th>
+      </tr>
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a menu item for the navigation bar -->
+  <xsl:template match="item">
+    <tr>
+      <td align="center" width="15"></td>
+      <td>
+        <font size="-1">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a href="{$href}"><xsl:value-of select="@name"/></a>
+        </font>
+      </td>
+    </tr>
+  </xsl:template>
+
+
+  <!-- Process a documentation section -->
+  <xsl:template match="section">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates/>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a tag library section -->
+  <xsl:template match="taglib">
+    <table border="0" cellspacing="5" cellpadding="5" width="98%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="display-name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="2" cellpadding="2">
+            <tr>
+              <th width="15%">Tag Name</th>
+              <th>Description</th>
+            </tr>
+            <xsl:for-each select="tag">
+              <tr>
+                <td align="center">
+                  <xsl:variable name="name">
+                    <xsl:value-of select="name"/>
+                  </xsl:variable>
+                  <a href="#{$name}"><xsl:value-of select="name"/></a>
+                </td>
+                <td>
+                  <xsl:value-of select="summary"/>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="tag"/>
+  </xsl:template>
+
+  <!-- Process an individual tag -->
+  <xsl:template match="tag">
+    <xsl:variable name="name">
+      <xsl:value-of select="name"/>
+    </xsl:variable>
+    <a name="{$name}"></a>
+    <table border="0" cellspacing="2" cellpadding="2">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif">
+          <strong><xsl:value-of select="name"/></strong> -
+          <xsl:value-of select="summary"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="2" cellpadding="2">
+            <tr>
+              <th width="15%">Attribute Name</th>
+              <th>Description</th>
+            </tr>
+            <xsl:for-each select="attribute">
+              <tr>
+                <td align="center">
+                  <xsl:value-of select="name"/>
+                </td>
+                <td>
+                  <xsl:apply-templates select="info"/>
+                  <xsl:variable name="required">
+                    <xsl:value-of select="required"/>
+                  </xsl:variable>
+                  <xsl:if test="required='true'">
+                    [Required]
+                  </xsl:if>
+                  <xsl:if test="rtexprvalue='true'">
+                    [RT Expr]
+                  </xsl:if>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+  <!-- Process an individual paragraph -->
+  <xsl:template match="p">
+    <p><xsl:apply-templates/><br/></p>
+  </xsl:template>
+
+  <!-- Process a task list section -->
+  <xsl:template match="task-list">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <xsl:value-of select="@name"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <xsl:apply-templates select="info"/>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="5" cellpadding="5" width="100%">
+            <tr>
+              <th width="75%">Description</th>
+              <th width="25%">Volunteer</th>
+            </tr>
+            <xsl:apply-templates select="task"/>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+  <!-- Process an individual task (in a TODO list) -->
+  <xsl:template match="task">
+    <tr>
+      <td>
+        <xsl:choose>
+          <xsl:when test="@name">
+            <em><xsl:value-of select="@name"/></em>.
+          </xsl:when>
+        </xsl:choose>
+        <xsl:value-of select="info"/>
+      </td>
+      <td><xsl:value-of select="assigned"/></td>
+    </tr>
+  </xsl:template>
+
+  <!-- Process everything else by just passing it through -->
+  <xsl:template match="*|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()"/>
+    </xsl:copy>
+  </xsl:template>
+
+
+</xsl:stylesheet>
diff -Nurb contrib.orig/wml/doc/stylesheets/resources.xsl contrib/wml/doc/stylesheets/resources.xsl
--- contrib.orig/wml/doc/stylesheets/resources.xsl	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/stylesheets/resources.xsl	2003-01-07 00:57:36.000000000 -0500
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Content Stylesheet for Struts Resources  -->
+<!-- $Id: resources.xsl,v 1.3 2003/01/07 05:57:36 martinc Exp $ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+
+  <!-- Output method -->
+  <xsl:output method="html" indent="no"/>
+  
+
+  <!-- Defined variables -->
+  <xsl:variable name="body-bg"   select="'#ffffff'"/>
+  <xsl:variable name="body-fg"   select="'#000000'"/>
+  <xsl:variable name="body-link" select="'#023264'"/>
+  <xsl:variable name="banner-bg" select="'#023264'"/>
+  <xsl:variable name="banner-fg" select="'#ffffff'"/>
+
+
+  <!-- Process an entire document into an HTML page -->
+  <xsl:template match="document">
+    <xsl:variable name="project"
+                select="document('../resources/project.xml')/project"/>
+    <html>
+    <head>
+    <meta name="author" content="{properties/author/.}"/>
+    <!-- <link rel="stylesheet" type="text/css" href="default.css"/> -->
+    <xsl:choose>
+      <xsl:when test="properties/title">
+        <title><xsl:value-of select="properties/title"/></title>
+      </xsl:when>
+      <xsl:when test="body/title">
+        <title><xsl:value-of select="body/title"/></title>
+      </xsl:when>
+      <xsl:otherwise>
+        <title><xsl:value-of select="$project/title"/></title>
+      </xsl:otherwise>
+    </xsl:choose>
+    </head>
+
+    <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
+          alink="{$body-link}" vlink="{$body-link}">
+
+    <table border="0" width="100%" cellspacing="5">
+
+      <tr><td colspan="2">
+        <a href="http://jakarta.apache.org">
+        <img src="../images/jakarta-logo.gif" align="left" border="0"/>
+        </a>
+        <a href="http://jakarta.apache.org/struts">
+        <img src="../images/struts.gif" align="right" border="0"/>
+        </a>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr>
+        <td width="120" valign="top">
+          <xsl:apply-templates select="$project"/>
+        </td>
+
+        <td valign="top">
+          <xsl:apply-templates select="body"/>
+        </td>
+      </tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <div align="center"><font color="{$body-link}" size="-1"><em>
+        Copyright (c) 2000-2003, Apache Software Foundation
+        </em></font></div>
+        <img src="../images/struts-power.gif" align="right" border="0"/>
+      </td></tr>
+
+    </table>
+    </body>
+    </html>
+
+  </xsl:template>
+
+
+  <!-- Process the project element for the navigation bar -->
+  <xsl:template match="project">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+
+  <!-- Process an entire chapter (assumes one chapter per page) -->
+  <xsl:template match="chapter">
+    <xsl:element name="a">
+      <xsl:attribute name="name">
+        <xsl:value-of select="@href" />
+      </xsl:attribute>
+    </xsl:element>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="section" />
+  </xsl:template>
+
+
+  <!-- Process a menu for the navigation bar -->
+  <xsl:template match="menu">
+    <table border="0" cellspacing="5">
+      <tr>
+        <th colspan="2" align="left">
+          <font color="{$body-link}"><strong>
+            <xsl:value-of select="@name"/>
+          </strong></font>
+        </th>
+      </tr>
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a menu item for the navigation bar -->
+  <xsl:template match="item">
+    <tr>
+      <td align="center" width="15"></td>
+      <td>
+        <font size="-1">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a href="{$href}"><xsl:value-of select="@name"/></a>
+        </font>
+      </td>
+    </tr>
+  </xsl:template>
+
+
+  <!-- Process a documentation section -->
+  <xsl:template match="section">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates/>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a tag library section -->
+  <xsl:template match="taglib">
+    <table border="0" cellspacing="5" cellpadding="5" width="98%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="display-name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="2" cellpadding="2">
+            <tr>
+              <th width="15%">Tag Name</th>
+              <th>Description</th>
+            </tr>
+            <xsl:for-each select="tag">
+              <tr>
+                <td align="center">
+                  <xsl:variable name="name">
+                    <xsl:value-of select="name"/>
+                  </xsl:variable>
+                  <a href="#{$name}"><xsl:value-of select="name"/></a>
+                </td>
+                <td>
+                  <xsl:value-of select="summary"/>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="tag"/>
+  </xsl:template>
+
+  <!-- Process an individual tag -->
+  <xsl:template match="tag">
+    <xsl:variable name="name">
+      <xsl:value-of select="name"/>
+    </xsl:variable>
+    <a name="{$name}"></a>
+    <table border="0" cellspacing="2" cellpadding="2">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif">
+          <strong><xsl:value-of select="name"/></strong> -
+          <xsl:value-of select="summary"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <xsl:if test="not(@document-attributes)">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+      <xsl:if test="@document-attributes='true'">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+    </table>
+  </xsl:template>
+
+
+  <!-- Create the table of documentation for a tag -->
+  <xsl:template name="document-tag-attributes">
+    <tr><td>
+      <blockquote>
+        <table border="1" cellspacing="2" cellpadding="2">
+          <tr>
+            <th width="15%">Attribute Name</th>
+            <th>Description</th>
+          </tr>
+          <xsl:for-each select="attribute">
+            <tr>
+              <td align="center">
+                <xsl:value-of select="name"/>
+              </td>
+              <td>
+                <xsl:apply-templates select="info"/>
+                <xsl:variable name="required">
+                  <xsl:value-of select="required"/>
+                </xsl:variable>
+                <xsl:if test="required='true'">
+                  [Required]
+                </xsl:if>
+                <xsl:if test="rtexprvalue='true'">
+                  [RT Expr]
+                </xsl:if>
+              </td>
+            </tr>
+          </xsl:for-each>
+        </table>
+      </blockquote>
+    </td></tr>
+  </xsl:template>
+
+
+  <!-- Process everything else by just passing it through -->
+  <xsl:template match="*|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()"/>
+    </xsl:copy>
+  </xsl:template>
+
+
+</xsl:stylesheet>
diff -Nurb contrib.orig/wml/doc/stylesheets/struts.xsl contrib/wml/doc/stylesheets/struts.xsl
--- contrib.orig/wml/doc/stylesheets/struts.xsl	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/stylesheets/struts.xsl	2003-01-07 00:57:36.000000000 -0500
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Content Stylesheet for Struts Documentation -->
+<!-- $Id: struts.xsl,v 1.8 2003/01/07 05:57:36 martinc Exp $ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+  <!-- Output method -->
+  <xsl:output method="html" indent="no"/>
+
+  <!-- Defined variables -->
+  <xsl:variable name="body-bg"   select="'#ffffff'"/>
+  <xsl:variable name="body-fg"   select="'#000000'"/>
+  <xsl:variable name="body-link" select="'#023264'"/>
+  <xsl:variable name="banner-bg" select="'#023264'"/>
+  <xsl:variable name="banner-fg" select="'#ffffff'"/>
+
+  <!-- Process an entire document into an HTML page -->
+  <xsl:template match="document">
+    <xsl:variable name="project"
+                select="document('../project.xml')/project"/>
+
+    <html>
+    <head>
+    <meta name="author" content="{properties/author/.}"/>
+    <!-- <link rel="stylesheet" type="text/css" href="default.css"/> -->
+    <xsl:choose>
+      <xsl:when test="properties/title">
+        <title><xsl:value-of select="properties/title"/></title>
+      </xsl:when>
+      <xsl:when test="body/title">
+        <title><xsl:value-of select="body/title"/></title>
+      </xsl:when>
+      <xsl:otherwise>
+        <title><xsl:value-of select="$project/title"/></title>
+      </xsl:otherwise>
+    </xsl:choose>
+    </head>
+
+    <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
+          alink="{$body-link}" vlink="{$body-link}">
+
+    <table border="0" width="100%" cellspacing="5">
+
+      <tr><td colspan="2">
+        <a href="http://jakarta.apache.org">
+        <img src="images/jakarta-logo.gif" align="left" border="0"/>
+        </a>
+        <a href="http://jakarta.apache.org/struts">
+        <img src="images/struts.gif" align="right" border="0"/>
+        </a>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr>
+        <td width="120" valign="top">
+          <xsl:apply-templates select="$project"/>
+        </td>
+
+        <td valign="top">
+          <xsl:apply-templates select="body"/>
+        </td>
+      </tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <div align="center"><font color="{$body-link}" size="-1"><em>
+        Copyright (c) 2000-2003, Apache Software Foundation
+        </em></font></div>
+        <img src="images/struts-power.gif" align="right" border="0"/>
+      </td></tr>
+
+    </table>
+    </body>
+    </html>
+
+  </xsl:template>
+
+  <!-- Process the project element for the navigation bar -->
+  <xsl:template match="project">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <!-- Process a menu for the navigation bar -->
+  <xsl:template match="menu">
+    <table border="0" cellspacing="5">
+      <tr>
+        <th colspan="2" align="left">
+          <font color="{$body-link}"><strong>
+            <xsl:value-of select="@name"/>
+          </strong></font>
+        </th>
+      </tr>
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a menu item for the navigation bar -->
+  <xsl:template match="item">
+    <tr>
+      <td align="center" width="15"></td>
+      <td>
+        <font size="-1">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a href="{$href}"><xsl:value-of select="@name"/></a>
+        </font>
+      </td>
+    </tr>
+  </xsl:template>
+
+
+  <!-- Process a document body -->
+  <xsl:template match="body">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+
+  <!-- Process a documentation section -->
+  <xsl:template match="section">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates/>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+  <!-- Process a documentation subsection -->
+  <xsl:template match="subsection">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates/>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+  <!-- Process a tag library section -->
+  <xsl:template match="taglib">
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="display-name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="2" cellpadding="2">
+            <tr>
+              <th width="15%">Tag Name</th>
+              <th>Description</th>
+            </tr>
+            <xsl:for-each select="tag">
+              <tr>
+                <td align="center">
+                  <xsl:variable name="name">
+                    <xsl:value-of select="name"/>
+                  </xsl:variable>
+                  <a href="#{$name}"><xsl:value-of select="name"/></a>
+                </td>
+                <td>
+                  <xsl:value-of select="summary"/>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="tag"/>
+  </xsl:template>
+
+  <!-- Process an individual tag -->
+  <xsl:template match="tag">
+    <xsl:variable name="name">
+      <xsl:value-of select="name"/>
+    </xsl:variable>
+    <a name="{$name}"></a>
+    <table border="0" cellspacing="2" cellpadding="2">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif">
+          <strong><xsl:value-of select="name"/></strong> -
+          <xsl:value-of select="summary"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <xsl:if test="not(@document-attributes)">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+      <xsl:if test="@document-attributes='true'">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+    </table>
+  </xsl:template>
+
+  <!-- Create the table of documentation for a tag -->
+  <xsl:template name="document-tag-attributes">
+    <tr><td>
+      <blockquote>
+        <table border="1" cellspacing="2" cellpadding="2">
+          <tr>
+            <th width="15%">Attribute Name</th>
+            <th>Description</th>
+          </tr>
+          <xsl:for-each select="attribute">
+            <tr>
+              <td align="center">
+                <xsl:value-of select="name"/>
+              </td>
+              <td>
+                <xsl:apply-templates select="info"/>
+                <xsl:variable name="required">
+                  <xsl:value-of select="required"/>
+                </xsl:variable>
+                <xsl:if test="required='true'">
+                  [Required]
+                </xsl:if>
+                <xsl:if test="rtexprvalue='true'">
+                  [RT Expr]
+                </xsl:if>
+              </td>
+            </tr>
+          </xsl:for-each>
+        </table>
+      </blockquote>
+    </td></tr>
+  </xsl:template>
+
+
+  <!-- Process an individual paragraph -->
+  <xsl:template match="p">
+    <p><xsl:apply-templates/><br/></p>
+  </xsl:template>
+
+
+  <!-- Process a task list section -->
+  <xsl:template match="task-list">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <xsl:value-of select="@name"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <xsl:apply-templates select="info"/>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="5" cellpadding="5" width="100%">
+            <tr>
+              <th width="75%">Description</th>
+              <th width="25%">Volunteer</th>
+            </tr>
+            <xsl:apply-templates select="task"/>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+  <!-- Process an individual task (in a TODO list) -->
+  <xsl:template match="task">
+    <tr>
+      <td>
+        <xsl:choose>
+          <xsl:when test="@name">
+            <em><xsl:value-of select="@name"/></em>.
+          </xsl:when>
+        </xsl:choose>
+        <xsl:value-of select="info"/>
+      </td>
+      <td><xsl:value-of select="assigned"/></td>
+    </tr>
+  </xsl:template>
+
+  <!-- Process everything else by just passing it through -->
+  <xsl:template match="*|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff -Nurb contrib.orig/wml/doc/stylesheets/tiles.xsl contrib/wml/doc/stylesheets/tiles.xsl
--- contrib.orig/wml/doc/stylesheets/tiles.xsl	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/stylesheets/tiles.xsl	2002-07-05 22:36:04.000000000 -0400
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Content Stylesheet for Struts Documentation -->
+<!-- $Id: tiles.xsl,v 1.1 2002/07/06 01:36:04 craigmcc Exp $ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+  <!-- Output method -->
+  <xsl:output method="html" indent="no"/>
+
+  <!-- Defined variables -->
+  <xsl:variable name="body-bg"   select="'#ffffff'"/>
+  <xsl:variable name="body-fg"   select="'#000000'"/>
+  <xsl:variable name="body-link" select="'#023264'"/>
+  <xsl:variable name="banner-bg" select="'#023264'"/>
+  <xsl:variable name="banner-fg" select="'#ffffff'"/>
+
+  <!-- Process an entire document into an HTML page -->
+  <xsl:template match="document">
+    <xsl:variable name="project"
+                select="document('../project.xml')/project"/>
+
+
+    <table border="0" width="100%" cellspacing="5">
+
+      <tr>
+        <td valign="top">
+          <xsl:apply-templates select="body"/>
+        </td>
+      </tr>
+
+    </table>
+  </xsl:template>
+
+  <!-- Process a menu for the navigation bar -->
+  <xsl:template match="menu">
+    <table border="0" cellspacing="5">
+      <tr>
+        <th colspan="2" align="left">
+          <font color="{body-link}"><strong>
+            <xsl:value-of select="@name"/>
+          </strong></font>
+        </th>
+      </tr>
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a menu item for the navigation bar -->
+  <xsl:template match="item">
+    <tr>
+      <td align="center" width="15"></td>
+      <td>
+        <font size="-1">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a href="{$href}"><xsl:value-of select="@name"/></a>
+        </font>
+      </td>
+    </tr>
+  </xsl:template>
+
+  <!-- Process a documentation section -->
+  <xsl:template match="section">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates/>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+  <!-- Process a tag library section -->
+  <xsl:template match="taglib">
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="display-name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="2" cellpadding="2">
+            <tr>
+              <th width="15%">Tag Name</th>
+              <th>Description</th>
+            </tr>
+            <xsl:for-each select="tag">
+              <tr>
+                <td align="center">
+                  <xsl:variable name="name">
+                    <xsl:value-of select="name"/>
+                  </xsl:variable>
+                  <a href="#{$name}"><xsl:value-of select="name"/></a>
+                </td>
+                <td>
+                  <xsl:value-of select="summary"/>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="tag"/>
+  </xsl:template>
+
+  <!-- Process an individual tag -->
+  <xsl:template match="tag">
+    <xsl:variable name="name">
+      <xsl:value-of select="name"/>
+    </xsl:variable>
+    <a name="{$name}"></a>
+    <table border="0" cellspacing="2" cellpadding="2">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif">
+          <strong><xsl:value-of select="name"/></strong> -
+          <xsl:value-of select="summary"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="2" cellpadding="2">
+            <tr>
+              <th width="15%">Attribute Name</th>
+              <th>Description</th>
+            </tr>
+            <xsl:for-each select="attribute">
+              <tr>
+                <td align="center">
+                  <xsl:value-of select="name"/>
+                </td>
+                <td>
+                  <xsl:apply-templates select="info"/>
+                  <xsl:variable name="required">
+                    <xsl:value-of select="required"/>
+                  </xsl:variable>
+                  <xsl:if test="required='true'">
+                    [Required]
+                  </xsl:if>
+                  <xsl:if test="rtexprvalue='true'">
+                    [RT Expr]
+                  </xsl:if>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process an individual paragraph -->
+  <xsl:template match="p">
+    <p><xsl:apply-templates/><br/></p>
+  </xsl:template>
+
+
+  <!-- Process a task list section -->
+  <xsl:template match="task-list">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <xsl:value-of select="@name"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <xsl:apply-templates select="info"/>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="5" cellpadding="5" width="100%">
+            <tr>
+              <th width="75%">Description</th>
+              <th width="25%">Volunteer</th>
+            </tr>
+            <xsl:apply-templates select="task"/>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+  <!-- Process an individual task (in a TODO list) -->
+  <xsl:template match="task">
+    <tr>
+      <td>
+        <xsl:choose>
+          <xsl:when test="@name">
+            <em><xsl:value-of select="@name"/></em>.
+          </xsl:when>
+        </xsl:choose>
+        <xsl:value-of select="info"/>
+      </td>
+      <td><xsl:value-of select="assigned"/></td>
+    </tr>
+  </xsl:template>
+
+  <!-- Process everything else by just passing it through -->
+  <xsl:template match="*|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff -Nurb contrib.orig/wml/doc/stylesheets/tld.xsl contrib/wml/doc/stylesheets/tld.xsl
--- contrib.orig/wml/doc/stylesheets/tld.xsl	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/stylesheets/tld.xsl	2001-03-18 12:49:00.000000000 -0500
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Convert Tag Library Documentation into Tag Library Descriptor -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+  <!-- Output method and formatting -->
+  <xsl:output
+             method="xml"
+             indent="yes"
+     doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+     doctype-system="http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"/>
+   <xsl:strip-space elements="taglib tag attribute"/>
+
+  <!-- Process an entire tag library -->
+  <xsl:template match="taglib">
+    <taglib>
+      <xsl:if test="tlibversion">
+        <tlibversion><xsl:value-of select="tlibversion"/></tlibversion>
+      </xsl:if>
+      <xsl:if test="jspversion">
+        <jspversion><xsl:value-of select="jspversion"/></jspversion>
+      </xsl:if>
+      <xsl:if test="shortname">
+        <shortname><xsl:value-of select="shortname"/></shortname>
+      </xsl:if>
+      <xsl:if test="uri">
+        <uri><xsl:value-of select="uri"/></uri>
+      </xsl:if>
+      <xsl:apply-templates select="tag"/>
+    </taglib>
+  </xsl:template>
+
+  <!-- Process an individual tag -->
+  <xsl:template match="tag">
+    <tag>
+      <xsl:if test="name">
+        <name><xsl:value-of select="name"/></name>
+      </xsl:if>
+      <xsl:if test="tagclass">
+        <tagclass><xsl:value-of select="tagclass"/></tagclass>
+      </xsl:if>
+      <xsl:if test="teiclass">
+        <teiclass><xsl:value-of select="teiclass"/></teiclass>
+      </xsl:if>
+      <xsl:if test="bodycontent">
+        <bodycontent><xsl:value-of select="bodycontent"/></bodycontent>
+      </xsl:if>
+      <xsl:apply-templates select="attribute"/>
+    </tag>
+  </xsl:template>
+
+  <!-- Process an individual tag attribute -->
+  <xsl:template match="attribute">
+    <attribute>
+      <xsl:if test="name">
+        <name><xsl:value-of select="name"/></name>
+      </xsl:if>
+      <xsl:if test="required">
+        <required><xsl:value-of select="required"/></required>
+      </xsl:if>
+      <xsl:if test="rtexprvalue">
+        <rtexprvalue><xsl:value-of select="rtexprvalue"/></rtexprvalue>
+      </xsl:if>
+    </attribute>
+  </xsl:template>
+
+  <!-- Skip irrelevant details -->
+  <xsl:template match="properties"/>
+
+</xsl:stylesheet>
diff -Nurb contrib.orig/wml/doc/stylesheets/userGuide.xsl contrib/wml/doc/stylesheets/userGuide.xsl
--- contrib.orig/wml/doc/stylesheets/userGuide.xsl	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/stylesheets/userGuide.xsl	2003-01-23 13:19:34.000000000 -0500
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Content Stylesheet for Struts User's Guide -->
+<!-- $Id: userGuide.xsl,v 1.12 2003/01/19 00:40:41 craigmcc Exp $ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+
+  <!-- Output method -->
+  <xsl:output method="html"
+            encoding="iso-8859-1"
+              indent="no"/>
+
+
+  <!-- Defined parameters (overrideable) -->
+  <xsl:param    name="home-href"         select="'http://jakarta.apache.org/'"/>
+  <xsl:param    name="home-logo"         select="'/images/jakarta-logo.gif'"/>
+  <xsl:param    name="home-name"         select="'The Jakarta Project'" />
+  <xsl:param    name="printer-logo"      select="'/images/printer.gif'"/>
+  <xsl:param    name="printer-name"      select="'Print-Friendly Version'"/>
+  <xsl:param    name="project-href"      select="'http://jakarta.apache.org/struts/'"/>
+  <xsl:param    name="project-logo"      select="'/images/struts.gif'"/>
+  <xsl:param    name="project-menu"      select="'menu'"/>
+  <xsl:param    name="project-name"      select="'Struts Framework'"/>
+  <xsl:param    name="relative-path"     select="'.'"/>
+
+
+  <!-- Defined variables (non-overrideable) -->
+  <xsl:variable name="body-bg"           select="'#ffffff'"/>
+  <xsl:variable name="body-fg"           select="'#000000'"/>
+  <xsl:variable name="body-link"         select="'#023264'"/>
+  <xsl:variable name="banner-bg"         select="'#023264'"/>
+  <xsl:variable name="banner-fg"         select="'#ffffff'"/>
+
+
+  <!-- Process an entire document into an HTML page -->
+  <xsl:template match="document">
+    <xsl:variable name="project"
+                select="document('../userGuide/project.xml')/project"/>
+    <html>
+    <head>
+
+    <xsl:for-each select="properties/author">
+    <xsl:variable name="author">
+      <xsl:value-of select="."/>
+    </xsl:variable>
+    <meta name="author" content="{$author}"/>
+    </xsl:for-each>
+
+    <!-- <link rel="stylesheet" type="text/css" href="default.css"/> -->
+    <xsl:choose>
+      <xsl:when test="properties/title">
+        <title><xsl:value-of select="properties/title"/></title>
+      </xsl:when>
+      <xsl:when test="body/title">
+        <title><xsl:value-of select="body/title"/></title>
+      </xsl:when>
+      <xsl:otherwise>
+        <title><xsl:value-of select="$project/title"/></title>
+      </xsl:otherwise>
+    </xsl:choose>
+    </head>
+
+    <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
+          alink="{$body-link}" vlink="{$body-link}">
+ 
+    <table border="0" width="100%" cellspacing="5">
+
+      <tr><td colspan="2">
+
+        <xsl:comment>
+          JAKARTA LOGO
+        </xsl:comment>
+        <xsl:variable name="alt">
+          <xsl:value-of select="$home-name"/>
+        </xsl:variable>
+        <xsl:variable name="href">
+          <xsl:value-of select="$home-href"/>
+        </xsl:variable>
+        <xsl:variable name="src">
+          <xsl:value-of select="$relative-path"/><xsl:value-of select="$home-logo"/>
+        </xsl:variable>
+        <a href="{$href}">
+        <img src="{$src}" align="left" alt="{$alt}" border="0"/>
+        </a>
+
+        <xsl:comment>
+          STRUTS LOGO
+        </xsl:comment>
+        <xsl:variable name="alt">
+          <xsl:value-of select="$project-name"/>
+        </xsl:variable>
+        <xsl:variable name="href">
+          <xsl:value-of select="$project-href"/>
+        </xsl:variable>
+        <xsl:variable name="src">
+          <xsl:value-of select="$relative-path"/><xsl:value-of select="$project-logo"/>
+        </xsl:variable>
+        <a href="{$href}">
+        <img src="{$src}" align="right" alt="{$alt}" border="0"/>
+        </a>
+
+      </td></tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <xsl:if test="$project-menu = 'menu'">
+        <tr><td colspan="2" align="center">
+          <xsl:variable name="alt">
+            <xsl:value-of select="$printer-name"/>
+          </xsl:variable>
+          <xsl:variable name="url">
+            <xsl:value-of select="/document/@url"/>
+          </xsl:variable>
+          <xsl:variable name="src">
+            <xsl:value-of select="$relative-path"/><xsl:value-of select="$printer-logo"/>
+          </xsl:variable>
+          <a href="printer/{$url}">
+            <img src="{$src}" alt="{$alt}" border="0"/>
+            <xsl:value-of select="$printer-name"/>
+          </a>
+        </td></tr>
+      </xsl:if>
+
+      <tr>
+        <xsl:if test="$project-menu = 'menu'">
+          <td width="120" valign="top">
+            <xsl:apply-templates select="$project"/>
+          </td>
+        </xsl:if>
+
+        <td valign="top">
+          <xsl:apply-templates select="body"/>
+        </td>
+      </tr>
+
+      <tr><td colspan="2">
+        <hr/>
+      </td></tr>
+
+      <tr><td colspan="2">
+        <div align="center"><font color="{$body-link}" size="-1"><em>
+        Copyright (c) 2000-2003, Apache Software Foundation
+        </em></font></div>
+        <img src="../images/struts-power.gif" align="right" border="0"/>
+      </td></tr>
+
+    </table>
+    </body>
+    </html>
+
+  </xsl:template>
+
+
+  <!-- Process the project element for the navigation bar -->
+  <xsl:template match="project">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+
+  <!-- Process an entire chapter (assumes one chapter per page) -->
+  <xsl:template match="chapter">
+    <xsl:element name="a">
+      <xsl:attribute name="name">
+        <xsl:value-of select="@href" />
+      </xsl:attribute>
+    </xsl:element>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td><p>Contributors: </p><ul>
+    <xsl:for-each select="/document/properties/author">
+    <li><xsl:value-of select="."/></li>
+    </xsl:for-each>
+    </ul>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="section" />
+  </xsl:template>
+
+
+  <!-- Process a menu for the navigation bar -->
+  <xsl:template match="menu">
+    <table border="0" cellspacing="5">
+      <tr>
+        <th colspan="2" align="left">
+          <font color="{$body-link}"><strong>
+            <xsl:value-of select="@name"/>
+          </strong></font>
+        </th>
+      </tr>
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a menu item for the navigation bar -->
+  <xsl:template match="item">
+    <tr>
+      <td align="center" width="15"></td>
+      <td>
+        <font size="-1">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a href="{$href}"><xsl:value-of select="@name"/></a>
+        </font>
+      </td>
+    </tr>
+  </xsl:template>
+
+
+  <!-- Process a documentation section -->
+  <xsl:template match="section">
+    <xsl:choose>
+      <xsl:when test="@href">
+        <xsl:variable name="href">
+          <xsl:value-of select="@href"/>
+        </xsl:variable>
+        <a name="{$href}"></a>
+      </xsl:when>
+    </xsl:choose>
+    <table border="0" cellspacing="5" cellpadding="5" width="100%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="@name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates/>
+        </blockquote>
+      </td></tr>
+    </table>
+  </xsl:template>
+
+
+  <!-- Process a tag library section -->
+  <xsl:template match="taglib">
+    <table border="0" cellspacing="5" cellpadding="5" width="98%">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif" size="+1">
+          <strong><xsl:value-of select="display-name"/></strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <table border="1" cellspacing="2" cellpadding="2">
+            <tr>
+              <th width="15%"><a name="index"></a>Tag Name</th>
+              <th>Description</th>
+            </tr>
+            <xsl:for-each select="tag">
+              <xsl:sort select="name"/>
+              <tr>
+                <td align="center">
+                  <xsl:variable name="name">
+                    <xsl:value-of select="name"/>
+                  </xsl:variable>
+                  <a href="#{$name}"><xsl:value-of select="name"/></a>
+                </td>
+                <td>
+                  <xsl:value-of select="summary"/>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </table>
+        </blockquote>
+      </td></tr>
+    </table>
+    <xsl:apply-templates select="tag">
+      <xsl:sort select="name"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
+  <!-- Process an individual tag -->
+  <xsl:template match="tag">
+    <xsl:variable name="name">
+      <xsl:value-of select="name"/>
+    </xsl:variable>
+    <a name="{$name}"></a>
+    <table border="0" cellspacing="2" cellpadding="2">
+      <tr><td bgcolor="{$banner-bg}">
+        <font color="{$banner-fg}" face="arial,helvetica,sanserif">
+          <strong><xsl:value-of select="name"/></strong> -
+          <xsl:value-of select="summary"/>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+          <xsl:if test="deprecated">
+            <p><font color="red"><strong>DEPRECATED: </strong></font>
+            <xsl:value-of select="deprecated"/></p>
+          </xsl:if>
+          <xsl:if test="since">
+            <p>Since:  <xsl:value-of select="since"/></p>
+          </xsl:if>
+          <xsl:apply-templates select="info"/>
+        </blockquote>
+      </td></tr>
+      <xsl:if test="not(@document-attributes)">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+      <xsl:if test="@document-attributes='true'">
+        <xsl:call-template name="document-tag-attributes" />
+      </xsl:if>
+    </table>
+    <p><a href="#index">Back to top</a></p>
+  </xsl:template>
+
+
+  <!-- Create the table of documentation for a tag -->
+  <xsl:template name="document-tag-attributes">
+    <tr><td>
+      <blockquote>
+        <table border="1" cellspacing="2" cellpadding="2">
+          <tr>
+            <th width="15%">Attribute Name</th>
+            <th>Description</th>
+          </tr>
+          <xsl:for-each select="attribute">
+            <xsl:sort select="name"/>
+            <tr>
+              <td align="center">
+                <xsl:value-of select="name"/>
+              </td>
+              <td>
+                <xsl:if test="deprecated">
+                  <p><font color="red"><strong>DEPRECATED: </strong></font>
+                  <xsl:value-of select="deprecated"/></p>
+                </xsl:if>
+                <xsl:if test="since">
+                  <p>Since:  <xsl:value-of select="since"/></p>
+                </xsl:if>
+                <xsl:apply-templates select="info"/>
+                <xsl:variable name="required">
+                  <xsl:value-of select="required"/>
+                </xsl:variable>
+                <xsl:if test="default">
+                  [<xsl:value-of select="default"/>]
+                </xsl:if>
+                <xsl:if test="required='true'">
+                  (REQUIRED)
+                </xsl:if>
+                <xsl:if test="rtexprvalue='true'">
+                  (RT EXPR)
+                </xsl:if>
+              </td>
+            </tr>
+          </xsl:for-each>
+        </table>
+      </blockquote>
+    </td></tr>
+  </xsl:template>
+
+
+  <!-- Process everything else by just passing it through -->
+  <xsl:template match="*|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()"/>
+    </xsl:copy>
+  </xsl:template>
+
+
+</xsl:stylesheet>
diff -Nurb contrib.orig/wml/doc/userGuide/project.xml contrib/wml/doc/userGuide/project.xml
--- contrib.orig/wml/doc/userGuide/project.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/userGuide/project.xml	2003-02-04 11:32:37.000000000 -0500
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Struts-WML User's Guide"
+         href="http://jakarta.apache.org/struts/userGuide"
+        image="../images/struts.gif">
+
+    <title>Getting Started</title>
+
+    <menu name="Supplied documents">
+        <item 
+            name="Tag library user's guide"
+            href="struts-wml.html"/>
+        <item 
+            name="Tag library javadocs"
+	    href="../api/index.html"/>
+    </menu>
+
+</project>
diff -Nurb contrib.orig/wml/doc/userGuide/struts-wml.xml contrib/wml/doc/userGuide/struts-wml.xml
--- contrib.orig/wml/doc/userGuide/struts-wml.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/doc/userGuide/struts-wml.xml	2003-01-24 12:32:18.000000000 -0500
@@ -0,0 +1,1391 @@
+<?xml version="1.0"?>
+<document url="./struts-wml.xml">
+
+<properties>
+  <author>Mitchell Morris</author>
+  <title>The Struts Framework Project - WML Tags</title>
+</properties>
+
+<body>
+<taglib>
+
+<tlibversion>1.0</tlibversion>
+<jspversion>1.1</jspversion>
+<shortname>wml</shortname>
+<display-name>WML Tags</display-name>
+<uri>http://jakarta.apache.org/struts/tags-wml-1.0</uri>
+<info>
+  <p>This tag library contains tags to generate valid WML forms
+  using the Struts library components.</p>
+
+  <p>Many of the tags in this tag library will throw a
+  <code>JspException</code> at runtime when they are utilized incorrectly
+  (such as when you specify an invalid combination of tag attributes).  JSP
+  allows you to declare an "error page" in the <code>&lt;%@ page %&gt;</code>
+  directive.  If you wish to process the actual exception that caused the
+  problem, it is passed to the error page as a request attribute under key
+  <code>org.apache.struts.action.EXCEPTION</code>.</p>
+</info>
+
+
+<tag>
+  <name>wml</name>
+  <summary>
+    Generates the top-level WML entry.
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.WmlTag</tagclass>
+  <bodycontent>JSP</bodycontent>
+  <info>
+    This tag create the top-level WML entry, optionally with a
+    locale encoding specified.
+  </info>
+
+  <attribute>
+    <name>locale</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Should a locale be specified or not?
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>head</name>
+  <summary>
+    Generate the head element.
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.HeadTag</tagclass>
+  <bodycontent>JSP</bodycontent>
+  <info>
+    This tag generates the <code>&lt;head&gt;</code> element.
+  </info>
+</tag>
+
+<tag>
+  <name>access</name>
+  <summary>
+    Generate the tag for agent access control
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.AccessTag</tagclass>
+  <bodycontent>empty</bodycontent>
+  <info>
+    <p>This tag generates the <code>&lt;access&gt;</code> element, which the
+      user agent will use to enforce access control.</p>
+
+    <p>If a deck has a <code>domain</code> and/or <code>path</code> attribute,
+      the referring deck's URI must match the values of the attributes.
+      Matching is done as follows: the access domain is suffix-matched
+      against the domain name portion of the referring URI and the access
+      path is prefix-matched against the path portion of the referring URI.</p>
+
+    <p><code>domain</code> suffix matching is done using the entire element of
+      each sub-domain and must match each element exactly (e.g.
+      <code>www.wapforum.org</code> shall match <code>wapforum.org</code>, but
+      shall not match <code>forum.org</code>). <code>path</code> prefix matching
+      is done using entire path elements and must match each element exactly
+      (e.g. <code>/X/Y</code> matches <code>path="/X"</code> attribute, but
+      does not match <code>path="/XZ"</code> attribute).</p>
+
+    <p>The <code>domain</code> attribute defaults to the current deck's domain.
+      The <code>path</code> attribute defaults to the value "/".</p>
+  </info>
+
+  <attribute>
+    <name>domain</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The domain that is allowed to access this deck. Defaults to the current
+      domain.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>path</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The path that is allowed to access this deck. Defaults to "/".
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>errors</name>
+  <summary>
+    Conditionally display a set of accumulated error messages.
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.ErrorsTag</tagclass>
+  <bodycontent>empty</bodycontent>
+  <info>
+    <p>Displays a set of error messages prepared by a business
+    logic component and stored as an <code>ActionErrors</code>
+    object, a String, or a String array in request scope.  If
+    such a bean is not found, nothing will be rendered.</p>
+
+    <p>In order to use this tag successfully, you must have
+    defined an application scope <code>MessageResources</code>
+    bean under the default attribute name, with at least the
+    following message keys:</p>
+    <ul>
+      <li><strong>errors.header</strong> - Text that will be rendered
+        before the error messages list.  Typically, this message text
+        will end with <code>&lt;ul&gt;</code> to start the
+        error messages list.</li>
+      <li><strong>errors.footer</strong> - Text that will be rendered
+        after the error messages list.  Typically, this message text
+        will begin with <code>&lt;/ul&gt;</code> to end the error
+        messages list.</li>
+    </ul>
+  </info>
+
+  <attribute>
+    <name>bundle</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The servlet context attribute key for the MessageResources
+      instance to use.  If not specified, defaults to the
+      application resources configured for our action servlet.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>locale</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The session attribute key for the Locale used to select
+      messages to be displayed.  If not specified, defaults to
+      the Struts standard value.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>name</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Name of the request scope bean under which our error messages
+      have been stored.  If not present, the name specified by the
+      <code>Action.ERROR_KEY</code> constant string will be used.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>property</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Name of the property for which error messages should be
+      displayed.  If not specified, all error messages (regardless
+      of property) are displayed.
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>card</name>
+  <summary>
+    Generates a CARD entry.
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.CardTag</tagclass>
+  <bodycontent>JSP</bodycontent>
+  <info>
+    This tag create a CARD entry, which  represents a display page on the
+    device.
+  </info>
+
+  <attribute>
+    <name>id</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The ID of the card, if any.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>newcontext</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>
+        If <code>true</code>, the browser context will be cleared when this
+        card is entered:
+        <bl>
+          <li>All variables are cleared</li>
+          <li>The browser history is cleared</li>
+          <li>The browser is reset to a known good state</li>
+        </bl>
+      </p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>action</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The associated action for this card. This implies that this card will be
+      used as an input form, with fields and everything.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>labelKey</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>One of the many ways to specify the value to put on the submit soft key.
+      One of the following must by specified:</p>
+      <ul>
+        <li><em>labelValue</em> -- This literal value will be used for the soft key.</li>
+        <li><em>labelKey</em> -- This value will be used to look up the label for the
+          soft key in the current message catalog.</li>
+        <li><em>labelProperty</em> -- This value will be the name of a property in
+          the bean specified in <code>&lt;labelName&lt;</code> to determine the
+          value for the soft key.</li>
+        <li><em>labelName</em> -- This value will be the name of a bean containing the
+          value for the soft key. If a <code>&lt;labelProperty&gt;</code> is present,
+          then that property will be the value. If not supplied, the bean itself
+          will be converted to a <code>String</code> and used as the label.</li>
+      </ul>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>labelName</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>One of the many ways to specify the value to put on the submit soft key.
+      One of the following must by specified:</p>
+      <ul>
+        <li><em>labelValue</em> -- This literal value will be used for the soft key.</li>
+        <li><em>labelKey</em> -- This value will be used to look up the label for the
+          soft key in the current message catalog.</li>
+        <li><em>labelProperty</em> -- This value will be the name of a property in
+          the bean specified in <code>&lt;labelName&lt;</code> to determine the
+          value for the soft key.</li>
+        <li><em>labelName</em> -- This value will be the name of a bean containing the
+          value for the soft key. If a <code>&lt;labelProperty&gt;</code> is present,
+          then that property will be the value. If not supplied, the bean itself
+          will be converted to a <code>String</code> and used as the label.</li>
+      </ul>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>labelProperty</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>One of the many ways to specify the value to put on the submit soft key.
+      One of the following must by specified:</p>
+      <ul>
+        <li><em>labelValue</em> -- This literal value will be used for the soft key.</li>
+        <li><em>labelKey</em> -- This value will be used to look up the label for the
+          soft key in the current message catalog.</li>
+        <li><em>labelProperty</em> -- This value will be the name of a property in
+          the bean specified in <code>&lt;labelName&lt;</code> to determine the
+          value for the soft key.</li>
+        <li><em>labelName</em> -- This value will be the name of a bean containing the
+          value for the soft key. If a <code>&lt;labelProperty&gt;</code> is present,
+          then that property will be the value. If not supplied, the bean itself
+          will be converted to a <code>String</code> and used as the label.</li>
+      </ul>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>labelValue</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>One of the many ways to specify the value to put on the submit soft key.
+      One of the following must by specified:</p>
+      <ul>
+        <li><em>labelValue</em> -- This literal value will be used for the soft key.</li>
+        <li><em>labelKey</em> -- This value will be used to look up the label for the
+          soft key in the current message catalog.</li>
+        <li><em>labelProperty</em> -- This value will be the name of a property in
+          the bean specified in <code>&lt;labelName&lt;</code> to determine the
+          value for the soft key.</li>
+        <li><em>labelName</em> -- This value will be the name of a bean containing the
+          value for the soft key. If a <code>&lt;labelProperty&gt;</code> is present,
+          then that property will be the value. If not supplied, the bean itself
+          will be converted to a <code>String</code> and used as the label.</li>
+      </ul>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>name</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>Name of the request scope or session scope bean
+      (as defined by the <code>scope</code> attribute)
+      whose properties will be used to populate the input
+      field values.  If no such bean is found, a new bean
+      will be created and added to the appropriate scope,
+      using the Java class name specified by the
+      <code>type</code> attribute.</p>
+
+      <p>If this attribute is not specified, it will be
+      calculated by using the value of the
+      <code>action</code> attribute to look up the
+      corresponding ActionMapping element, from which
+      we will select the specified form bean name.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>scope</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>Scope within which the form bean associated with
+      this input form will be accessed or created (must be
+      either <code>request</code> or <code>session</code>.
+      </p>
+
+      <p>If this attribute is not specified, it will be
+      calculated by using the value of the
+      <code>action</code> attribute to look up the
+      corresponding ActionMapping element, from which
+      we will select the specified form bean scope.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>type</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>Fully qualified Java class name of the form bean to
+      be created, if no such bean is found in the specified
+      scope.</p>
+
+      <p>If this attribute is not specified, it will be
+      calculated by using the value of the
+      <code>action</code> attribute to look up the
+      corresponding ActionMapping element, from which
+      we will select the specified form bean type.</p>
+    </info>
+  </attribute>
+
+</tag>
+
+<tag>
+  <name>text</name>
+  <summary>
+    Render An Input Field of Type text
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.TextTag</tagclass>
+  <info>
+    Render an input button of type text.
+  </info>
+
+  <attribute>
+    <name>indexed</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Valid only inside of logic:iterate tag.
+      If yes then name of the wml tag will be rendered as
+      "id[34].propertyName". Number in brackets will be generated
+      for every iteration and taken from ancestor logic:iterate tag.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>maxlength</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Maximum number of input characters to accept. [No limit]
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>name</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The attribute name of the bean whose properties are consulted
+      when rendering the current value of this input field. If not
+      specified, the bean associated with the form tag we are nested
+      within is utilized.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>property</name>
+    <required>true</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Name of this input field, and the name of the corresponding bean
+      property if value is not specified. The corresponding bean property
+      (if any) must be of type String.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>readonly</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Set to <code>true</code> if this input field should be
+      read only.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>value</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Value to which this field should be initialized. [Use the
+      corresponding bean property value]
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>format</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>This attribute describes the allowable values which may be input into
+        this field. If omitted, defaults to "<code>*M</code>".
+        The following types are defined:</p>
+      <ul>
+        <li><em>A</em> - entry of any uppercase letter, symbol, or punctuation
+          character. Numeric characters are excluded.</li>
+        <li><em>a</em> - entry of any lowercase letter, symbol, or punctuation
+          character. Numeric characters are excluded.</li>
+        <li><em>N</em> - entry of any numeric character.</li>
+        <li><em>n</em> - entry of any numeric character, symbol, or punctuation
+          character.</li>
+        <li><em>X</em> - entry of any uppercase letter, numeric character,
+          symbol, or punctuation character.</li>
+        <li><em>x</em> - entry of any lowercase letter, numeric character,
+          symbol, or punctuation character.</li>
+        <li><em>M</em> - entry of character valid in the current language. If the
+          language supports case and the hardware supports both upper and lower
+          case, then the user agent may default to uppercase entry mode but must
+          allow entry of any character.</li>
+        <li><em>m</em> - entry of character valid in the current language. If the
+          language supports case and the hardware supports both upper and lower
+          case, then the user agent may default to lowercase entry mode but must
+          allow entry of any character.</li>
+        <li><em>*f</em> -- entry of any number of characters; <em>f</em> is
+          one of the above format codes and specifies what kind of characters
+          can be entered. <em>Note: this format may only be specified once and
+          must appear at the end of the format string.</em></li>
+        <li><em>nf</em> -- entry of up to <em>n</em> characters where <em>n</em>
+          is from 1 to 9; <em>f</em> is
+          one of the above format codes and specifies what kind of characters
+          can be entered. <em>Note: this format may only be specified once and
+          must appear at the end of the format string.</em></li>
+        <li><em>\c</em> -- display the next character, <em>c</em>, in the entry
+          field; allows escaping of the format codes as well as introducing
+          non-formatting characters so they can be displayed in the entry area.
+          Escaped characters are considered part of the input's value, and
+          must be preserved by the user agent.</li>
+      </ul>
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>password</name>
+  <summary>
+    Render An Input Field of Type password
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.PasswordTag</tagclass>
+  <info>
+    Render an input button of type password.
+  </info>
+
+  <attribute>
+    <name>indexed</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Valid only inside of logic:iterate tag.
+      If yes then name of the wml tag will be rendered as
+      "id[34].propertyName". Number in brackets will be generated
+      for every iteration and taken from ancestor logic:iterate tag.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>maxlength</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Maximum number of input characters to accept. [No limit]
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>name</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The attribute name of the bean whose properties are consulted
+      when rendering the current value of this input field. If not
+      specified, the bean associated with the form tag we are nested
+      within is utilized.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>property</name>
+    <required>true</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Name of this input field, and the name of the corresponding bean
+      property if value is not specified. The corresponding bean property
+      (if any) must be of type String.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>readonly</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Set to <code>true</code> if this input field should be
+      read only.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>value</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Value to which this field should be initialized. [Use the
+      corresponding bean property value]
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>format</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>This attribute describes the allowable values which may be input into
+        this field. If omitted, defaults to "<code>*M</code>".
+        The following types are defined:</p>
+      <ul>
+        <li><em>A</em> - entry of any uppercase letter, symbol, or punctuation
+          character. Numeric characters are excluded.</li>
+        <li><em>a</em> - entry of any lowercase letter, symbol, or punctuation
+          character. Numeric characters are excluded.</li>
+        <li><em>N</em> - entry of any numeric character.</li>
+        <li><em>n</em> - entry of any numeric character, symbol, or punctuation
+          character.</li>
+        <li><em>X</em> - entry of any uppercase letter, numeric character,
+          symbol, or punctuation character.</li>
+        <li><em>x</em> - entry of any lowercase letter, numeric character,
+          symbol, or punctuation character.</li>
+        <li><em>M</em> - entry of character valid in the current language. If the
+          language supports case and the hardware supports both upper and lower
+          case, then the user agent may default to uppercase entry mode but must
+          allow entry of any character.</li>
+        <li><em>m</em> - entry of character valid in the current language. If the
+          language supports case and the hardware supports both upper and lower
+          case, then the user agent may default to lowercase entry mode but must
+          allow entry of any character.</li>
+        <li><em>*f</em> -- entry of any number of characters; <em>f</em> is
+          one of the above format codes and specifies what kind of characters
+          can be entered. <em>Note: this format may only be specified once and
+          must appear at the end of the format string.</em></li>
+        <li><em>nf</em> -- entry of up to <em>n</em> characters where <em>n</em>
+          is from 1 to 9; <em>f</em> is
+          one of the above format codes and specifies what kind of characters
+          can be entered. <em>Note: this format may only be specified once and
+          must appear at the end of the format string.</em></li>
+        <li><em>\c</em> -- display the next character, <em>c</em>, in the entry
+          field; allows escaping of the format codes as well as introducing
+          non-formatting characters so they can be displayed in the entry area.
+          Escaped characters are considered part of the input's value, and
+          must be preserved by the user agent.</li>
+      </ul>
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>select</name>
+  <summary>
+    Render A Select Element
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.SelectTag</tagclass>
+  <bodycontent>JSP</bodycontent>
+  <info>
+    <p>Renders an wml &lt;select&gt; element, associated
+    with a bean property specified by our attributes.  This
+    tag is only valid when nested inside a form tag body.
+    </p>
+
+    <p>This tag operates in two modes, depending upon the
+    state of the <code>multiple</code> attribute, which
+    affects the data type of the associated property you
+    should use:</p>
+    <ul>
+      <li><em>multiple="true" IS NOT selected</em> -
+        The corresponding property should be a scalar
+        value of any supported data type.</li>
+      <li><em>multiple="true" IS selected</em> -
+        The corresponding property should be an array
+        of any supported data type.</li>
+    </ul>
+
+    <p><strong>WARNING</strong>:  In order to correctly
+    recognize cases where no selection at all is made, the
+    <code>ActionForm</code> bean associated with this form
+    must include a statement resetting the scalar property
+    to a default value (if <code>multiple</code> is not
+    set), or the array property to zero length (if <code>multiple</code>
+    is set) in the <code>reset()</code> method.</p>
+  </info>
+
+  <attribute>
+    <name>disabled</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Set to <code>true</code> if this input field should be
+      disabled.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>indexed</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Valid only inside of logic:iterate tag.
+      If yes then name of the tag will be rendered as
+      "id[34].propertyName". Number in brackets will be generated
+      for every iteration and taken from ancestor logic:iterate tag.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>multiple</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      If set to "<code>true</code>", the rendered
+      select element will support multiple selections.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>name</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The attribute name of the bean whose properties are consulted
+      to determine which option should be pre-selected when rendering
+      this input field.  If not specified, the bean associated with
+      the enclosing <code>&lt;wml:form&gt;</code> tag is utilized.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>property</name>
+    <required>true</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Name of the request parameter that will be included with this
+      submission, set to the specified value.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>value</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The value to compare with for marking an option selected.
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>option</name>
+  <summary>
+    Render A Select Option
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.OptionTag</tagclass>
+  <info>
+    <p>Render a WML <code>&lt;option&gt;</code> element,
+    representing one of the choices for an enclosing
+    <code>&lt;select&gt;</code> element.  The text displayed to the
+    user comes from either the body of this tag, or from a message
+    string looked up based on the <code>bundle</code>,
+    <code>locale</code>, and <code>key</code> attributes.</p>
+
+    <p>If the value of the corresponding bean property matches the
+    specified value, this option will be marked selected.  This tag
+    is only valid when nested inside a
+    <code>&lt;wml:select&gt;</code> tag body.</p>
+  </info>
+
+  <attribute>
+    <name>bundle</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The servlet context attributes key for the MessageResources
+      instance to use.  If not specified, defaults to the
+      application resources configured for our action servlet.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>disabled</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Set to <code>true</code> if this option should be
+      disabled.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>key</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      If specified, defines the message key to be looked up in
+      the resource bundle specified by <code>bundle</code> for
+      the text displayed to the user for this option.  If not
+      specified, the text to be displayed is taken from the body
+      content of this tag.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>locale</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The session attributes key for the Locale instance to use
+      for looking up the message specified by the
+      <code>key</code> attribute.  If not specified, uses the
+      standard Struts session attribute name.
+  </info>
+  </attribute>
+
+  <attribute>
+    <name>value</name>
+    <required>true</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Value to be submitted for this field if this option is
+      selected by the uuser.
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>options</name>
+  <summary>
+    Render a Collection of Select Options
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.OptionsTag</tagclass>
+  <bodycontent>empty</bodycontent>
+  <info>
+    <p>Renders a set of wml <code>&lt;option&gt;</code> elements,
+    representing possible choices for a <code>&lt;select&gt;</code>
+    element.  This tag can be used multiple times within a single
+    <code>&lt;wml:select&gt;</code> element, either in conjunction
+    with or instead of one or more <code>&lt;wml:option&gt;</code>
+    or <code>&lt;wml:optionsCollection&gt;</code> elements.</p>
+
+    <p>This tag operates in one of two major modes, depending on
+    whether or not the <code>collection</code> attribute is
+    specified.  If the <code>collection</code> attribute is
+    included, the following rules apply:</p>
+    <ul>
+      <li>The <strong>collection</strong> attribute is interpreted
+        as the name of a JSP bean, in some scope, that itself
+        represents a collection of individual beans, one per option
+        value to be rendered.</li>
+      <li>The <strong>property</strong> attribute is interpreted as
+        the name of a property of the individual beans included in
+        the collection, and is used to retrieve the value that will
+        be returned to the server if this option is selected.</li>
+      <li>The <strong>labelProperty</strong> attribute is interpreted
+        as the name of a property of the individual beans included
+        in the collection, and is used to retrieve the label that
+        will be displayed to the user for this option.  If the
+        <code>labelProperty</code> attribute is not specified, the
+        property named by the <code>property</code> attribute will
+        be used to select both the value returned to the server and
+        the label displayed to the user for this option.</li>
+    </ul>
+
+    <p>If the <code>collection</code> attribute is not specified,
+      the rules described in the remainder of this section apply.</p>
+
+    <p>The collection of values actually selected depends on the presence or
+      absence of the <code>name</code> and <code>property</code> attributes.  The
+      following combinations are allowed:</p>
+    <ul>
+      <li><i>Only <code>name</code> is specified</i> - The value of this attribute
+        is the name of a JSP bean in some scope that is the
+        collection.</li>
+      <li><i>Only <code>property</code> is specified</i> - The value of this
+        attribute is the name of a property of the ActionForm bean associated
+        with our form, which will return the collection.</li>
+      <li><i>Both <code>name</code> and <code>property</code> are specified</i> -
+        The value of the <code>name</code> attribute identifies a JSP bean
+        in some scope.  The value of the <code>property</code> attribute is the
+        name of some property of that bean which will return the collection.</li>
+    </ul>
+
+    <p>The collection of labels displayed to the user can be the same as the
+      option values themselves, or can be different, depending on the presence or
+      absence of the <code>labelName</code> and <code>labelProperty</code>
+      attributes.  If this feature is used, the collection of labels must contain
+      the same number of elements as the corresponding collection of values.
+      The following combinations are allowed:</p>
+    <ul>
+      <li><i>Neither <code>labelName</code> nor <code>labelProperty</code> is
+        specified</i> - The labels will be the same as the option values
+        themselves.</li>
+      <li><i>Only <code>labelName</code> is specified</i> - The value of this
+        attribute is the name of a JSP bean in some scope that is the
+        collection.</li>
+      <li><i>Only <code>labelProperty</code> is specified</i> - The value of this
+        attribute is the name of a property of the ActionForm bean associated
+        with our form, which will return the collection.</li>
+      <li><i>Both <code>labelName</code> and <code>labelProperty</code> are
+        specified</i> - The value of the <code>labelName</code> attribute
+        identifies a JSP bean in some scope.  The value of the
+        <code>labelProperty</code> attribute is the name of some property of
+        that bean which will return the collection.</li>
+    </ul>
+  </info>
+
+  <attribute>
+    <name>collection</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Name of the JSP bean (in some scope) which is itself a
+      Collection of other beans, each of which has properties
+      named by the "property" and "labelProperty" attributes
+      that are used to retrieve the value and label for each
+      option, respectively.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>labelName</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Name of the JSP bean (in some scope) containing the collection of labels to
+      be displayed to the user for these options.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>labelProperty</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Property of the form bean, or the bean specified by the labelName
+      attribute, that will return the collection of labels to be displayed
+      to the user for these options.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>name</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Name of the JSP bean (in some scope) containing the collection of
+      values to be returned to the server for these options. If not
+      specified, the form bean associated with our form is assumed.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>property</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Property of the form bean, or the bean specified by the name
+      attribute, that will return the collection of values to returned
+      to the server for these options.
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>optionsCollection</name>
+  <summary>
+    Render a Collection of Select Options
+  </summary>
+  <tagclass>org.apache.struts.taglib.wml.OptionsCollectionTag</tagclass>
+  <bodycontent>empty</bodycontent>
+  <info>
+    <p>Renders a set of wml <code>&lt;option&gt;</code> elements,
+    representing possible choices for a <code>&lt;select&gt;</code>
+    element.  This tag can be used multiple times within a single
+    <code>&lt;wml:select&gt;</code> element, either in conjunction
+    with or instead of one or more <code>&lt;wml:option&gt;</code>
+    or <code>&lt;wml:options&gt;</code> elements.</p>
+
+    <p>This tag operates on a collection of beans, where each bean
+    has a <strong>label</strong> property and a <strong>value</strong>
+    property. The actual names of these properties can be configured
+    using the <code>label</code> and <code>value</code> attributes
+    of this tag.</p>
+
+    <p>This tag differs from the <code>&lt;wml:options&gt;</code> tag
+    in that it makes more consistent use of the <code>name</code> and
+    <code>property</code> attributes, and allows the collection to be
+    more easily obtained from the enclosing form bean.</p>
+  </info>
+
+  <attribute>
+    <name>filter</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Set to <code>false</code> if you do NOT want the option labels
+      filtered for sensitive characters in HTML.  By default, such
+      values are filtered.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>label</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The property of the bean within the collection which represents
+      the label to be rendered for each option. Defaults to "label".
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>name</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The attribute name of the bean whose properties are consulted
+      when rendering the current value of this input field. If not
+      specified, the bean associated with the form tag we are nested
+      within is utilized.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>property</name>
+    <required>true</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The property of the form bean, or the bean specified by the name
+      attribute, that will return the collection of objects to be
+      rendered for these options.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>value</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The property of the bean within the collection which represents
+      the value to be rendered for each option. Defaults to "value".
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>link</name>
+  <summary>Render an anchor or hyperlink</summary>
+  <tagclass>org.apache.struts.taglib.wml.LinkTag</tagclass>
+  <info>
+    <p>Renders an HTML <code>&lt;a&gt;</code> element as an
+      anchor definition (if "linkName" is specified) or as a
+      hyperlink to the specified URL.  URL rewriting will be
+      applied automatically, to maintain session state in the
+      absence of cookies.  The content displayed for this
+      hyperlink will be taken from the body of this tag.</p>
+
+    <p>The base URL for this hyperlink is calculated based on
+      which of the following attributes you specify (you must
+      specify exactly one of them):</p>
+    <ul>
+      <li><em>forward</em> - Use the value of this attribute as the
+        name of a global <code>ActionForward</code> to be looked
+        up, and use the application-relative or context-relative
+        URI found there.</li>
+      <li><em>action</em> - Use the value of this attribute as the
+        name of a <code>Action</code> to be looked
+        up, and use the application-relative or context-relative
+        URI found there.</li>
+      <li><em>href</em> - Use the value of this attribute unchanged.</li>
+      <li><em>page</em> - Use the value of this attribute as a
+        application-relative URI, and generate a server-relative
+        URI by including the context path and application
+        prefix.</li>
+    </ul>
+
+    <p>Normally, the hyperlink you specify with one of the
+      attributes described in the previous paragraph will be left
+      unchanged (other than URL rewriting if necessary).  However,
+      there are two ways you can append one or more dynamically
+      defined query parameters to the hyperlink -- specify a single
+      parameter with the <code>paramId</code> attribute (and its
+      associated attributes to select the value), or specify the
+      <code>name</code> (and optional <code>property</code>)
+      attributes to select a <code>java.util.Map</code> bean that
+      contains one or more parameter ids and corresponding values.
+    </p>
+
+    <p>To specify a single parameter, use the <code>paramId</code>
+      attribute to define the name of the request parameter to be
+      submitted.  To specify the corresponding value, use one of the
+      following approaches:</p>
+    <ul>
+      <li><em>Specify only the <code>paramName</code> attribute</em>
+      - The named JSP bean (optionally scoped by the value of the
+      <code>paramScope</code> attribute) must identify a value
+      that can be converted to a String.</li>
+      <li><em>Specify both the <code>paramName</code> and
+        <code>paramProperty</code> attributes</em> - The specified
+        property getter method will be called on the JSP bean
+        identified by the <code>paramName</code> (and optional
+        <code>paramScope</code>) attributes, in order to select
+        a value that can be converted to a String.</li>
+    </ul>
+
+    <p>If you prefer to specify a <code>java.util.Map</code> that
+    contains all of the request parameters to be added to the
+    hyperlink, use one of the following techniques:</p>
+    <ul>
+      <li><em>Specify only the <code>name</code> attribute</em> -
+        The named JSP bean (optionally scoped by the value of
+        the <code>scope</code> attribute) must identify a
+        <code>java.util.Map</code> containing the parameters.</li>
+      <li><em>Specify both <code>name</code> and
+        <code>property</code> attributes</em> - The specified
+        property getter method will be called on the bean
+        identified by the <code>name</code> (and optional
+        <code>scope</code>) attributes, in order to return the
+        <code>java.util.Map</code> containing the parameters.</li>
+    </ul>
+
+    <p>As the <code>Map</code> is processed, the keys are assumed
+      to be the names of query parameters to be appended to the
+      hyperlink.  The value associated with each key must be either
+      a String or a String array representing the parameter value(s),
+      or an object whose toString() method will be called.
+      If a String array is specified, more than one value for the
+      same query parameter name will be created.</p>
+
+    <p>Additionally, you can request that the current transaction
+      control token, if any, be included in the generated hyperlink
+      by setting the <code>transaction</code> attribute to
+      <code>true</code>.
+      You can also request that an anchor ("#xxx") be added to the
+      end of the URL that is created by any of the above mechanisms,
+      by using the <code>anchor</code> attribute.</p>
+  </info>
+
+  <attribute>
+    <name>action</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>Logical name of a <code>Action</code> that
+      contains the actual content-relative URI of the destination
+      of this transfer.  This hyperlink may be dynamically
+      modified by the inclusion of query parameters, as described
+      in the tag description.  You <strong>must</strong> specify
+      exactly one of the <code>action</code> attribute, the
+      <code>forward</code> attribute, the
+      <code>href</code> attribute, the <code>linkName</code>
+      attribute, or the <code>page</code> attribute.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>anchor</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>Optional anchor tag ("#xxx") to be added to the generated
+        hyperlink.  Specify this value <strong>without</strong> any
+        "#" character.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>forward</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>Logical name of a global <code>ActionForward</code> that
+        contains the actual content-relative URI of the destination
+        of this transfer.  This hyperlink may be dynamically
+        modified by the inclusion of query parameters, as described
+        in the tag description.  You <strong>must</strong> specify
+        exactly one of the <code>action</code> attribute, the
+        <code>forward</code> attribute, the <code>href</code> attribute,
+        the <code>linkName</code> attribute, or the <code>page</code>
+        attribute.</p>
+  </info>
+  </attribute>
+
+  <attribute>
+    <name>href</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The URL to which this hyperlink will transfer control
+        if activated.  This hyperlink may be dynamically modified
+        by the inclusion of query parameters, as described in the
+        tag description.  You <strong>must</strong> specify
+        exactly one of the <code>action</code> attribute, the
+        <code>forward</code> attribute, the <code>href</code> attribute, the
+        <code>linkName</code> attribute, or the <code>page</code> attribute.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>indexed</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Valid only inside of logic:iterate tag.
+      If yes then indexed parameter with name from indexId attribute
+      will be added to the query string. Indexed parameter looks like
+      "index[32]". Number in brackets will be generated
+      for every iteration and taken from ancestor logic:iterate tag.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>indexId</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      By this attribute different name for the indexed parameter can be
+      specified. Take a look to the "indexed" attribute for details.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>linkName</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The anchor name to be defined within this page, so that
+        you can reference it with intra-page hyperlinks.  In other
+        words, the value specified here will render a "name" element
+        in the generated anchor tag.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>name</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The name of a JSP bean that contains a <code>Map</code>
+        representing the query parameters (if <code>property</code>
+        is not specified), or a JSP bean whose property getter is
+        called to return a <code>Map</code> (if <code>property</code>
+        is specified).</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>page</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The applicaiton-relative path (beginning with a "/"
+        character) to which this hyperlink will transfer control
+        if activated.  This hyperlink may be dynamically modified
+        by the inclusion of query parameters, as described in the
+        tag description.  You <strong>must</strong> specify exactly
+        one of the <code>action</code> attribute, the <code>forward</code>
+        attribute, the <code>href</code> attribute, the <code>linkName</code>
+        attribute, or the <code>page</code> attribute.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>paramId</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The name of the request parameter that will be dynamically
+        added to the generated hyperlink.  The corresponding value is
+        defined by the <code>paramName</code> and (optional)
+        <code>paramProperty</code> attributes, optionally scoped by
+        the <code>paramScope</code> attributel</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>paramName</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The name of a JSP bean that is a String containing the
+        value for the request parameter named by <code>paramId</code>
+        (if <code>paramProperty</code> is not specified), or a JSP
+        bean whose property getter is called to return a String
+        (if <code>paramProperty</code> is specified).  The JSP bean
+        is constrained to the bean scope specified by the
+        <code>paramScope</code> property, if it is specified.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>paramProperty</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The name of a property of the bean specified by the
+        <code>paramName</code> attribute, whose return value must
+        be a String containing the value of the request parameter
+        (named by the <code>paramId</code> attribute) that will be
+        dynamically added to this hyperlink.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>paramScope</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The scope within which to search for the bean specified
+        by the <code>paramName</code> attribute.  If not specified,
+        all scopes are searched.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>property</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The name of a property of the bean specified by the
+        <code>name</code> attribute, whose return value must be
+        a <code>java.util.Map</code> containing the query parameters
+        to be added to the hyperlink.  You <strong>must</strong>
+        specify the <code>name</code> attribute if you specify
+        this attribute.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>scope</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>The scope within which to search for the bean specified
+        by the <code>name</code> attribute.  If not specified, all
+        scopes are searched.</p>
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>transaction</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      <p>If set to <code>true</code>, any current transaction
+        control token will be included in the generated hyperlink,
+        so that it will pass an <code>isTokenValid()</code> test
+        in the receiving Action.</p>
+    </info>
+  </attribute>
+</tag>
+
+<tag>
+  <name>hidden</name>
+  <summary>
+    Render A Hidden Field
+  </summary>
+  <tagclass>org.apache.struts.taglib.html.HiddenTag</tagclass>
+  <info>
+    <p>Simulates an HTML &lt;input&gt; element of type hidden, populated
+      from the specified value or the specified property of the bean
+      associated with our current form. This tag is only valid when
+      nested inside a card tag body.</p>
+  </info>
+
+  <attribute>
+    <name>indexed</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Valid only inside of logic:iterate tag.
+      If yes then name of the wml tag will be rendered as
+      "id[34].propertyName". Number in brackets will be generated
+      for every iteration and taken from ancestor logic:iterate tag.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>name</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      The attribute name of the bean whose properties are consulted
+      when rendering the current value of this input field. If not
+      specified, the bean associated with the form tag we are nested
+      within is utilized.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>property</name>
+    <required>true</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Name of this input field, and the name of the corresponding bean
+      property if value is not specified. The corresponding bean property
+      (if any) must be of type String.
+    </info>
+  </attribute>
+
+  <attribute>
+    <name>value</name>
+    <required>false</required>
+    <rtexprvalue>true</rtexprvalue>
+    <info>
+      Value to which this field should be initialized. [Use the
+      corresponding bean property value]
+    </info>
+  </attribute>
+</tag>
+
+
+</taglib>
+
+</body>
+
+</document>
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/AccessTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/AccessTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/AccessTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/AccessTag.java	2003-02-03 16:48:18.000000000 -0500
@@ -0,0 +1,141 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v 1.18 2002/01/28 06:07:38 martinc Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/01/28 06:07:38 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.Tag;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+import org.apache.struts.util.ResponseUtils;
+
+/**
+ * Custom tag which generates an <code>&lt;access&gt;</code> element.
+ *
+ * @author Mitchell Morris
+ * @version $Revision: 1.18 $ $Date: 2002/01/28 06:07:38 $
+ */
+public class AccessTag extends TagSupport {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  protected String domain = null;
+  protected String path = null;
+
+  public String getDomain() {
+    return domain;
+  }
+  public void setDomain(String domain) {
+    this.domain = domain;
+  }
+  public void setPath(String path) {
+    this.path = path;
+  }
+  public String getPath() {
+    return path;
+  }
+
+
+  /**
+   * Render the start of the tag.
+   * @return A symbolic constant to tell the JSP compiler what to do
+   * @throws JspException if the lower layers do
+   */
+  public int doStartTag() throws javax.servlet.jsp.JspException {
+    // This can only occur in a <head> tag.
+    HeadTag head = (HeadTag)findAncestorWithClass(this, HeadTag.class);
+    if(head == null) {
+      JspException e = new JspException(messages.getMessage("access.noEnclosingHead"));
+      RequestUtils.saveException(pageContext, e);
+      throw e;
+    }
+
+    StringBuffer results = new StringBuffer("<access");
+    if(domain != null) {
+      results.append(" domain=\"");
+      results.append(domain);
+      results.append("\"");
+    }
+    if(path != null) {
+      results.append(" path=\"");
+      results.append(path);
+      results.append("\"");
+    }
+    results.append("/>");
+    ResponseUtils.write(pageContext, results.toString());
+    return Tag.SKIP_BODY;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    this.domain = null;
+    this.path = null;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/BaseFieldTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/BaseFieldTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/BaseFieldTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/BaseFieldTag.java	2003-02-03 16:48:38.000000000 -0500
@@ -0,0 +1,201 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 1.11 2001/12/11 17:54:28 oalexeev Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/12/11 17:54:28 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.Tag;
+
+import org.apache.struts.util.RequestUtils;
+import org.apache.struts.util.ResponseUtils;
+
+
+/**
+ * Convenience base class for the various input tags for text fields.
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 1.11 $ $Date: 2001/12/11 17:54:28 $
+ */
+public abstract class BaseFieldTag extends BaseInputTag {
+  protected String name = Constants.BEAN_KEY;
+  protected boolean redisplay = true;
+  protected String type = "";
+  protected boolean emptyOk;
+  protected String format;
+
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+  public void setRedisplay(boolean redisplay) {
+    this.redisplay = redisplay;
+  }
+  public boolean isRedisplay() {
+    return redisplay;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+  public String getType() {
+    return type;
+  }
+  public void setEmptyOk(boolean emptyOk) {
+    this.emptyOk = emptyOk;
+  }
+  public boolean isEmptyOk() {
+    return emptyOk;
+  }
+  public void setFormat(String format) {
+    this.format = format;
+  }
+  public String getFormat() {
+    return format;
+  }
+
+
+  /**
+   * Generate the required input tag.
+   * Indexed property since 1.1
+   *
+   * @return A symbolic constant to tell the JSP compiler what to do
+   *
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    // Make sure we're inside a <card> element.
+    CardTag card = (CardTag)pageContext.getAttribute(Constants.FORM_KEY, PageContext.REQUEST_SCOPE);
+    if(card == null) {
+      // this tag should only be nested in CardTag, if it's not, throw exception
+      JspException e = new JspException(messages.getMessage("input.noEnclosingCard"));
+      RequestUtils.saveException(pageContext, e);
+      throw e;
+    }
+
+    // Create an appropriate "input" element based on our parameters
+    StringBuffer results = new StringBuffer("<input type=\"");
+    results.append(type);
+
+    // Grab the bits that will need to appear in a postfield eventually
+    results.append("\" name=\"");
+    StringBuffer field = new StringBuffer();
+    if(indexed)
+      prepareIndex(field, name);
+    field.append(property);
+    results.append(card.addField(field.toString()));
+    results.append("\"");
+
+    if(maxlength != null) {
+      results.append(" maxlength=\"");
+      results.append(maxlength);
+      results.append("\"");
+    }
+    if(cols != null) {
+      results.append(" size=\"");
+      results.append(cols);
+      results.append("\"");
+    }
+    if(format != null) {
+      results.append(" format=\"");
+      results.append(format);
+      results.append("\"");
+    }
+    results.append(" value=\"");
+    if(value != null) {
+      results.append(ResponseUtils.filter(value));
+    } else if(redisplay || !"password".equals(type)) {
+      Object value = RequestUtils.lookup(pageContext, name, property, null);
+      if(value == null)
+        value = "";
+      results.append(ResponseUtils.filter(value.toString()));
+    }
+    results.append("\">");
+
+    // Print this field to our output writer
+    ResponseUtils.write(pageContext, results.toString());
+
+    // Continue processing this page
+    return Tag.EVAL_BODY_INCLUDE;
+  }
+
+
+  /**
+   * Handle the end of the input tag.
+   * @return A symbolic constant to tell the JSP compiler what to do.
+   * @throws JspException if something breaks
+   */
+  public int doEndTag() throws JspException {
+    ResponseUtils.write(pageContext, "</input>");
+    return EVAL_PAGE;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    name = Constants.BEAN_KEY;
+    redisplay = true;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/BaseHandlerTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/BaseHandlerTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/BaseHandlerTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/BaseHandlerTag.java	2003-02-03 16:48:53.000000000 -0500
@@ -0,0 +1,259 @@
+package org.apache.struts.taglib.wml;
+
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v 1.13 2002/01/13 03:38:38 craigmcc Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/01/13 03:38:38 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Locale;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.Globals;
+import org.apache.struts.taglib.logic.IterateTag;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+
+/**
+ * This class provides support for WML elements that support events and/or
+ * style sheets.
+ */
+public abstract class BaseHandlerTag extends BodyTagSupport implements Serializable {
+  private static Log log = LogFactory.getLog(BaseHandlerTag.class);
+
+  /**
+   * The default Locale for our server.
+   */
+  protected static final Locale defaultLocale = Locale.getDefault();
+
+
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  protected String bundle;
+  protected String locale;
+  protected boolean indexed;
+  protected String title;
+
+  public void setBundle(String bundle) {
+    this.bundle = bundle;
+  }
+  public String getBundle() {
+    return bundle;
+  }
+  public void setLocale(String locale) {
+    this.locale = locale;
+  }
+  public String getLocale() {
+    return locale;
+  }
+  public void setIndexed(boolean indexed) {
+    this.indexed = indexed;
+  }
+  public boolean isIndexed() {
+    return indexed;
+  }
+  public void setTitle(String title) {
+    this.title = title;
+  }
+  public String getTitle() {
+    return title;
+  }
+
+  /**
+   * Look up a message from the message catalog.
+   *
+   * @return The literal value, or the message corresponding to the key, or null
+   * if there is no such message.
+   *
+   * @param literal Literal text value or <code>null</code>
+   * @param key Message resources key or <code>null</code>
+   *
+   * @exception JspException if both arguments are non-null
+   */
+  protected String message(String literal, String key) throws JspException {
+    if(literal != null) {
+      if(key != null) {
+        JspException e = new JspException(messages.getMessage("common.both"));
+        RequestUtils.saveException(pageContext, e);
+        throw e;
+      } else {
+        return (literal);
+      }
+    } else {
+      if(key != null) {
+        return (RequestUtils.message(pageContext, getBundle(), getLocale(), key));
+      } else {
+        return null;
+      }
+    }
+  }
+
+
+  private Class loopTagSupportClass = null;
+  private Method loopTagSupportGetStatus = null;
+  private Class loopTagStatusClass = null;
+  private Method loopTagStatusGetIndex = null;
+  private boolean triedJstlInit = false;
+  private boolean triedJstlSuccess = false;
+
+  private Integer getJstlLoopIndex() {
+    if(!triedJstlInit) {
+      triedJstlInit = true;
+      try {
+        loopTagSupportClass =
+            RequestUtils.applicationClass("javax.servlet.jsp.jstl.core.LoopTagSupport");
+        loopTagSupportGetStatus =
+            loopTagSupportClass.getDeclaredMethod("getLoopStatus", null);
+        loopTagStatusClass =
+            RequestUtils.applicationClass("javax.servlet.jsp.jstl.core.LoopTagStatus");
+        loopTagStatusGetIndex =
+            loopTagStatusClass.getDeclaredMethod("getIndex", null);
+        triedJstlSuccess = true;
+      } catch (ClassNotFoundException ex) {
+        // These just mean that JSTL isn't loaded, so ignore
+      } catch (NoSuchMethodException ex) {
+        // These just mean that JSTL isn't loaded, so ignore
+      }
+    }
+    if(triedJstlSuccess) {
+      try {
+        Object loopTag = findAncestorWithClass(this, loopTagSupportClass);
+        if(loopTag == null)  {
+          return null;
+        }
+        Object status = loopTagSupportGetStatus.invoke(loopTag, null);
+        return (Integer) loopTagStatusGetIndex.invoke(status, null);
+      } catch (IllegalAccessException ex) {
+        log.error(ex.getMessage(), ex);
+      } catch (IllegalArgumentException ex) {
+        log.error(ex.getMessage(), ex);
+      } catch (InvocationTargetException ex) {
+        log.error(ex.getMessage(), ex);
+      } catch (NullPointerException ex) {
+        log.error(ex.getMessage(), ex);
+      } catch (ExceptionInInitializerError ex) {
+        log.error(ex.getMessage(), ex);
+      }
+    }
+    return null;
+  }
+
+
+   /**
+   *  Appends bean name with index in brackets for tags with
+   *  'true' value in 'indexed' attribute.
+   *  @param handlers The StringBuffer that output will be appended to.
+   *  @param name The name of the field, if any
+   *  @exception JspException if 'indexed' tag used outside of iterate tag.
+   */
+  protected void prepareIndex(StringBuffer handlers, String name) throws JspException {
+    int index = 0;
+    boolean found = false;
+
+    // look for outer iterate tag
+    IterateTag iterateTag = (IterateTag)findAncestorWithClass(this, IterateTag.class);
+    // Look for JSTL loops
+    if(iterateTag == null) {
+      Integer i = getJstlLoopIndex();
+      if(i != null) {
+        index = i.intValue();
+        found = true;
+      }
+    } else {
+      index = iterateTag.getIndex();
+      found = true;
+    }
+    if(!found) {
+      // this tag should only be nested in iteratetag, if it's not, throw exception
+      JspException e = new JspException(messages.getMessage("indexed.noEnclosingIterate"));
+      RequestUtils.saveException(pageContext, e);
+      throw e;
+    }
+    if(name != null) {
+      handlers.append( name );
+    }
+    handlers.append("[");
+    handlers.append(index);
+    handlers.append("]");
+    if(name != null) {
+      handlers.append(".");
+    }
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    bundle = null;
+    locale = Globals.LOCALE_KEY;
+    indexed = false;
+    title = null;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/BaseInputTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/BaseInputTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/BaseInputTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/BaseInputTag.java	2003-02-03 16:49:10.000000000 -0500
@@ -0,0 +1,163 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseInputTag.java,v 1.1 2001/01/06 21:50:39 mschachter Exp $
+ * $Revision: 1.1 $
+ * $Date: 2001/01/06 21:50:39 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.Tag;
+
+import org.apache.struts.util.MessageResources;
+
+/**
+ * Abstract base class for the various input tags.
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 1.1 $ $Date: 2001/01/06 21:50:39 $
+ */
+public abstract class BaseInputTag extends BaseHandlerTag {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  protected String cols;
+  protected String rows;
+  protected String property;
+  protected String maxlength;
+  protected String value;
+  protected String size;
+
+  public String getCols() {
+    return cols;
+  }
+  public void setCols(String cols) {
+    this.cols = cols;
+  }
+  public void setRows(String rows) {
+    this.rows = rows;
+  }
+  public String getRows() {
+    return rows;
+  }
+  public void setProperty(String property) {
+    this.property = property;
+  }
+  public String getProperty() {
+    return property;
+  }
+  public void setMaxlength(String maxlength) {
+    this.maxlength = maxlength;
+  }
+  public String getMaxlength() {
+    return maxlength;
+  }
+  public void setValue(String value) {
+    this.value = value;
+  }
+  public String getValue() {
+    return value;
+  }
+  public void setSize(String size) {
+    this.size = size;
+  }
+  public String getSize() {
+    return size;
+  }
+
+
+  /**
+   * Process the start of this tag.  The default implementation does nothing.
+   *
+   * @return A symblic constant to tell the JSP compiler what to do next
+   *
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    return Tag.EVAL_BODY_INCLUDE;
+  }
+
+
+  /**
+   * Process the end of this tag.  The default implementation does nothing.
+   *
+   * @return A symblic constant to tell the JSP compiler what to do next
+   *
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doEndTag() throws JspException {
+    return Tag.EVAL_PAGE;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    cols = null;
+    maxlength = null;
+    property = null;
+    rows = null;
+    value = null;
+    size = null;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/CardTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/CardTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/CardTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/CardTag.java	2003-02-03 18:17:36.000000000 -0500
@@ -0,0 +1,595 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v 1.18 2002/01/28 06:07:38 martinc Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/01/28 06:07:38 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+
+package org.apache.struts.taglib.wml;
+
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Locale;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.BodyContent;
+import javax.servlet.jsp.tagext.BodyTag;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.Globals;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionServlet;
+import org.apache.struts.config.FormBeanConfig;
+import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.util.LabelValueBean;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+
+
+/**
+ * Custom tag that represents an input form, associated with a bean whose
+ * properties correspond to the various fields of the form.
+ *
+ * @author Craig R. McClanahan
+ * @author Mitchell Morris
+ * @version $Revision: 1.18 $ $Date: 2002/01/28 06:07:38 $
+ */
+public class CardTag extends BodyTagSupport {
+  private static final Log log = LogFactory.getLog(CardTag.class);
+
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  protected static final Locale defaultLocale = Locale.getDefault();
+
+  /**
+    * The module configuration for our module.
+    */
+  protected ModuleConfig moduleConfig = null;
+
+  /**
+    * The ActionServlet instance we are associated with (so that we can
+    * initialize the <code>servlet</code> property on any form bean that
+    * we create).
+    */
+  protected ActionServlet servlet = null;
+
+  /**
+    * The name of the form bean to (create and) use. This is either the same
+    * as the 'name' attribute, if that was specified, or is obtained from the
+    * associated <code>ActionMapping</code> otherwise.
+    */
+  protected String beanName = null;
+
+  /**
+    * The scope of the form bean to (create and) use. This is either the same
+    * as the 'scope' attribute, if that was specified, or is obtained from the
+    * associated <code>ActionMapping</code> otherwise.
+    */
+  protected String beanScope = null;
+
+  /**
+    * The type of the form bean to (create and) use. This is either the same
+    * as the 'type' attribute, if that was specified, or is obtained from the
+    * associated <code>ActionMapping</code> otherwise.
+    */
+  protected String beanType = null;
+
+  protected String action = null;
+  protected org.apache.struts.action.ActionMapping mapping = null;
+  protected String method = "post";
+  protected String scope = "session";
+  protected String type = null;
+  protected String labelValue = null;
+  protected String labelKey = null;
+  protected String labelName = null;
+  protected String labelProperty = null;
+  protected String bundle = Globals.MESSAGES_KEY;
+  protected String locale = Globals.LOCALE_KEY;
+  protected ArrayList fields = new ArrayList();
+  protected String newcontext = null;
+  protected String text = null;
+  protected String name;
+
+  public String getAction() {
+    return action;
+  }
+  public void setAction(String action) {
+    this.action = action;
+  }
+  public void setMapping(org.apache.struts.action.ActionMapping mapping) {
+    this.mapping = mapping;
+  }
+  public org.apache.struts.action.ActionMapping getMapping() {
+    return mapping;
+  }
+  public void setMethod(String method) {
+    this.method = method;
+  }
+  public String getMethod() {
+    return method;
+  }
+  public void setScope(String scope) {
+    this.scope = scope;
+  }
+  public String getScope() {
+    return scope;
+  }
+  public void setServlet(org.apache.struts.action.ActionServlet servlet) {
+    this.servlet = servlet;
+  }
+  public org.apache.struts.action.ActionServlet getServlet() {
+    return servlet;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+  public String getType() {
+    return type;
+  }
+  public void setLabelValue(String labelValue) {
+    this.labelValue = labelValue;
+  }
+  public String getLabelValue() {
+    return labelValue;
+  }
+  public void setLabelKey(String labelKey) {
+    this.labelKey = labelKey;
+  }
+  public String getLabelKey() {
+    return labelKey;
+  }
+  public void setLabelName(String labelName) {
+    this.labelName = labelName;
+  }
+  public String getLabelName() {
+    return labelName;
+  }
+  public void setLabelProperty(String labelProperty) {
+    this.labelProperty = labelProperty;
+  }
+  public String getLabelProperty() {
+    return labelProperty;
+  }
+  public void setBundle(String bundle) {
+    this.bundle = bundle;
+  }
+  public String getBundle() {
+    return bundle;
+  }
+  public void setLocale(String locale) {
+    this.locale = locale;
+  }
+  public String getLocale() {
+    return locale;
+  }
+  public void setNewcontext(String newcontext) {
+    this.newcontext = newcontext;
+  }
+  public String getNewcontext() {
+    return newcontext;
+  }
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+    * Return the name of the form bean corresponding to this tag. There is
+    * no corresponding setter method; this method exists so that the nested
+    * tag classes can obtain the actual bean name derived from other
+    * attributes of the tag.
+    * @return the name of the form bean
+    */
+  public String getBeanName() {
+    return beanName;
+  }
+
+
+  /**
+   * Add a new field to the list of things to be submitted later.
+   * @param field The field as it should appear to the servlet when we post it.
+   * @return The valid variable name we've decided to use for this field
+   */
+  public String addField(String field) {
+    String fieldName = toVarName(field);
+    addField(field, "$" + fieldName);
+    return fieldName;
+  }
+
+  /**
+   * Add a new field to the list of things to be submitted later.
+   * @param field The field as it should appear to the servlet when we post it.
+   * @param value What the field should hold when it gets there.
+   */
+  public void addField(String field, String value) {
+    fields.add(new LabelValueBean(field, value));
+  }
+
+  /**
+   * Convert a valid field name to a safe form that WML will accept as a
+   * variable name.
+   *
+   * @param field The field as it should appear to the servlet when we post it.
+   * @return The cooked form of the name, safe for use as a variable.
+   */
+  public String toVarName(String field) {
+    StringBuffer sb = new StringBuffer(field);
+    return "var_" + sb.hashCode();
+  }
+
+
+  /**
+   * Format the name/value as a <postfield> element.
+   * @param results The buffer to which the argument should be appended
+   * @param name The name of the argument
+   * @param value The name of the value
+   */
+  private void asPost(StringBuffer results, String name, String value) {
+    results.append("<postfield name=\"");
+    results.append(name);
+    results.append("\" value=\"");
+    results.append(value);
+    results.append("\"/>");
+  }
+
+
+  /**
+   * Figure out which (if any) of labelValue, labelKey, labelName,
+   * and labelProperty actually holds the label.
+   * @return a (possibly null) String containing the text of the label
+   * @throws JspException if we can't find some piece of the required infrastructure
+   */
+  private String retrieveLabel() throws JspException {
+    // Easiest case ... the user said what he wanted
+    if(labelValue != null) {
+      return labelValue;
+    }
+
+    // The user said to look it up in the message catalog
+    if(labelKey != null) {
+      return RequestUtils.message(pageContext, this.bundle, this.locale, labelKey);
+    }
+
+    // The user specified a bean
+    if(labelName != null) {
+      Object bean = pageContext.findAttribute(labelName);
+      if(bean == null) {
+        throw new JspException(messages.getMessage("getter.bean", labelName));
+      }
+      Object current = bean;
+      try {
+        current = BeanUtils.getProperty(bean, labelProperty);
+        if(current == null) {
+          current = "";
+        }
+      } catch(IllegalAccessException e) {
+        throw new JspException(messages.getMessage("getter.access", labelProperty, labelName));
+      } catch(InvocationTargetException e) {
+        Throwable t = e.getTargetException();
+        throw new JspException(messages.getMessage("getter.result", labelProperty, t.toString()));
+      } catch(NoSuchMethodException e) {
+        throw new JspException(messages.getMessage("getter.method", labelProperty, labelName));
+      }
+      return current.toString();
+    }
+
+    return null;
+  }
+
+
+
+  /**
+   * Set up the environment so our child elements will find all the bits
+   * and pieces they expect. Note that no output is generated, since we
+   * don't have all the information we require just yet.
+   *
+   * @return a symbolic constant of what the JSP compiler should do next
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    // <card> tags don't nest
+    CardTag tag = (CardTag)findAncestorWithClass(this, CardTag.class);
+    if(tag != null) {
+      throw new JspException(messages.getMessage("cardTag.nesting"));
+    }
+
+    if(action != null) {
+      // Look up the form bean name, scope, and type if necessary
+      lookup();
+
+      // Locate or create the bean associated with our form
+      int scope = PageContext.SESSION_SCOPE;
+      if("request".equals(this.scope)) {
+        scope = PageContext.REQUEST_SCOPE;
+      }
+      Object bean = pageContext.getAttribute(beanName, scope);
+      if(bean == null) {
+        if (type != null) {
+          // Backwards compatibility - use explicitly specified values
+          try {
+            bean = RequestUtils.applicationInstance(beanType);
+            if(bean != null) {
+              ((ActionForm)bean).setServlet(servlet);
+            }
+          } catch (Exception e) {
+            throw new JspException(messages.getMessage("cardTag.create", type, e.toString()));
+          }
+        } else {
+          // New and improved - use the values from the action mapping
+          bean = RequestUtils.createActionForm((HttpServletRequest)pageContext.getRequest(),
+              mapping, moduleConfig, servlet);
+        }
+        if(bean instanceof ActionForm) {
+          ((ActionForm)bean).reset(mapping, (HttpServletRequest) pageContext.getRequest());
+        }
+        if(bean == null) {
+          throw new JspException(messages.getMessage("cardTag.create", beanType));
+        }
+        pageContext.setAttribute(beanName, bean, scope);
+      }
+      pageContext.setAttribute(Constants.BEAN_KEY, bean, PageContext.REQUEST_SCOPE);
+    }
+
+    text = null;
+    fields.clear();
+
+    // Store this tag itself as a page attribute
+    pageContext.setAttribute(Constants.FORM_KEY, this, PageContext.REQUEST_SCOPE);
+
+    // Continue processing this page
+    return BodyTag.EVAL_BODY_BUFFERED;
+  }
+
+
+  /**
+   * Render the beginning of this form. Basically, we want to run through all
+   * our body content, saving up the output. Once we know how many input
+   * fields there are, we can write our <card> tag with the appropriate
+   * <postfield> elements.
+   *
+   * @return a symbolic constant of what the JSP compiler should do next
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doAfterBody() throws JspException {
+    if(bodyContent != null) {
+      String value = bodyContent.getString().trim();
+      if(value.length() > 0)
+        text = value;
+    }
+    return BodyTag.SKIP_BODY;
+  }
+
+
+  /**
+   * Render the end of this form.
+   *
+   * @return a symbolic constant of what the JSP compiler should do next
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doEndTag() throws JspException {
+    // Remove the page scope attributes we created
+    pageContext.removeAttribute(Constants.BEAN_KEY, PageContext.REQUEST_SCOPE);
+    pageContext.removeAttribute(Constants.FORM_KEY, PageContext.REQUEST_SCOPE);
+
+    // Create an appropriate "card" element based on our parameters
+    StringBuffer results = new StringBuffer("<card");
+    if(id != null) {
+      results.append(" id=\"");
+      results.append(id);
+      results.append("\"");
+    }
+    if(newcontext != null) {
+      results.append(" newcontext=\"");
+      results.append(newcontext);
+      results.append("\"");
+    }
+    results.append(">");
+
+    if(action != null) {
+      // Look up the form bean name, scope, and type if necessary
+      lookup();
+
+      // Optionally write a do section if we have an associated action
+      results.append("<do type=\"accept\"");
+      String label = retrieveLabel();
+      if(label != null) {
+        results.append(" label=\"");
+        results.append(label);
+        results.append("\"");
+        }
+      results.append(">");
+      results.append("<go href=\"");
+      HttpServletResponse response = (HttpServletResponse)pageContext.getResponse();
+      results.append(response.encodeURL(RequestUtils.getActionMappingURL(action, pageContext)));
+      results.append("\" method=\"");
+      results.append(method);
+      results.append("\">");
+
+      // Add a transaction token (if present in our session)
+      HttpSession session = pageContext.getSession();
+      if(session != null) {
+        String token = (String)session.getAttribute(Globals.TRANSACTION_TOKEN_KEY);
+        if(token != null)
+          asPost(results, Constants.TOKEN_KEY, token);
+      }
+
+      // Add our form-specific postfield elements
+      Iterator it = fields.iterator();
+      while(it.hasNext()) {
+        LabelValueBean fld = (LabelValueBean)it.next();
+        asPost(results, fld.getLabel(), fld.getValue());
+      }
+
+      results.append("</go>");
+      results.append("</do>");
+    }
+
+    // Now our body
+    if(text != null) {
+      results.append(text);
+    }
+
+    // And our finish
+    results.append("</card>");
+
+    // Print this value to our output writer
+    JspWriter writer = pageContext.getOut();
+    try {
+      writer.print(results.toString());
+    } catch (IOException e) {
+      log.error("uh-oh", e);
+      throw new JspException(messages.getMessage("common.io", e.toString()));
+    }
+
+    // Continue processing this page
+    return BodyTag.EVAL_PAGE;
+  }
+
+
+  /**
+  * Release any acquired resources.
+  */
+  public void release() {
+    super.release();
+    action = null;
+    moduleConfig = null;
+    servlet = null;
+    mapping = null;
+    method = "post";
+    scope = "session";
+    servlet = null;
+    type = null;
+    labelValue = null;
+    labelKey = null;
+    labelName = null;
+    labelProperty = null;
+    bundle = Globals.MESSAGES_KEY;
+    locale = Globals.LOCALE_KEY;
+    fields.clear();
+    newcontext = null;
+    text = null;
+  }
+
+
+  /**
+   * Look up values for the <code>name</code>, <code>scope</code>, and
+   * <code>type</code> properties if necessary.
+   *
+   * @exception JspException if a required value cannot be looked up
+   */
+  protected void lookup() throws JspException {
+    // Look up the module configuration information we need
+    moduleConfig = RequestUtils.getModuleConfig(pageContext);
+
+    if(moduleConfig == null) {
+      JspException e = new JspException(messages.getMessage("cardTag.collections"));
+      pageContext.setAttribute(Globals.EXCEPTION_KEY, e, PageContext.REQUEST_SCOPE);
+      throw e;
+    }
+    servlet = (ActionServlet)pageContext.getServletContext().getAttribute(Globals.ACTION_SERVLET_KEY);
+
+    // Look up the action mapping we will be submitting to
+    String mappingName = RequestUtils.getActionMappingName(action);
+    mapping = (ActionMapping) moduleConfig.findActionConfig(mappingName);
+    if(mapping == null) {
+      JspException e = new JspException(messages.getMessage("cardTag.mapping", mappingName));
+      pageContext.setAttribute(Globals.EXCEPTION_KEY, e, PageContext.REQUEST_SCOPE);
+      throw e;
+    }
+
+    // Were the required values already specified?
+    if(name != null) {
+      if(type == null) {
+        JspException e = new JspException(messages.getMessage("cardTag.nameType"));
+        pageContext.setAttribute(Globals.EXCEPTION_KEY, e, PageContext.REQUEST_SCOPE);
+        throw e;
+      }
+      beanName = name;
+      beanScope = (scope == null ? "session" : scope);
+      beanType = type;
+      return;
+    }
+
+    // Look up the form bean definition
+    FormBeanConfig formBeanConfig = moduleConfig.findFormBeanConfig(mapping.getName());
+    if(formBeanConfig == null) {
+      JspException e = new JspException(messages.getMessage("cardTag.formBean", mapping.getName()));
+      pageContext.setAttribute(Globals.EXCEPTION_KEY, e, PageContext.REQUEST_SCOPE);
+      throw e;
+    }
+
+    // Calculate the required values
+    beanName = mapping.getAttribute();
+    beanScope = mapping.getScope();
+    beanType = formBeanConfig.getType();
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/Constants.java contrib/wml/src/share/org/apache/struts/taglib/wml/Constants.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/Constants.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/Constants.java	2003-02-03 15:22:55.000000000 -0500
@@ -0,0 +1,116 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/Constants.java,v 1.3 2001/02/23 21:13:10 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/02/23 21:13:10 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+
+package org.apache.struts.taglib.wml;
+
+
+/**
+ * Manifest constants for this package.
+ */
+
+public class Constants {
+
+
+    /**
+     * The name of this package.
+     */
+    public static final String Package = "org.apache.struts.taglib.wml";
+
+
+    /**
+     * The attribute key for the bean our form is related to.
+     */
+    public static final String BEAN_KEY = Package + ".BEAN";
+
+
+    /**
+     * The property under which a Cancel button press is reported.
+     */
+    public static final String CANCEL_PROPERTY = Package + ".CANCEL";
+
+
+    /**
+     * The property under which a Cancel button press is reported, if the
+     * Cancel button is rendered as an image.
+     */
+    public static final String CANCEL_PROPERTY_X = Package + ".CANCEL.x";
+
+
+    /**
+     * The attribute key for the form tag itself.
+     */
+    public static final String FORM_KEY = Package + ".FORM";
+
+
+    /**
+     * The attribute key for the select tag itself.
+     */
+    public static final String SELECT_KEY = Package + ".SELECT";
+
+
+    /**
+     * The property under which a transaction token is reported.
+     */
+    public static final String TOKEN_KEY = Package + ".TOKEN";
+
+
+}
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/ErrorsTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/ErrorsTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/ErrorsTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/ErrorsTag.java	2003-02-03 16:49:58.000000000 -0500
@@ -0,0 +1,228 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java,v 1.14 2002/03/17 05:07:35 craigmcc Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/03/17 05:07:35 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import java.util.Iterator;
+import java.util.Locale;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.Tag;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.struts.Globals;
+import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+import org.apache.struts.util.ResponseUtils;
+
+
+/**
+ * Custom tag that renders error messages if an appropriate request attribute
+ * has been created.  The tag looks for a request attribute with a reserved
+ * key, and assumes that it is either a String, a String array, containing
+ * message keys to be looked up in the application's MessageResources, or
+ * an object of type <code>org.apache.struts.action.ActionErrors</code>.
+ * <p>
+ * The following optional message keys will be utilized if corresponding
+ * messages exist for them in the application resources:
+ * <ul>
+ * <li><b>errors.header</b> - If present, the corresponding message will be
+ *     rendered prior to the individual list of error messages.
+ * <li><b>errors.footer</b> - If present, the corresponding message will be
+ *     rendered following the individual list of error messages.
+ * <li><b>
+ * </ul>
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 1.14 $ $Date: 2002/03/17 05:07:35 $
+ */
+public class ErrorsTag extends TagSupport {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  /**
+   * The default locale on our server.
+   */
+  protected static Locale defaultLocale = Locale.getDefault();
+
+  protected String bundle = Globals.MESSAGES_KEY;
+  protected String locale = Globals.LOCALE_KEY;
+  protected String name = Globals.ERROR_KEY;
+  protected String property = null;
+
+  public String getBundle() {
+    return bundle;
+  }
+  public void setBundle(String bundle) {
+    this.bundle = bundle;
+  }
+  public void setLocale(String locale) {
+    this.locale = locale;
+  }
+  public String getLocale() {
+    return locale;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+  public String getName() {
+    return name;
+  }
+  public void setProperty(String property) {
+    this.property = property;
+  }
+  public String getProperty() {
+    return property;
+  }
+
+
+  /**
+   * Render the specified error messages if there are any.
+   *
+   * @return A symbolic constant telling the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    // Were any error messages specified?
+    ActionErrors errors = null;
+    try {
+      errors = RequestUtils.getActionErrors(pageContext, name);
+    } catch (JspException e) {
+      RequestUtils.saveException(pageContext, e);
+      throw e;
+    }
+    if((errors == null) || errors.isEmpty()) {
+      return Tag.EVAL_BODY_INCLUDE;
+    }
+
+    // Check for presence of header and footer message keys
+    boolean headerPresent =
+        RequestUtils.present(pageContext, bundle, locale, "errors.header");
+    boolean footerPresent =
+        RequestUtils.present(pageContext, bundle, locale, "errors.footer");
+    boolean prefixPresent =
+        RequestUtils.present(pageContext, bundle, locale, "errors.prefix");
+    boolean suffixPresent =
+        RequestUtils.present(pageContext, bundle, locale, "errors.suffix");
+
+    // Render the error messages appropriately
+    StringBuffer results = new StringBuffer();
+    boolean headerDone = false;
+    String message = null;
+    Iterator reports = null;
+    if(property == null) {
+      reports = errors.get();
+    } else {
+      reports = errors.get(property);
+    }
+    while (reports.hasNext()) {
+      ActionError report = (ActionError)reports.next();
+      if(!headerDone) {
+        if(headerPresent) {
+          message = RequestUtils.message(pageContext, bundle, locale, "errors.header");
+          results.append(message);
+          results.append("\r\n");
+        }
+        headerDone = true;
+      }
+      if(prefixPresent) {
+        message = RequestUtils.message(pageContext, bundle, locale, "errors.prefix");
+        results.append(message);
+      }
+      message = RequestUtils.message(pageContext, bundle, locale, report.getKey(), report.getValues());
+      if(message != null) {
+        results.append(message);
+        results.append("\r\n");
+      }
+      if(suffixPresent) {
+        message = RequestUtils.message(pageContext, bundle, locale, "errors.suffix");
+        results.append(message);
+      }
+    }
+    if(headerDone && footerPresent) {
+      message = RequestUtils.message(pageContext, bundle, locale, "errors.footer");
+      results.append(message);
+      results.append("\r\n");
+    }
+
+    // Print the results to our output writer
+    ResponseUtils.write(pageContext, results.toString());
+
+    // Continue processing this page
+    return Tag.EVAL_BODY_INCLUDE;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    bundle = Globals.MESSAGES_KEY;
+    locale = Globals.LOCALE_KEY;
+    name = Globals.ERROR_KEY;
+    property = null;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/HeadTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/HeadTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/HeadTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/HeadTag.java	2003-02-03 16:50:12.000000000 -0500
@@ -0,0 +1,96 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v 1.18 2002/01/28 06:07:38 martinc Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/01/28 06:07:38 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import javax.servlet.jsp.tagext.Tag;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.struts.util.ResponseUtils;
+
+
+/**
+ * Custom tag which generates a <code>&lt;head&gt;</code> element.
+ *
+ * @author Mitchell Morris
+ * @version $Revision: 1.18 $ $Date: 2002/01/28 06:07:38 $
+ */
+public class HeadTag extends TagSupport {
+  /**
+   * Generate the opening of the tag.
+   * @return A symbolic constant to tell the JSP compiler what to do next
+   * @throws JspException if the lower layers do
+   */
+  public int doStartTag() throws javax.servlet.jsp.JspException {
+    ResponseUtils.write(pageContext, "<head>");
+    return Tag.EVAL_BODY_INCLUDE;
+  }
+
+  /**
+   * Generate the closing of the tag.
+   * @return A symbolic constant to tell the JSP compiler what to do next
+   * @throws JspException if the lower layers do
+   */
+  public int doEndTag() throws javax.servlet.jsp.JspException {
+    ResponseUtils.write(pageContext, "</head>");
+    return Tag.EVAL_PAGE;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/HiddenTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/HiddenTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/HiddenTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/HiddenTag.java	2003-02-03 16:50:26.000000000 -0500
@@ -0,0 +1,156 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HiddenTag.java,v 1.2 2002/03/17 01:44:41 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/17 01:44:41 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.Tag;
+
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+
+/**
+ * Custom tag for input fields of type "hidden".
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 1.2 $ $Date: 2002/03/17 01:44:41 $
+ */
+public class HiddenTag extends BaseHandlerTag {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  protected String name;
+  protected String property;
+  protected String value;
+
+  public void setName(String name) {
+    this.name = name;
+  }
+  public String getName() {
+    return name;
+  }
+  public void setProperty(String property) {
+    this.property = property;
+  }
+  public String getProperty() {
+    return property;
+  }
+  public void setValue(String value) {
+    this.value = value;
+  }
+  public String getValue() {
+    return value;
+  }
+
+
+  /**
+   * Process the start of this tag. We don't actually write anything to the
+   * WML deck, we just arrange for a postfield element holding our stuff
+   * to appear later.
+   *
+   * @return A symblic constant to tell the JSP compiler what to do next
+   *
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    // Make sure we're inside a <card> element.
+    CardTag card = (CardTag)pageContext.getAttribute(Constants.FORM_KEY, PageContext.REQUEST_SCOPE);
+    if(card == null) {
+      // this tag should only be nested in CardTag, if it's not, throw exception
+      JspException e = new JspException(messages.getMessage("input.noEnclosingCard"));
+      RequestUtils.saveException(pageContext, e);
+      throw e;
+    }
+
+    // Our name
+    StringBuffer field = new StringBuffer();
+    if(indexed)
+      prepareIndex(field, name);
+    field.append(property);
+
+    // Our value (either literal, or looked up from the active form)
+    if(value == null) {
+      Object o = RequestUtils.lookup(pageContext, name, property, null);
+      if(o == null)
+        o = "";
+      value = o.toString();
+    }
+
+    // Remember that
+    card.addField(field.toString(), value);
+
+    return Tag.SKIP_BODY;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    property = null;
+    value = null;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/LinkTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/LinkTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/LinkTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/LinkTag.java	2003-02-03 16:50:40.000000000 -0500
@@ -0,0 +1,333 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v 1.22 2002/03/17 02:49:06 craigmcc Exp $
+ * $Revision: 1.22 $
+ * $Date: 2002/03/17 02:49:06 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import java.net.MalformedURLException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTag;
+
+import org.apache.struts.taglib.logic.IterateTag;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+import org.apache.struts.util.ResponseUtils;
+
+/**
+ * Generate a URL-encoded hyperlink to the specified URI.
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 1.22 $ $Date: 2002/03/17 02:49:06 $
+ */
+public class LinkTag extends BaseHandlerTag {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  protected String action = null;
+  protected String anchor = null;
+  protected String forward = null;
+  protected String href = null;
+  protected String indexId = null;
+  protected String linkName = null;
+  protected String name = null;
+  protected String page = null;
+  protected String paramId = null;
+  protected String paramName = null;
+  protected String paramProperty = null;
+  protected String paramScope = null;
+  protected String property = null;
+  protected String scope = null;
+  protected String text = null;
+  protected boolean transaction = false;
+
+  public void setAction(String action) {
+    this.action = action;
+  }
+  public String getAction() {
+    return action;
+  }
+  public String getAnchor() {
+    return anchor;
+  }
+  public void setAnchor(String anchor) {
+    this.anchor = anchor;
+  }
+  public void setForward(String forward) {
+    this.forward = forward;
+  }
+  public String getForward() {
+    return forward;
+  }
+  public void setHref(String href) {
+    this.href = href;
+  }
+  public String getHref() {
+    return href;
+  }
+  public void setIndexId(String indexId) {
+    this.indexId = indexId;
+  }
+  public String getIndexId() {
+    return indexId;
+  }
+  public void setLinkName(String linkName) {
+    this.linkName = linkName;
+  }
+  public String getLinkName() {
+    return linkName;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+  public String getName() {
+    return name;
+  }
+  public void setPage(String page) {
+    this.page = page;
+  }
+  public String getPage() {
+    return page;
+  }
+  public void setParamId(String paramId) {
+    this.paramId = paramId;
+  }
+  public String getParamId() {
+    return paramId;
+  }
+  public void setParamName(String paramName) {
+    this.paramName = paramName;
+  }
+  public String getParamName() {
+    return paramName;
+  }
+  public void setParamProperty(String paramProperty) {
+    this.paramProperty = paramProperty;
+  }
+  public String getParamProperty() {
+    return paramProperty;
+  }
+  public void setParamScope(String paramScope) {
+    this.paramScope = paramScope;
+  }
+  public String getParamScope() {
+    return paramScope;
+  }
+  public void setProperty(String property) {
+    this.property = property;
+  }
+  public String getProperty() {
+    return property;
+  }
+  public void setScope(String scope) {
+    this.scope = scope;
+  }
+  public String getScope() {
+    return scope;
+  }
+  public void setTransaction(boolean transaction) {
+    this.transaction = transaction;
+  }
+  public boolean isTransaction() {
+    return transaction;
+  }
+
+
+  /**
+   * Render the beginning of the hyperlink.
+   * Indexed property since 1.1
+   *
+   * @return A symbolic constant telling the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    // Special case for name anchors
+    if(linkName != null) {
+      StringBuffer results = new StringBuffer("<a name=\"");
+      results.append(linkName);
+      results.append("\">");
+      ResponseUtils.write(pageContext, results.toString());
+      return BodyTag.EVAL_BODY_BUFFERED;
+    }
+
+    // Generate the opening anchor element
+    StringBuffer results = new StringBuffer("<a href=\"");
+    results.append(calculateURL());
+    results.append("\">");
+
+    // Print this element to our output writer
+    ResponseUtils.write(pageContext, results.toString());
+
+    // Evaluate the body of this tag
+    this.text = null;
+    return BodyTag.EVAL_BODY_BUFFERED;
+  }
+
+
+  /**
+   * Save the associated label from the body content.
+   *
+   * @return A symbolic constant telling the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doAfterBody() throws JspException {
+    if(bodyContent != null) {
+      String value = bodyContent.getString().trim();
+      if(value.length() > 0)
+        text = value;
+    }
+    return BodyTag.SKIP_BODY;
+  }
+
+
+  /**
+   * Render the end of the hyperlink.
+   *
+   * @return A symbolic constant telling the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doEndTag() throws JspException {
+    // Prepare the textual content and ending element of this hyperlink
+    StringBuffer results = new StringBuffer();
+    if(text != null)
+      results.append(text);
+    results.append("</a>");
+
+    // Render the remainder to the output stream
+    ResponseUtils.write(pageContext, results.toString());
+
+    // Evaluate the remainder of this page
+    return BodyTag.EVAL_PAGE;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    action = null;
+    anchor = null;
+    forward = null;
+    href = null;
+    linkName = null;
+    name = null;
+    page = null;
+    paramId = null;
+    paramName = null;
+    paramProperty = null;
+    paramScope = null;
+    property = null;
+    scope = null;
+    text = null;
+    transaction = false;
+  }
+
+
+  /**
+   * Return the complete URL to which this hyperlink will direct the user.
+   *
+   * @return The URL in string format
+   * @exception JspException if an exception is thrown calculating the value
+   */
+  protected String calculateURL() throws JspException {
+    // Identify the parameters we will add to the completed URL
+    Map params = RequestUtils.computeParameters(pageContext, paramId,
+        paramName, paramProperty, paramScope, name, property, scope, transaction);
+
+    // if "indexed=true", add "index=x" parameter to query string
+    // since 1.1
+    if(indexed) {
+      // look for outer iterate tag
+      IterateTag iterateTag = (IterateTag)findAncestorWithClass(this, IterateTag.class);
+      if (iterateTag == null) {
+        // This tag should only be nested in an iterate tag
+        // If it's not, throw exception
+        JspException e = new JspException(messages.getMessage("indexed.noEnclosingIterate"));
+        RequestUtils.saveException(pageContext, e);
+        throw e;
+      }
+
+      //calculate index, and add as a parameter
+      if(params == null) {
+        params = new HashMap();             //create new HashMap if no other params
+      }
+      if(indexId != null) {
+        params.put(indexId, Integer.toString(iterateTag.getIndex()));
+      } else {
+        params.put("index", Integer.toString(iterateTag.getIndex()));
+      }
+    }
+
+    String url = null;
+    try {
+      url = RequestUtils.computeURL(pageContext, forward, href, page, action,
+          params, anchor, false);
+    } catch (MalformedURLException e) {
+      RequestUtils.saveException(pageContext, e);
+      throw new JspException(messages.getMessage("rewrite.url", e.toString()));
+    }
+    return url;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/LocalStrings.properties contrib/wml/src/share/org/apache/struts/taglib/wml/LocalStrings.properties
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/LocalStrings.properties	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/LocalStrings.properties	2002-05-21 09:13:24.000000000 -0400
@@ -0,0 +1,46 @@
+access.noEnclosingHead=access is only valid within an enclosing head tag
+common.both=You can specify either the literal value or a message key but not both
+common.io=Encountered input/output error: {0}
+enumerateTag.enumeration=Cannot create enumeration for {0}
+cardTag.collections=Cannot find ActionMappings or ActionFormBeans collection
+cardTag.create=Exception creating bean of class {0}: {1}
+cardTag.formBean=Cannot retrieve definition for form bean {0}
+cardTag.mapping=Cannot retrieve mapping for action {0}
+cardTag.nameType=Must specify type attribute if name is specified
+cardTag.nesting=Cannot next card tags
+forwardTag.forward=Error forwarding to page {0}: {1}
+forwardTag.lookup=Cannot find global forward named {0}
+forwardTag.redirect=Error redirecting to path {0}: {1}
+getter.access=Cannot access property {0} for bean under name {1}
+getter.bean=Cannot find bean under name {0}
+getter.method=No getter method available for property {0} for bean under name {1}
+getter.name=You must specify a name attribute if the property attribute is present
+getter.property=Property {0} returned a null value
+getter.result=Getter for property {0} threw exception: {1}
+imgTag.alt=You may specify either alt or altKey but not both
+imgTag.bundle=Cannot find message resources bundle under key {0}
+imgTag.src=You must specify exactly one of src, srcKey, page, or pageKey
+imgTag.title=You may specify either title or titleKey but not both
+imgTag.type=Object must be of type Map
+includeTag.include=Error including page {0}: {1}
+includeTag.lookup=Cannot find global forward named {0}
+indexed.noEnclosingIterate=indexed=\"true\" is only valid within an enclosing iterate tag
+input.noEnclosingCard=text/password/textarea are only valid within an enclosing card tag
+iterateTag.iterator=Cannot create iterator for {0}
+linkTag.destination=You must specify exactly one of 'forward', 'href', or 'page'
+linkTag.forward=Cannot locate global forwarding for {0}
+linkTag.forwards=Cannot locate forwards mapping table
+linkTag.type=Object must be of type Map
+linkTag.type1=Object must be of type Dictionary
+linkTag.url=Cannot create link URL: {0}
+messageTag.message=Missing message for key {0}
+messageTag.resources=Missing resources attribute {0}
+multiboxTag.value=You must specify the value attribute or nested tag content
+optionsCollectionTag.collection=Failed to obtain specified collection
+optionsCollectionTag.iterator=Cannot create iterator for {0}
+optionsCollectionTag.select=OptionsCollection tag must be nested in a Select tag
+optionsTag.enumeration=Cannot create enumeration for {0}
+optionsTag.iterator=Cannot create iterator for {0}
+optionsTag.select=Options tag must be nested in a Select tag
+optionTag.select=Option tag must be nested in a Select tag
+rewrite.url=Cannot create rewrite URL: {0}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/OptionTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/OptionTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/OptionTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/OptionTag.java	2003-02-03 16:15:05.000000000 -0500
@@ -0,0 +1,236 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java,v 1.9 2001/10/05 05:07:47 martinc Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/10/05 05:07:47 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import java.util.Locale;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTag;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import org.apache.struts.Globals;
+import org.apache.struts.action.Action;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+import org.apache.struts.util.ResponseUtils;
+
+
+/**
+ * Tag for select options.  The body of this tag is presented to the user
+ * in the option list, while the value attribute is the value returned to
+ * the server if this option is selected.
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 1.9 $ $Date: 2001/10/05 05:07:47 $
+ */
+public class OptionTag extends BodyTagSupport {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  /**
+   * The default locale for our server.
+   */
+  protected static final Locale defaultLocale = Locale.getDefault();
+
+  /**
+   * The message text to be displayed to the user for this tag (if any)
+   */
+  protected String text = null;
+
+  protected String bundle = null;
+  protected boolean disabled = false;
+  protected String key = null;
+  protected String locale = Globals.LOCALE_KEY;
+  protected String value;
+
+  public String getBundle() {
+    return bundle;
+  }
+  public void setBundle(String bundle) {
+    this.bundle = bundle;
+  }
+  public void setDisabled(boolean disabled) {
+    this.disabled = disabled;
+  }
+  public boolean isDisabled() {
+    return disabled;
+  }
+  public void setKey(String key) {
+    this.key = key;
+  }
+  public String getKey() {
+    return key;
+  }
+  public void setLocale(String locale) {
+    this.locale = locale;
+  }
+  public String getLocale() {
+    return locale;
+  }
+  public void setValue(String value) {
+    this.value = value;
+  }
+  public String getValue() {
+    return value;
+  }
+
+
+  /**
+   * Process the start of this tag.
+   *
+   * @return A symblic constant telling the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    // Initialize the placeholder for our body content
+    this.text = null;
+
+    // Do nothing until doEndTag() is called
+    return BodyTag.EVAL_BODY_BUFFERED;
+  }
+
+
+  /**
+   * Process the body text of this tag (if any).
+   *
+   * @return A symblic constant telling the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doAfterBody() throws JspException {
+    String text = bodyContent.getString();
+    if(text != null) {
+      text = text.trim();
+      if(text.length() > 0)
+        this.text = text;
+    }
+    return BodyTag.SKIP_BODY;
+  }
+
+
+  /**
+   * Process the end of this tag.
+   *
+   * @return A symblic constant telling the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doEndTag() throws JspException {
+    // Acquire the select tag we are associated with
+    SelectTag selectTag = (SelectTag)pageContext.getAttribute(Constants.SELECT_KEY);
+    if(selectTag == null) {
+      JspException e = new JspException(messages.getMessage("optionTag.select"));
+      RequestUtils.saveException(pageContext, e);
+      throw e;
+    }
+
+    // Generate the <option> element
+    selectTag.setFirstOption(value);
+    StringBuffer results = new StringBuffer();
+    results.append("<option value=\"");
+    results.append(value);
+    results.append("\"");
+    if(disabled)
+      results.append(" disabled=\"disabled\"");
+    results.append(">");
+    String text = text();
+    if(text == null)
+      results.append(value);
+    else
+      results.append(text);
+    results.append("</option>");
+
+    // Render this element to our writer
+    ResponseUtils.write(pageContext, results.toString());
+
+    // Continue evaluating this page
+    return BodyTag.EVAL_PAGE;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    bundle = Action.MESSAGES_KEY;
+    disabled = false;
+    key = null;
+    locale = Globals.LOCALE_KEY;
+    text = null;
+    value = null;
+  }
+
+
+  /**
+   * Return the text to be displayed to the user for this option (if any).
+   *
+   * @return The text for the option
+   * @exception JspException if an error occurs
+   */
+  protected String text() throws JspException {
+    if(this.text != null)
+      return this.text;
+    else
+      return RequestUtils.message(pageContext, bundle, locale, key);
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/OptionsCollectionTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/OptionsCollectionTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/OptionsCollectionTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/OptionsCollectionTag.java	2003-02-03 16:55:19.000000000 -0500
@@ -0,0 +1,296 @@
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.Tag;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+import org.apache.struts.util.ResponseUtils;
+
+
+/**
+ * Tag for creating multiple &lt;select&gt; options from a collection. The
+ * collection may be part of the enclosing form, or may be independent of
+ * the form. Each element of the collection must expose a 'label' and a
+ * 'value', the property names of which are configurable by attributes of
+ * this tag.
+ * <p>
+ * The collection may be an array of objects, a Collection, an Enumeration,
+ * an Iterator, or a Map.
+ * <p>
+ * <b>NOTE</b> - This tag requires a Java2 (JDK 1.2 or later) platform.
+ *
+ * @author Martin Cooper
+ * @version $Revision: 1.2 $ $Date: 2002/03/17 02:25:43 $
+ */
+public class OptionsCollectionTag extends TagSupport {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  protected String label = "label";
+  protected String name = Constants.BEAN_KEY;
+  protected String property = null;
+  protected String value = "value";
+  protected boolean filter = true;
+
+  public String getLabel() {
+    return label;
+  }
+  public void setLabel(String label) {
+    this.label = label;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+  public String getName() {
+    return name;
+  }
+  public void setProperty(String property) {
+    this.property = property;
+  }
+  public String getProperty() {
+    return property;
+  }
+  public void setValue(String value) {
+    this.value = value;
+  }
+  public String getValue() {
+    return value;
+  }
+  public void setFilter(boolean filter) {
+    this.filter = filter;
+  }
+  public boolean isFilter() {
+    return filter;
+  }
+
+
+  /**
+   * Process the start of this tag.
+   *
+   * @return A symbolic constant telling the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    // Acquire the select tag we are associated with
+    SelectTag selectTag = (SelectTag)pageContext.getAttribute(Constants.SELECT_KEY);
+
+    if(selectTag == null) {
+      JspException e = new JspException(messages.getMessage("optionsCollectionTag.select"));
+      RequestUtils.saveException(pageContext, e);
+      throw e;
+    }
+
+    // Acquire the collection containing our options
+    Object collection = RequestUtils.lookup(pageContext, name, property, null);
+
+    if (collection == null) {
+      JspException e = new JspException(messages.getMessage("optionsCollectionTag.collection"));
+      RequestUtils.saveException(pageContext, e);
+      throw e;
+    }
+
+    // Acquire an iterator over the options collection
+    Iterator iter = getIterator(collection);
+
+    StringBuffer sb = new StringBuffer();
+
+    // Render the options
+    while (iter.hasNext()) {
+      Object bean = iter.next();
+      Object beanLabel = null;
+      Object beanValue = null;
+
+      // Get the label for this option
+      try {
+        beanLabel = PropertyUtils.getProperty(bean, label);
+        if (beanLabel == null) {
+          beanLabel = "";
+        }
+      } catch (IllegalAccessException e) {
+        JspException jspe = new JspException(messages.getMessage("getter.access", label, bean));
+        RequestUtils.saveException(pageContext, jspe);
+        throw jspe;
+      } catch (InvocationTargetException e) {
+        Throwable t = e.getTargetException();
+        JspException jspe = new JspException(messages.getMessage("getter.result", label,
+            t.toString()));
+        RequestUtils.saveException(pageContext, jspe);
+        throw jspe;
+      } catch (NoSuchMethodException e) {
+        JspException jspe = new JspException(messages.getMessage("getter.method", label, bean));
+        RequestUtils.saveException(pageContext, jspe);
+        throw jspe;
+      }
+
+      // Get the value for this option
+      try {
+        beanValue = PropertyUtils.getProperty(bean, value);
+        if (beanValue == null) {
+          beanValue = "";
+        }
+      } catch (IllegalAccessException e) {
+        JspException jspe = new JspException(messages.getMessage("getter.access", value, bean));
+        RequestUtils.saveException(pageContext, jspe);
+        throw jspe;
+      } catch (InvocationTargetException e) {
+        Throwable t = e.getTargetException();
+        JspException jspe = new JspException(messages.getMessage("getter.result", value,
+            t.toString()));
+        RequestUtils.saveException(pageContext, jspe);
+        throw jspe;
+      } catch (NoSuchMethodException e) {
+        JspException jspe = new JspException(messages.getMessage("getter.method", value, bean));
+        RequestUtils.saveException(pageContext, jspe);
+        throw jspe;
+      }
+
+      String stringLabel = beanLabel.toString();
+      String stringValue = beanValue.toString();
+
+      // Render this option
+      addOption(selectTag, sb, stringLabel, stringValue);
+    }
+
+    // Render this element to our writer
+    ResponseUtils.write(pageContext, sb.toString());
+
+    return Tag.SKIP_BODY;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    filter = true;
+    label = "label";
+    name = Constants.BEAN_KEY;
+    property = null;
+    value = "value";
+  }
+
+
+  /**
+   * Add an option element to the specified StringBuffer based on the
+   * specified parameters.
+   *
+   * @param selectTag the <code>SelectTag</code> that we belong to
+   * @param sb StringBuffer accumulating our results
+   * @param value Value to be returned to the server for this option
+   * @param label Value to be shown to the user for this option
+  */
+  protected void addOption(SelectTag selectTag, StringBuffer sb, String label, String value) {
+    selectTag.setFirstOption(value);
+    sb.append("<option value=\"");
+    sb.append(value);
+    sb.append("\"");
+    sb.append(">");
+    if (filter) {
+      sb.append(ResponseUtils.filter(label));
+    } else {
+      sb.append(label);
+    }
+    sb.append("</option>\r\n");
+  }
+
+
+  /**
+   * Return an iterator for the option labels or values, based on our
+   * configured properties.
+   *
+   * @param collection The collection to get an Iterator into
+   *
+   * @return An Iterator into the collection
+   *
+   * @exception JspException if an error occurs
+   */
+  protected Iterator getIterator(Object collection) throws JspException {
+    if(collection.getClass().isArray()) {
+      collection = Arrays.asList((Object[])collection);
+    }
+
+    if(collection instanceof Collection) {
+      return ((Collection)collection).iterator();
+    } else if(collection instanceof Iterator) {
+      return (Iterator)collection;
+    } else if(collection instanceof Map) {
+      return ((Map)collection).entrySet().iterator();
+    } else if(collection instanceof Enumeration) {
+      return IteratorUtils.asIterator((Enumeration)collection);
+    } else {
+      throw new JspException(messages.getMessage("optionsCollectionTag.iterator",
+        collection.toString()));
+    }
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/OptionsTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/OptionsTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/OptionsTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/OptionsTag.java	2003-02-03 16:55:36.000000000 -0500
@@ -0,0 +1,339 @@
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.Tag;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.ResponseUtils;
+
+
+/**
+ * Tag for creating multiple &lt;select&gt; options from a collection.  The
+ * associated values displayed to the user may optionally be specified by a
+ * second collection, or will be the same as the values themselves.  Each
+ * collection may be an array of objects, a Collection, an Enumeration,
+ * an Iterator, or a Map.
+ * <b>NOTE</b> - This tag requires a Java2 (JDK 1.2 or later) platform.
+ *
+ * @author Florent Carpentier
+ * @author Craig McClanahan
+ */
+public class OptionsTag extends TagSupport {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  protected String collection = null;
+  protected String name = null;
+  protected String property = null;
+  protected String labelName = null;
+  protected String labelProperty = null;
+  protected boolean filter = true;
+
+  public void setFilter(boolean filter) {
+    this.filter = filter;
+  }
+  public boolean isFilter() {
+    return filter;
+  }
+  public String getCollection() {
+    return collection;
+  }
+  public void setCollection(String collection) {
+    this.collection = collection;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+  public String getName() {
+    return name;
+  }
+  public void setProperty(String property) {
+    this.property = property;
+  }
+  public String getProperty() {
+    return property;
+  }
+  public void setLabelName(String labelName) {
+    this.labelName = labelName;
+  }
+  public String getLabelName() {
+    return labelName;
+  }
+  public void setLabelProperty(String labelProperty) {
+    this.labelProperty = labelProperty;
+  }
+  public String getLabelProperty() {
+    return labelProperty;
+  }
+
+
+  /**
+   * Process the start of this tag.
+   *
+   * @return A symbolic constant to tell the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    return Tag.SKIP_BODY;
+  }
+
+
+  /**
+   * Return an iterator for the option labels or values, based on our
+   * configured properties.
+   *
+   * @param name Name of the bean attribute (if any)
+   * @param property Name of the bean property (if any)
+   *
+   * @return An Iterator through the set of things
+   *
+   * @exception JspException if an error occurs
+   */
+  protected Iterator getIterator(String name, String property) throws JspException {
+    // Identify the bean containing our collection
+    String beanName = name;
+    if(beanName == null) {
+      beanName = Constants.BEAN_KEY;
+    }
+    Object bean = pageContext.findAttribute(beanName);
+    if(bean == null) {
+      throw new JspException(messages.getMessage("getter.bean", beanName));
+    }
+
+    // Identify the collection itself
+    Object collection = bean;
+    if(property != null) {
+      try {
+        collection = PropertyUtils.getProperty(bean, property);
+        if(collection == null) {
+          throw new JspException(messages.getMessage("getter.property", property));
+        }
+      } catch (IllegalAccessException e) {
+        throw new JspException(messages.getMessage("getter.access", property, name));
+      } catch (InvocationTargetException e) {
+        Throwable t = e.getTargetException();
+        throw new JspException(messages.getMessage("getter.result", property, t.toString()));
+      } catch (NoSuchMethodException e) {
+        throw new JspException(messages.getMessage("getter.method", property, name));
+      }
+    }
+
+    // Construct and return an appropriate iterator
+    if(collection.getClass().isArray()) {
+      collection = Arrays.asList((Object[])collection);
+    }
+    if(collection instanceof Collection) {
+      return ((Collection) collection).iterator();
+    } else if(collection instanceof Iterator) {
+      return (Iterator)collection;
+    } else if(collection instanceof Map) {
+      return ((Map) collection).entrySet().iterator();
+    } else if(collection instanceof Enumeration) {
+      return IteratorUtils.asIterator((Enumeration)collection);
+    } else {
+      throw new JspException(messages.getMessage("optionsTag.iterator",
+          collection.toString()));
+    }
+  }
+
+
+  /**
+   * Add an option element to the specified StringBuffer based on the
+   * specified parameters.
+   *
+   * @param selectTag the <code>SelectTag</code> that we belong to
+   * @param sb StringBuffer accumulating our results
+   * @param value Value to be returned to the server for this option
+   * @param label Value to be shown to the user for this option
+   */
+  protected void addOption(SelectTag selectTag, StringBuffer sb, String value, String label) {
+    sb.append("<option value=\"");
+    sb.append(value);
+    sb.append("\"");
+    sb.append(">");
+    if(filter) {
+      sb.append(ResponseUtils.filter(label));
+    } else {
+      sb.append(label);
+    }
+    sb.append("</option>\r\n");
+  }
+
+
+  /**
+   * Process the end of this tag.
+   *
+   * @return A symbolic constant to tell the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doEndTag() throws JspException {
+    // Acquire the select tag we are associated with
+    SelectTag selectTag = (SelectTag)pageContext.getAttribute(Constants.SELECT_KEY);
+    if(selectTag == null)
+      throw new JspException(messages.getMessage("optionsTag.select"));
+    StringBuffer sb = new StringBuffer();
+
+    // If a collection was specified, use that mode to render options
+    if(collection != null) {
+      Iterator collIterator = getIterator(collection, null);
+      while (collIterator.hasNext()) {
+        Object bean = collIterator.next();
+        Object value = null;
+        Object label = null;
+
+        try {
+          value = PropertyUtils.getProperty(bean, property);
+          if (value == null)
+            value = "";
+        } catch (IllegalAccessException e) {
+          throw new JspException(messages.getMessage("getter.access",
+              property, collection));
+        } catch (InvocationTargetException e) {
+          Throwable t = e.getTargetException();
+          throw new JspException(messages.getMessage("getter.result",
+              property, t.toString()));
+        } catch (NoSuchMethodException e) {
+          throw new JspException(messages.getMessage("getter.method",
+              property, collection));
+        }
+
+        try {
+          if (labelProperty != null)
+            label = PropertyUtils.getProperty(bean, labelProperty);
+          else
+            label = value;
+          if(label == null)
+            label = "";
+        } catch (IllegalAccessException e) {
+          throw new JspException(messages.getMessage("getter.access",
+              labelProperty, collection));
+        } catch (InvocationTargetException e) {
+          Throwable t = e.getTargetException();
+          throw new JspException(messages.getMessage("getter.result",
+              labelProperty, t.toString()));
+        } catch (NoSuchMethodException e) {
+          throw new JspException(messages.getMessage("getter.method",
+              labelProperty, collection));
+        }
+
+        String stringValue = value.toString();
+        addOption(selectTag, sb, stringValue, label.toString());
+      }
+    } else {
+      // Construct iterators for the values and labels collections
+      Iterator valuesIterator = getIterator(name, property);
+      Iterator labelsIterator = null;
+      if ((labelName == null) && (labelProperty == null))
+        labelsIterator = getIterator(name, property); // Same coll.
+      else
+        labelsIterator = getIterator(labelName, labelProperty);
+
+      // Render the options tags for each element of the values coll.
+      while (valuesIterator.hasNext()) {
+        Object valueObject = valuesIterator.next();
+        if (valueObject == null) {
+          valueObject = "";
+        }
+        String value = valueObject.toString();
+        String label = value;
+        if (labelsIterator.hasNext()) {
+          Object labelObject = labelsIterator.next();
+          if (labelObject == null) {
+            labelObject = "";
+          }
+          label = labelObject.toString();
+        }
+        addOption(selectTag, sb, value, label);
+      }
+    }
+
+    // Render this element to our writer
+    ResponseUtils.write(pageContext, sb.toString());
+
+    // Evaluate the remainder of this page
+    return Tag.EVAL_PAGE;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    filter = true;
+    collection = null;
+    labelName = null;
+    labelProperty = null;
+    name = null;
+    property = null;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/PasswordTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/PasswordTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/PasswordTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/PasswordTag.java	2003-02-03 15:24:02.000000000 -0500
@@ -0,0 +1,78 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/PasswordTag.java,v 1.1 2001/01/06 21:50:39 mschachter Exp $
+ * $Revision: 1.1 $
+ * $Date: 2001/01/06 21:50:39 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+/**
+ * Custom tag for input fields of type "text".
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 1.1 $ $Date: 2001/01/06 21:50:39 $
+ */
+public class PasswordTag extends BaseFieldTag {
+  /**
+   * Construct a new instance of this tag.
+   */
+  public PasswordTag() {
+    super();
+    this.type = "password";
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/SelectTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/SelectTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/SelectTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/SelectTag.java	2003-02-03 16:56:27.000000000 -0500
@@ -0,0 +1,263 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v 1.10 2001/12/11 17:54:28 oalexeev Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/12/11 17:54:28 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import java.lang.reflect.InvocationTargetException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.BodyTag;
+import javax.servlet.jsp.tagext.Tag;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+import org.apache.struts.util.ResponseUtils;
+
+
+/**
+ * Custom tag that represents a WML select element, associated with a
+ * bean property specified by our attributes.  This tag must be nested
+ * inside a form tag.
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 1.10 $ $Date: 2001/12/11 17:54:28 $
+ */
+public class SelectTag extends BaseHandlerTag {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+  protected boolean multiple = false;
+  protected String name = Constants.BEAN_KEY;
+  protected String property = null;
+  protected String value = null;
+  protected String saveBody = null;
+  protected String firstOption = null;
+
+  public boolean isMultiple() {
+    return multiple;
+  }
+  public void setMultiple(boolean multiple) {
+    this.multiple = multiple;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+  public String getName() {
+    return name;
+  }
+  public void setProperty(String property) {
+    this.property = property;
+  }
+  public String getProperty() {
+    return property;
+  }
+  public void setValue(String value) {
+    this.value = value;
+  }
+  public String getValue() {
+    return value;
+  }
+  public void setFirstOption(String firstOption) {
+    if(this.firstOption == null) {
+      this.firstOption = firstOption;
+    }
+  }
+  public String getFirstOption() {
+    return firstOption;
+  }
+
+
+
+  /**
+  * Render the beginning of this form.
+  * Indexed property since 1.1
+  *
+  * @return A symbolic constant to tell the JSP compiler what to do
+  * @exception JspException if a JSP exception has occurred
+  */
+  public int doStartTag() throws JspException {
+    // Make sure we're inside a <card> element.
+    CardTag card = (CardTag)pageContext.getAttribute(Constants.FORM_KEY, PageContext.REQUEST_SCOPE);
+    if(card == null) {
+      // this tag should only be nested in CardTag, if it's not, throw exception
+      JspException e = new JspException(messages.getMessage("input.noEnclosingCard"));
+      RequestUtils.saveException(pageContext, e);
+      throw e;
+    }
+    this.firstOption = null;
+
+    // Store this tag itself as a page attribute
+    pageContext.setAttribute(Constants.SELECT_KEY, this);
+
+    // Continue processing this page
+    return BodyTag.EVAL_BODY_BUFFERED;
+  }
+
+
+  /**
+   * Save any body content of this tag, which will generally be the
+   * option(s) representing the values displayed to the user.
+   *
+   * @return A symbolic constant to tell the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doAfterBody() throws JspException {
+    if(bodyContent != null) {
+      String value = bodyContent.getString();
+      if(value == null)
+        value = "";
+      saveBody = value.trim();
+    }
+  return Tag.SKIP_BODY;
+  }
+
+
+  /**
+   * Render the end of this form.
+   *
+   * @return A symbolic constant to tell the JSP compiler what to do
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doEndTag() throws JspException {
+    // Remove the page scope attributes we created
+    pageContext.removeAttribute(Constants.SELECT_KEY);
+
+    // Create an appropriate "form" element based on our parameters
+    StringBuffer results = new StringBuffer("<select");
+
+    // Save this for the postfield also
+    CardTag card = (CardTag)pageContext.getAttribute(Constants.FORM_KEY, PageContext.REQUEST_SCOPE);
+    results.append(" name=\"");
+    StringBuffer field = new StringBuffer();
+    if(indexed)
+      prepareIndex(field, name);
+    field.append(property);
+    results.append(card.addField(field.toString()));
+    results.append("\"");
+
+    results.append(" multiple=\"");
+    results.append(multiple);
+    results.append("\"");
+
+
+    if(value == null) {
+      Object bean = RequestUtils.lookup(pageContext, name, null);
+      if(bean == null) {
+        JspException e = new JspException(messages.getMessage("getter.bean", name));
+        RequestUtils.saveException(pageContext, e);
+        throw e;
+      }
+      try {
+        value = BeanUtils.getProperty(bean, property);
+        if(value == null) {
+          value = "";
+        }
+      } catch(InvocationTargetException ite) {
+        Throwable t = ite.getTargetException();
+        throw new JspException(messages.getMessage("getter.result", property, t.toString()));
+      } catch(NoSuchMethodException nsme) {
+        throw new JspException(messages.getMessage("getter.method", property, name));
+      } catch(IllegalAccessException iae) {
+        throw new JspException(messages.getMessage("getter.access", property, name));
+      }
+    }
+
+    // Render the value. If one was specified, then use that. Otherwise,
+    // default to the first choice from the option list.
+    results.append(" value=\"");
+    if(value == null || value.equals("")) {
+      results.append(firstOption);
+    } else {
+      results.append(value);
+    }
+    results.append("\">");
+
+    // Render our body (if there was one)
+    if(saveBody != null)
+      results.append(saveBody);
+
+    // Render a tag representing the end of our current form
+    results.append("</select>");
+
+    // Print this value to our output writer
+    ResponseUtils.write(pageContext, results.toString());
+
+    // Continue processing this page
+    return Tag.EVAL_PAGE;
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    super.release();
+    multiple = false;
+    name = Constants.BEAN_KEY;
+    property = null;
+    value = null;
+    firstOption = null;
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/TextTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/TextTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/TextTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/TextTag.java	2003-02-03 15:24:13.000000000 -0500
@@ -0,0 +1,78 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextTag.java,v 1.1 2001/01/06 21:50:39 mschachter Exp $
+ * $Revision: 1.1 $
+ * $Date: 2001/01/06 21:50:39 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+/**
+ * Custom tag for input fields of type "text".
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 1.1 $ $Date: 2001/01/06 21:50:39 $
+ */
+public class TextTag extends BaseFieldTag {
+  /**
+   * Construct a new instance of this tag.
+   */
+  public TextTag() {
+    super();
+    this.type = "text";
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/share/org/apache/struts/taglib/wml/WmlTag.java contrib/wml/src/share/org/apache/struts/taglib/wml/WmlTag.java
--- contrib.orig/wml/src/share/org/apache/struts/taglib/wml/WmlTag.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/share/org/apache/struts/taglib/wml/WmlTag.java	2003-02-03 16:56:52.000000000 -0500
@@ -0,0 +1,195 @@
+/*
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java,v 1.3 2001/04/18 23:45:02 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/04/18 23:45:02 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.struts.taglib.wml;
+
+import java.util.Locale;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.struts.Globals;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.ResponseUtils;
+
+/**
+ * Renders a WML <wml> element with appropriate language attributes if
+ * there is a current Locale available in the user's session.
+ *
+ * @author Craig R. McClanahan
+ * @author Mitchell Morris
+ * @version $Revision: 1.3 $ $Date: 2001/04/18 23:45:02 $
+ */
+public class WmlTag extends TagSupport {
+  /**
+   * The message resources for this package.
+   */
+  protected static MessageResources messages =
+      MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
+
+
+  /**
+   * Should we set the current Locale for this user if needed?
+   */
+  protected boolean locale = false;
+
+  public boolean getLocale() {
+    return (locale);
+  }
+
+  public void setLocale(boolean locale) {
+    this.locale = locale;
+  }
+
+
+  /**
+   * Process the start of this tag.
+   *
+   * @return the appropriate symbolic constant
+   *
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doStartTag() throws JspException {
+    StringBuffer sb = new StringBuffer("<wml");
+
+    // Use the current Locale to set our language preferences
+    Locale currentLocale = currentLocale();
+    String lang = currentLocale.getLanguage();
+
+    // Does the locale have a language?
+    boolean validLanguage = ((lang != null) && (lang.length() > 0));
+
+    if(this.locale && validLanguage) {
+      sb.append(" xml:lang=\"");
+      sb.append(lang);
+      sb.append("\"");
+    }
+    sb.append(">");
+
+    // Write out the beginning tag for this page
+    ResponseUtils.write(pageContext, sb.toString());
+
+    // Evaluate the included content of this tag
+    return (EVAL_BODY_INCLUDE);
+  }
+
+
+  /**
+   * Process the end of this tag.
+   *
+   * @return the appropriate symbolic constant
+   *
+   * @exception JspException if a JSP exception has occurred
+   */
+  public int doEndTag() throws JspException {
+    ResponseUtils.write(pageContext, "</wml>");
+
+    // Evaluate the remainder of this page
+    return (EVAL_PAGE);
+  }
+
+
+  /**
+   * Release any acquired resources.
+   */
+  public void release() {
+    locale = false;
+  }
+
+
+  // ------------------------------------------------------ Protected Methods
+
+
+  /**
+   * Return the current Locale for this request.  If there is no locale in the session and
+   * the locale attribute is set to "true", this method will create a Locale based on the
+   * client's Accept-Language header or the server's default locale and store it in the
+   * session.  This will always return a Locale and never null.
+   *
+   * @return a <code>Locale</code> object
+   *
+   */
+  protected Locale currentLocale() {
+    // Create a new session if necessary
+    HttpSession session = pageContext.getSession();
+    if(this.locale && (session == null)) {
+      session = ((HttpServletRequest)pageContext.getRequest()).getSession();
+    }
+
+    // Return any currently set Locale in our session
+    Locale current = (Locale)session.getAttribute(Globals.LOCALE_KEY);
+    if(current != null) {
+      return (current);
+    }
+
+    // If client doesn't specify a locale preference in header then default for
+    // server will be returned.
+    current = pageContext.getRequest().getLocale();
+
+    // Store a new current Locale, if requested
+    if(this.locale) {
+      session.setAttribute(Globals.LOCALE_KEY, current);
+    }
+
+    return (current);
+  }
+}
\ No newline at end of file
diff -Nurb contrib.orig/wml/src/struts-wml-exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java contrib/wml/src/struts-wml-exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java
--- contrib.orig/wml/src/struts-wml-exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/src/struts-wml-exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java	2002-10-12 16:21:18.000000000 -0400
@@ -0,0 +1,519 @@
+/*
+ * $Header: /home/cvspublic/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java,v 1.8 2002/10/12 19:21:18 martinc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/10/12 19:21:18 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+
+package org.apache.struts.webapp.exercise;
+
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.util.LabelValueBean;
+
+
+/**
+ * General purpose test bean for Struts custom tag tests.
+ *
+ * @author Craig R. McClanahan
+ * @author Martin F N Cooper
+ * @version $Revision: 1.8 $ $Date: 2002/10/12 19:21:18 $
+ */
+
+public class TestBean extends ActionForm {
+
+
+    // ------------------------------------------------------------- Properties
+
+
+    /**
+     * A collection property where the elements of the collection are
+     * of type <code>LabelValueBean</code>.
+     */
+    private Collection beanCollection = null;
+
+    public Collection getBeanCollection() {
+        if (beanCollection == null) {
+            Vector entries = new Vector(10);
+
+            entries.add(new LabelValueBean("Label 0", "Value 0"));
+            entries.add(new LabelValueBean("Label 1", "Value 1"));
+            entries.add(new LabelValueBean("Label 2", "Value 2"));
+            entries.add(new LabelValueBean("Label 3", "Value 3"));
+            entries.add(new LabelValueBean("Label 4", "Value 4"));
+            entries.add(new LabelValueBean("Label 5", "Value 5"));
+            entries.add(new LabelValueBean("Label 6", "Value 6"));
+            entries.add(new LabelValueBean("Label 7", "Value 7"));
+            entries.add(new LabelValueBean("Label 8", "Value 8"));
+            entries.add(new LabelValueBean("Label 9", "Value 9"));
+
+            beanCollection = entries;
+        }
+
+        return (beanCollection);
+    }
+
+    public void setBeanCollection(Collection beanCollection) {
+        this.beanCollection = beanCollection;
+    }
+
+
+    /**
+     * A multiple-String SELECT element using a bean collection.
+     */
+    private String[] beanCollectionSelect = { "Value 1", "Value 3",
+                                              "Value 5" };
+
+    public String[] getBeanCollectionSelect() {
+        return (this.beanCollectionSelect);
+    }
+
+    public void setBeanCollectionSelect(String beanCollectionSelect[]) {
+        this.beanCollectionSelect = beanCollectionSelect;
+    }
+
+
+    /**
+     * A boolean property whose initial value is true.
+     */
+    private boolean booleanProperty = true;
+
+    public boolean getBooleanProperty() {
+        return (booleanProperty);
+    }
+
+    public void setBooleanProperty(boolean booleanProperty) {
+        this.booleanProperty = booleanProperty;
+    }
+
+
+    /**
+     * A multiple-String SELECT element using a collection.
+     */
+    private String[] collectionSelect = { "Value 2", "Value 4",
+                                          "Value 6" };
+
+    public String[] getCollectionSelect() {
+        return (this.collectionSelect);
+    }
+
+    public void setCollectionSelect(String collectionSelect[]) {
+        this.collectionSelect = collectionSelect;
+    }
+
+
+    /**
+     * A double property.
+     */
+    private double doubleProperty = 321.0;
+
+    public double getDoubleProperty() {
+        return (this.doubleProperty);
+    }
+
+    public void setDoubleProperty(double doubleProperty) {
+        this.doubleProperty = doubleProperty;
+    }
+
+
+    /**
+     * A boolean property whose initial value is false
+     */
+    private boolean falseProperty = false;
+
+    public boolean getFalseProperty() {
+        return (falseProperty);
+    }
+
+    public void setFalseProperty(boolean falseProperty) {
+        this.falseProperty = falseProperty;
+    }
+
+
+    /**
+     * A float property.
+     */
+    private float floatProperty = (float) 123.0;
+
+    public float getFloatProperty() {
+        return (this.floatProperty);
+    }
+
+    public void setFloatProperty(float floatProperty) {
+        this.floatProperty = floatProperty;
+    }
+
+
+    /**
+     * Integer arrays that are accessed as an array as well as indexed.
+     */
+    private int intArray[] = { 0, 10, 20, 30, 40 };
+
+    public int[] getIntArray() {
+        return (this.intArray);
+    }
+
+    public void setIntArray(int intArray[]) {
+        this.intArray = intArray;
+    }
+
+    private int intIndexed[] = { 0, 10, 20, 30, 40 };
+
+    public int getIntIndexed(int index) {
+        return (intIndexed[index]);
+    }
+
+    public void setIntIndexed(int index, int value) {
+        intIndexed[index] = value;
+    }
+
+
+    private int intMultibox[] = new int[0];
+
+    public int[] getIntMultibox() {
+        return (this.intMultibox);
+    }
+
+    public void setIntMultibox(int intMultibox[]) {
+        this.intMultibox = intMultibox;
+    }
+
+    /**
+     * An integer property.
+     */
+    private int intProperty = 123;
+
+    public int getIntProperty() {
+        return (this.intProperty);
+    }
+
+    public void setIntProperty(int intProperty) {
+        this.intProperty = intProperty;
+    }
+
+
+    /**
+     * A long property.
+     */
+    private long longProperty = 321;
+
+    public long getLongProperty() {
+        return (this.longProperty);
+    }
+
+    public void setLongProperty(long longProperty) {
+        this.longProperty = longProperty;
+    }
+
+
+    /**
+     * A multiple-String SELECT element.
+     */
+    private String[] multipleSelect = { "Multiple 3", "Multiple 5",
+                                        "Multiple 7" };
+
+    public String[] getMultipleSelect() {
+        return (this.multipleSelect);
+    }
+
+    public void setMultipleSelect(String multipleSelect[]) {
+        this.multipleSelect = multipleSelect;
+    }
+
+
+    /**
+     * A nested reference to another test bean (populated as needed).
+     */
+    private TestBean nested = null;
+
+    public TestBean getNested() {
+        if (nested == null)
+            nested = new TestBean();
+        return (nested);
+    }
+
+
+    /**
+     * A String property with an initial value of null.
+     */
+    private String nullProperty = null;
+
+    public String getNullProperty() {
+        return (this.nullProperty);
+    }
+
+    public void setNullProperty(String nullProperty) {
+        this.nullProperty = nullProperty;
+    }
+
+
+    /**
+     * A short property.
+     */
+    private short shortProperty = (short) 987;
+
+    public short getShortProperty() {
+        return (this.shortProperty);
+    }
+
+    public void setShortProperty(short shortProperty) {
+        this.shortProperty = shortProperty;
+    }
+
+
+    /**
+     * A single-String value for a SELECT element.
+     */
+    private String singleSelect = "Single 5";
+
+    public String getSingleSelect() {
+        return (this.singleSelect);
+    }
+
+    public void setSingleSelect(String singleSelect) {
+        this.singleSelect = singleSelect;
+    }
+
+
+    /**
+     * String arrays that are accessed as an array as well as indexed.
+     */
+    private String stringArray[] =
+    { "String 0", "String 1", "String 2", "String 3", "String 4" };
+
+    public String[] getStringArray() {
+        return (this.stringArray);
+    }
+
+    public void setStringArray(String stringArray[]) {
+        this.stringArray = stringArray;
+    }
+
+    private String stringIndexed[] =
+    { "String 0", "String 1", "String 2", "String 3", "String 4" };
+
+    public String getStringIndexed(int index) {
+        return (stringIndexed[index]);
+    }
+
+    public void setStringIndexed(int index, String value) {
+        stringIndexed[index] = value;
+    }
+
+
+    private String stringMultibox[] = new String[0];
+
+    public String[] getStringMultibox() {
+        return (this.stringMultibox);
+    }
+
+    public void setStringMultibox(String stringMultibox[]) {
+        this.stringMultibox = stringMultibox;
+    }
+
+    /**
+     * A String property.
+     */
+    private String stringProperty = "This is a string";
+
+    public String getStringProperty() {
+        return (this.stringProperty);
+    }
+
+    public void setStringProperty(String stringProperty) {
+        this.stringProperty = stringProperty;
+    }
+
+    /**
+     * An empty String property.
+     */
+    private String emptyStringProperty = "";
+
+    public String getEmptyStringProperty() {
+        return (this.emptyStringProperty);
+    }
+
+    public void setEmptyStringProperty(String emptyStringProperty) {
+        this.emptyStringProperty = emptyStringProperty;
+    }
+
+
+    /**
+     * A single-String value for a SELECT element based on resource strings.
+     */
+    private String resourcesSelect = "Resources 2";
+
+    public String getResourcesSelect() {
+        return (this.resourcesSelect);
+    }
+
+    public void setResourcesSelect(String resourcesSelect) {
+        this.resourcesSelect = resourcesSelect;
+    }
+
+
+    /**
+     * A property that allows a null value but is still used in a SELECT.
+     */
+    private String withNulls = null;
+
+    public String getWithNulls() {
+        return (this.withNulls);
+    }
+
+    public void setWithNulls(String withNulls) {
+        this.withNulls = withNulls;
+    }
+
+
+    /**
+     * A List property.
+     */
+    private List listProperty = null;
+
+    public List getListProperty() {
+        if (listProperty == null) {
+            listProperty = new ArrayList();
+            listProperty.add("dummy");
+        }
+        return listProperty;
+    }
+
+    public void setListProperty(List listProperty) {
+        this.listProperty = listProperty;
+    }
+
+    /**
+     * An empty List property.
+     */
+    private List emptyListProperty = null;
+
+    public List getEmptyListProperty() {
+        if (emptyListProperty == null) {
+            emptyListProperty = new ArrayList();
+        }
+        return emptyListProperty;
+    }
+
+    public void setEmptyListProperty(List emptyListProperty) {
+        this.emptyListProperty = emptyListProperty;
+    }
+
+
+    /**
+     * A Map property.
+     */
+    private Map mapProperty = null;
+
+    public Map getMapProperty() {
+        if (mapProperty == null) {
+            mapProperty = new HashMap();
+            mapProperty.put("dummy", "dummy");
+        }
+        return mapProperty;
+    }
+
+    public void setMapProperty(Map mapProperty) {
+        this.mapProperty = mapProperty;
+    }
+
+    /**
+     * An empty Map property.
+     */
+    private Map emptyMapProperty = null;
+
+    public Map getEmptyMapProperty() {
+        if (emptyMapProperty == null) {
+            emptyMapProperty = new HashMap();
+        }
+        return emptyMapProperty;
+    }
+
+    public void setEmptyMapProperty(Map emptyMapProperty) {
+        this.emptyMapProperty = emptyMapProperty;
+    }
+
+
+    // --------------------------------------------------------- Public Methods
+
+
+    /**
+     * Reset the properties that will be received as input.
+     */
+    public void reset(ActionMapping mapping, HttpServletRequest request) {
+
+        booleanProperty = false;
+        collectionSelect = new String[0];
+        intMultibox = new int[0];
+        multipleSelect = new String[0];
+        stringMultibox = new String[0];
+        if (nested != null)
+            nested.reset(mapping, request);
+
+    }
+
+
+}
diff -Nurb contrib.orig/wml/web/struts-wml-documentation/WEB-INF/web.xml contrib/wml/web/struts-wml-documentation/WEB-INF/web.xml
--- contrib.orig/wml/web/struts-wml-documentation/WEB-INF/web.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/web/struts-wml-documentation/WEB-INF/web.xml	2001-06-24 21:02:30.000000000 -0400
@@ -0,0 +1,16 @@
+<?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>
+
+
+  <!-- The Welcome File List -->
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff -Nurb contrib.orig/wml/web/struts-wml-exercise-taglib/WEB-INF/struts-config.xml contrib/wml/web/struts-wml-exercise-taglib/WEB-INF/struts-config.xml
--- contrib.orig/wml/web/struts-wml-exercise-taglib/WEB-INF/struts-config.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/web/struts-wml-exercise-taglib/WEB-INF/struts-config.xml	2003-02-04 12:10:55.000000000 -0500
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!DOCTYPE struts-config PUBLIC
+          "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
+          "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+
+<struts-config>
+
+  <form-beans>
+    <form-bean name="testbean"
+               type="org.apache.struts.webapp.exercise.TestBean"/>
+  </form-beans>
+
+  <global-forwards>
+    <forward   name="index"                path="/index.jsp"/>
+    <forward   name="absolute"             path="http://jakarta.apache.org/"/>
+    <forward   name="relative"             path="/index.jsp"/>
+    <forward   name="context-relative"     path="/index.jsp" contextRelative="true"/>
+    <!-- Need a better test for context-relative -->
+  </global-forwards>
+
+  <action-mappings>
+
+    <action    path="/html-select"
+               type="org.apache.struts.webapp.exercise.HtmlSettersAction"
+               name="testbean"
+              scope="session"
+           validate="false">
+      <forward name="input"                path="/html-select.jsp"/>
+    </action>
+
+  </action-mappings>
+
+</struts-config>
diff -Nurb contrib.orig/wml/web/struts-wml-exercise-taglib/WEB-INF/web.xml contrib/wml/web/struts-wml-exercise-taglib/WEB-INF/web.xml
--- contrib.orig/wml/web/struts-wml-exercise-taglib/WEB-INF/web.xml	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/web/struts-wml-exercise-taglib/WEB-INF/web.xml	2003-02-04 12:07:05.000000000 -0500
@@ -0,0 +1,70 @@
+<?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>application</param-name>
+      <param-value>org.apache.struts.webapp.exercise.ApplicationResources</param-value>
+    </init-param>
+    <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>
+    <load-on-startup>2</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>index.jsp</welcome-file>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
+
+  <!-- Struts Tag Library Descriptors -->
+  <taglib>
+    <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
+    <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
+    <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
+    <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/struts-wml.tld</taglib-uri>
+    <taglib-location>/WEB-INF/struts-wml.tld</taglib-location>
+  </taglib>
+
+
+</web-app>
diff -Nurb contrib.orig/wml/web/struts-wml-exercise-taglib/index.jsp contrib/wml/web/struts-wml-exercise-taglib/index.jsp
--- contrib.orig/wml/web/struts-wml-exercise-taglib/index.jsp	1969-12-31 19:00:00.000000000 -0500
+++ contrib/wml/web/struts-wml-exercise-taglib/index.jsp	2003-02-04 12:17:44.000000000 -0500
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+
+<%@ page language="java" %>
+<%@ taglib uri="/WEB-INF/struts-wml.tld" prefix="wml" %>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+
+<wml:wml locale="true">
+  <wml:head>
+    <wml:access domain="practicallabs.com"/>
+  </wml:head>
+
+  <!-- Anonymous card -->
+  <wml:card/>
+
+  <!-- Card with an ID -->
+  <wml:card id="bobby"/>
+
+  <!-- Card with some text in it -->
+  <wml:card>
+    <p>This page demonstrates some of the basic tags in the WML library.
+    Note that it doesn't even pretend to show you best practice in usage,
+    merely that the tags get expanded into the right "raw" WML markup.</p>
+  </wml:card>
+
+  <!-- Card with some links -->
+  <wml:card>
+    <p>
+    Forward targets:<br/>
+    <wml:link forward="index">Index target</wml:link><br/>
+    <wml:link forward="absolute">Absolute target</wml:link><br/>
+    <wml:link forward="relative">Relative target</wml:link><br/>
+    <wml:link forward="context-relative">Context-relative target</wml:link><br/>
+    </p>
+
+    <p>
+    Action target:<br/>
+    <wml:link action="html-select.do">An action</wml:link><br/>
+    <p>
+
+    <p>
+    Href target:<br/>
+    <wml:link href="http://jakarta.apache.org/">An href</wml:link><br/>
+    </p>
+
+    <p>
+    Page target:<br/>
+    <wml:link page="/index.jsp">Page target</wml:link><br/>
+    </p>
+  </wml:card>
+
+  <!-- Card with an action and some fields -->
+  <wml:card action="html-select.do">
+    <wml:errors/>
+    <p>
+      <logic:iterate name="testbean" property="beanCollection"
+	  id="beanCollection">
+	<wml:link forward="index" paramId="id" paramName="beanCollection"
+	    paramProperty="label" indexed="true"><bean:write
+	    name="beanCollection" property="value"/></wml:link><br/>
+      </logic:iterate>
+    </p>
+
+    <p>
+      Login: <wml:text property="stringProperty"/><br/>
+      Password: <wml:password property="nullProperty"/><br/>
+      Things to do:
+        <wml:select property="emptyStringProperty">
+          <!-- Explicit option entries -->
+          <wml:option value="A">Buy stuff</wml:option>
+          <wml:option value="B">Sell stuff</wml:option>
+          <wml:option value="C">Trade stuff</wml:option>
+
+          <!-- Collection of options in one bundle -->
+          <wml:options property="stringArray"/>
+
+          <!-- Collection of options in a bean -->
+          <wml:optionsCollection property="beanCollection"/>
+
+        </wml:select><br/>
+    </p>
+  </wml:card>
+
+</wml:wml>