From 372f548f7fec169c94d9b004c4bfb2cdf7c9dbf0 Mon Sep 17 00:00:00 2001
From: "Eric J. Bowersox" <erbo@erbosoft.com>
Date: Mon, 8 Mar 2004 05:13:29 +0000
Subject: [PATCH] update to older Venice sources to modernize things - revamped
 the build system using techniques from newer Dynamo version, allow source to
 compile and work using newer versions of J2SDK, Tomcat, BSF, other libraries;
 bugfixes to get everything running in a newer environment

---
 .gitignore                                    |   2 +
 INSTALL                                       |   5 +-
 build.bat                                     |  30 --
 build.properties.sample                       |  62 ++++
 build.sh                                      |  49 ---
 build.xml                                     | 149 +++++++---
 etc/web.xml                                   |  18 +-
 lib/.gitignore                                |   1 +
 setup/database.sql                            |   2 +-
 .../util/ServletMultipartHandler.java         |  29 +-
 .../silverwrist/util/cache/ObjectCache.java   |   8 +-
 .../venice/db/WrappedConnection.java          | 278 +++++++++++++++++-
 .../venice/ui/conf/jsp/PostBoxTag.java        |  49 ++-
 .../venice/ui/conf/jsp/PostNewTopicTag.java   |   4 +-
 .../venice/ui/conf/jsp/PostParamTag.java      |   4 +-
 .../venice/ui/conf/jsp/PostPseudTag.java      |  21 +-
 .../venice/ui/conf/jsp/PostTextTag.java       |  37 ++-
 .../venice/ui/helpers/LogInOrCreate.java      |  14 +-
 .../venice/ui/jsp/UtilFormTag.java            |  12 +-
 .../venice/ui/jsp/UtilHeaderTag.java          |   8 +-
 .../venice/ui/jsp/UtilHrefTag.java            |   4 +-
 .../venice/ui/jsp/UtilImageTag.java           |   6 +-
 .../venice/ui/jsp/UtilLinkTag.java            |  12 +-
 .../venice/ui/jsp/UtilMenuHeaderItemTag.java  |  10 +-
 .../venice/ui/jsp/UtilMenuHeaderTag.java      |   8 +-
 .../venice/ui/jsp/UtilURLEncodeTag.java       |   4 +-
 .../venice/ui/jsp/UtilXLinkTag.java           |  23 +-
 .../venice/ui/script/ScriptLibrary.java       |  14 +-
 .../venice/ui/script/ScriptManager.java       |   4 +-
 .../venice/ui/servlet/GatewayServlet.java     |  29 +-
 tlds/community-taglib.tld                     |  76 +++--
 tlds/conference-taglib.tld                    |  73 +++--
 tlds/frame-taglib.tld                         |  91 +++---
 tlds/global-taglib.tld                        |  31 +-
 tlds/post-taglib.tld                          |  69 +++--
 tlds/topic-taglib.tld                         | 139 +++++----
 tlds/user-taglib.tld                          |  49 ++-
 tlds/utils-taglib.tld                         | 163 +++++-----
 38 files changed, 1003 insertions(+), 584 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 build.bat
 create mode 100644 build.properties.sample
 delete mode 100755 build.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..81cd42a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+build.properties
+
diff --git a/INSTALL b/INSTALL
index baeb583..0f5e273 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,7 @@ INSTALLATION INSTRUCTIONS
 Software requirements:
     You must install the following software on your system:
 
-    * Java 2 SDK version 1.3.0/1.3.1.  Venice is normally run with the Blackdown
-      JDK port, available at http://www.blackdown.org.
+    * Java 2 SDK version 1.3.0 or higher.
     * Java API for XML Parsing (JAXP) version 1.1, available from
       http://java.sun.com.
     * Java Secure Socket Extension (JSSE) version 1.0.2, available from
@@ -46,7 +45,7 @@ Software requirements:
 Setting Up:
     After extracting the source from CVS, you will need to choose your
     deployment directory.  This will need to be specified as the "deploy.home"
-    property in the build.xml file.  In addition, the three main Venice
+    property in the build.properties file.  In addition, the three main Venice
     configuration files (logging-config.xml, render-config.xml, and
     venice-config.xml) are all copied to the WEB-INF subdirectory of the
     deployment directory, and three parameters in web.xml point to them, so
diff --git a/build.bat b/build.bat
deleted file mode 100644
index 3d372dc..0000000
--- a/build.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@echo off
-: The contents of this file are subject to the Mozilla Public License Version 1.1
-: (the "License"); you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at <http://www.mozilla.org/MPL/>.
-: 
-: Software distributed under the License is distributed on an "AS IS" basis, WITHOUT
-: WARRANTY OF ANY KIND, either express or implied. See the License for the specific
-: language governing rights and limitations under the License.
-: 
-: The Original Code is the Venice Web Community System.
-; 
-: The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
-: for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-: Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
-: 
-; Contributor(s): 
-:
-
-set _CP=%CP%
-
-rem Identify the custom class path components we need
-set CP=%TOMCAT_HOME%\lib\ant.jar;%TOMCAT_HOME%\lib\servlet.jar
-set CP=%TOMCAT_HOME%\lib\jaxp.jar;%TOMCAT_HOME%\lib\parser.jar
-set CP=%CP%;%JAVA_HOME%\lib\tools.jar
-
-rem Execute ANT to perform the requird build target
-java -classpath %CP%;%CLASSPATH% org.apache.tools.ant.Main -Dtomcat.home=%TOMCAT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-set CP=%_CP%
-set _CP=
diff --git a/build.properties.sample b/build.properties.sample
new file mode 100644
index 0000000..b7cf3c6
--- /dev/null
+++ b/build.properties.sample
@@ -0,0 +1,62 @@
+# The contents of this file are subject to the Mozilla Public License Version 1.1
+# (the "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at <http://www.mozilla.org/MPL/>.
+#
+# Software distributed under the License is distributed on an "AS IS" basis, WITHOUT
+# WARRANTY OF ANY KIND, either express or implied. See the License for the specific
+# language governing rights and limitations under the License.
+#
+# The Original Code is the Venice Web Communities System.
+#
+# The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+# for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
+# Copyright (C) 2003-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+#
+# Contributor(s): 
+#########################################################################################
+
+# [Compilation control flags]
+# compile.debug=on
+# compile.deprecation=off
+# compile.optimize=on
+# build.compiler=modern
+
+# [Target directories]
+deploy.home=/home/erbo/venice
+# javadoc.home=${deploy.home}/javadoc
+
+# [Location of Servlet API 2.3]
+servlet.base=/usr/local/java/jakarta-tomcat-4.1.29
+servlet.lib=${servlet.base}/common/lib
+# servlet.jarfile=servlet.jar
+
+# [Location of Commons Collections Library 2.1]
+collections.base=/usr/local/java/commons-collections-2.1
+# collections.lib=${collections.base}
+# collections.jarfile=commons-collections.jar
+
+# [Location of Jakarta Regexp Library 1.3]
+regexp.base=/usr/local/java/jakarta-regexp-1.3
+# regexp.lib=${regexp.base}
+# regexp.jarfile=jakarta-regexp-1.3.jar
+
+# [Location of Log4J 1.2.8]
+log4j.base=/usr/local/java/jakarta-log4j-1.2.8
+# log4j.lib=${log4j.base}/dist/lib
+# log4j.jarfile=log4j-1.2.8.jar
+
+# [Location of Bean Scripting Framework 2.3]
+bsf.base=/usr/local/java/bsf-2.3.0
+# bsf.lib=${bsf.base}/lib
+# bsf.jarfile=bsf.jar
+
+# [Location of Jacl 1.3.1]
+jacl.base=/usr/local/java/jacl1.3.1
+# jacl.lib=${jacl.base}
+# jacl.jarfile=jacl.jar
+# jacl.tcljarfile=tcljava.jar
+
+# [Location of Rhino 1.5R4.1]
+rhino.base=/usr/local/java/rhino1_5R4_1
+# rhino.lib=${rhino.base}
+# rhino.jarfile=js.jar
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 58cacba..0000000
--- a/build.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# The contents of this file are subject to the Mozilla Public License Version 1.1
-# (the "License"); you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at <http://www.mozilla.org/MPL/>.
-# 
-# Software distributed under the License is distributed on an "AS IS" basis, WITHOUT
-# WARRANTY OF ANY KIND, either express or implied. See the License for the specific
-# language governing rights and limitations under the License.
-# 
-# The Original Code is the Venice Web Community System.
-# 
-# The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
-# for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-# Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
-# 
-# Contributor(s): 
-#
-
-# Make sure the value of JAVA_HOME is set
-if [ "x$JAVA_HOME" == "x" ]; then
-  echo "You must set the value of the JAVA_HOME environment variable."
-  exit 1
-fi
-
-# Make sure the value of TOMCAT_HOME is set
-if [ "x$TOMCAT_HOME" == "x" ]; then
-  echo "You must set the value of the TOMCAT_HOME environment variable."
-  exit 1
-fi
-
-# Make sure we can find the JAR files we need
-if [ ! -f $JAVA_HOME/lib/tools.jar ]; then
-  echo "Java tools JAR file (tools.jar) not found in $JAVA_HOME/lib."
-  exit 1
-fi
-if [ ! -f $TOMCAT_HOME/lib/ant.jar ]; then
-  echo "Ant JAR file (ant.jar) not found in $TOMCAT_HOME/lib."
-  exit 1
-fi
-if [ ! -f $TOMCAT_HOME/lib/servlet.jar ]; then
-  echo "Java Servlets JAR file (servlet.jar) not found in $TOMCAT_HOME/lib."
-  exit 1
-fi
-
-# Identify the custom class path components we need
-CP=$TOMCAT_HOME/lib/ant.jar:$TOMCAT_HOME/lib/servlet.jar:$JAVA_HOME/lib/tools.jar
-
-# Execute ANT to perform the requested build target
-java -classpath $CP:$CLASSPATH org.apache.tools.ant.Main -Dtomcat.home=$TOMCAT_HOME "$@"
diff --git a/build.xml b/build.xml
index d5a8cf3..ddd1b89 100644
--- a/build.xml
+++ b/build.xml
@@ -8,26 +8,88 @@
     WARRANTY OF ANY KIND, either express or implied. See the License for the specific
     language governing rights and limitations under the License.
 
-    The Original Code is the Venice Web Community System.
+    The Original Code is the Venice Web Communities System.
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-04 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<project name="Venice" default="compile" basedir=".">
-  <!-- Adapted from default Ant buildfile - EJB 12/29/Y2K -->
+<project name="Venice" default="compile">
 
-  <!-- Global property names -->
-  <property name="app.name" value="venice"/>
-  <property name="deploy.home" value="/home/erbo/venice"/>
-  <property name="dist.home" value="${deploy.home}"/>
-  <property name="dist.src" value="${app.name}.jar"/>
-  <property name="dist.war" value="${app.name}.war"/>
+  <!-- ============================================================================
+    Load build properties
+    ============================================================================ -->
+
+  <property file="build.properties"/>
+
+  <!-- ============================================================================
+    Default build properties
+    ============================================================================ -->
+
+  <!-- [Compilation control flags] -->
+  <property name="compile.debug" value="on"/>
+  <property name="compile.deprecation" value="on"/>
+  <property name="compile.optimize" value="off"/>
+  <property name="build.compiler" value="modern"/>
+
+  <!-- [Target directories] -->
+  <property name="deploy.home" value="../venice"/>
   <property name="javadoc.home" value="${deploy.home}/javadoc"/>
 
-  <!-- Build the base directories that fastupdate requires. -->
+  <!-- [Location of Servlet API 2.3] -->
+  <property name="servlet.base" value="../servletapi"/>
+  <property name="servlet.lib" value="${servlet.base}/lib"/>
+  <property name="servlet.jarfile" value="servlet.jar"/>
+
+  <!-- [Location of Commons Collections Library 2.1] -->
+  <property name="collections.base" value="../commons-collections"/>
+  <property name="collections.lib" value="${collections.base}"/>
+  <property name="collections.jarfile" value="commons-collections.jar"/>
+
+  <!-- [Location of Jakarta Regexp Library 1.3] -->
+  <property name="regexp.base" value="../jakarta-regexp"/>
+  <property name="regexp.lib" value="${regexp.base}"/>
+  <property name="regexp.jarfile" value="jakarta-regexp-1.3.jar"/>
+
+  <!-- [Location of Log4J 1.2.8] -->
+  <property name="log4j.base" value="../log4j"/>
+  <property name="log4j.lib" value="${log4j.base}/dist/lib"/>
+  <property name="log4j.jarfile" value="log4j-1.2.8.jar"/>
+
+  <!-- [Location of Bean Scripting Framework 2.3] -->
+  <property name="bsf.base" value="../bsf"/>
+  <property name="bsf.lib" value="${bsf.base}/lib"/>
+  <property name="bsf.jarfile" value="bsf.jar"/>
+
+  <!-- [Location of Jacl 1.3.1] -->
+  <property name="jacl.base" value="../jacl"/>
+  <property name="jacl.lib" value="${jacl.base}"/>
+  <property name="jacl.jarfile" value="jacl.jar"/>
+  <property name="jacl.tcljarfile" value="tcljava.jar"/>
+
+  <!-- [Location of Rhino 1.5R4.1] -->
+  <property name="rhino.base" value="../rhino"/>
+  <property name="rhino.lib" value="${rhino.base}"/>
+  <property name="rhino.jarfile" value="js.jar"/>
+
+  <!-- ============================================================================
+    Path references
+    ============================================================================ -->
+
+  <path id="base.build.path">
+    <fileset dir="${servlet.lib}" includes="${servlet.jarfile}"/>
+    <fileset dir="${collections.lib}" includes="${collections.jarfile}"/>
+    <fileset dir="${regexp.lib}" includes="${regexp.jarfile}"/>
+    <fileset dir="${log4j.lib}" includes="${log4j.jarfile}"/>
+    <fileset dir="${bsf.lib}" includes="${bsf.jarfile}"/>
+  </path>
+
+  <!-- ============================================================================
+    "mkbasedirs" - Creates the base directories for "fastupdate"
+    ============================================================================ -->
+
   <target name="mkbasedirs">
     <mkdir dir="${deploy.home}"/>
     <mkdir dir="${deploy.home}/WEB-INF"/>
@@ -35,7 +97,11 @@
     <mkdir dir="${deploy.home}/WEB-INF/rpcscripts"/>
   </target>
 
-  <!-- Copy everything to the application directory that can be updated without a restart. -->
+  <!-- ============================================================================
+    "fastupdate" - Copies everything to the deployment directory that can be
+                   copied without a restart.
+    ============================================================================ -->
+
   <target name="fastupdate" depends="mkbasedirs">
     <copy todir="${deploy.home}"> <!-- this copies all the JSP files and stuff -->
       <fileset dir="web"/>
@@ -48,7 +114,11 @@
     </copy>
   </target>
 
-  <!-- Prepare directory for build (copy everything that requires a restart to take effect) -->
+  <!-- ============================================================================
+    "prepare" - Prepare directory for build (copy everything that requires a
+                restart to take effect)
+    ============================================================================ -->
+
   <target name="prepare" depends="mkbasedirs">
     <copy todir="${deploy.home}/WEB-INF">
       <fileset dir="etc">
@@ -60,9 +130,13 @@
     <mkdir  dir="${deploy.home}/WEB-INF/classes"/>
     <mkdir  dir="${deploy.home}/WEB-INF/lib"/>
     <copy todir="${deploy.home}/WEB-INF/lib">
-      <fileset dir="lib">
-        <include name="*.jar"/>
-      </fileset>
+      <fileset dir="${collections.lib}" includes="${collections.jarfile}"/>
+      <fileset dir="${regexp.lib}" includes="${regexp.jarfile}"/>
+      <fileset dir="${log4j.lib}" includes="${log4j.jarfile}"/>
+      <fileset dir="${bsf.lib}" includes="${bsf.jarfile}"/>
+      <!-- <fileset dir="${jacl.lib}" includes="${jacl.jarfile}, ${jacl.tcljarfile}"/> -->
+      <fileset dir="${rhino.lib}" includes="${rhino.jarfile}"/>
+      <fileset dir="lib" includes="*.jar"/>
     </copy>
     <mkdir  dir="${deploy.home}/WEB-INF/tlds"/>
     <copy todir="${deploy.home}/WEB-INF/tlds">
@@ -74,19 +148,16 @@
     <mkdir  dir="${javadoc.home}"/>
   </target>
 
-  <!-- Wipe out the deployment directory -->
-  <target name="clean">
-    <delete dir="${deploy.home}"/>
-  </target>
+  <!-- ============================================================================
+    "compile" - Compile all the Java source
+    ============================================================================ -->
 
-  <!-- Compile all the Java source -->
-  <target name="compile" depends="prepare,fastupdate">
-    <javac srcdir="src" destdir="${deploy.home}/WEB-INF/classes" debug="on" optimize="off" deprecation="on">
+  <target name="compile" depends="prepare, fastupdate">
+    <javac srcdir="src" destdir="${deploy.home}/WEB-INF/classes"
+           debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}">
       <classpath>
-	<fileset dir="${deploy.home}/WEB-INF/lib">
-	  <include name="**/*.jar"/>
-        </fileset>
 	<pathelement location="${deploy.home}/WEB-INF/classes"/>
+        <path refid="base.build.path"/>
       </classpath>
     </javac>
     <copy todir="${deploy.home}/WEB-INF/classes">
@@ -94,22 +165,26 @@
     </copy>
   </target>
 
-  <!-- Create Javadocs -->
+  <!-- ============================================================================
+    "javadoc" - Create Javadocs
+    ============================================================================ -->
+
   <target name="javadoc" depends="mkbasedirs,prepare">
     <javadoc sourcepath="src" packagenames="*" destdir="${javadoc.home}"/>
   </target>
 
-  <!-- Build it all, man -->
-  <target name="all" depends="clean,mkbasedirs,prepare,fastupdate,compile,javadoc"/>
+  <!-- ============================================================================
+    "clean" - Cleans up all stuff that was built
+    ============================================================================ -->
 
-  <!-- Build the distribution .WAR file and JAR up the source code -->
-  <target name="dist" depends="mkbasedirs,prepare,fastupdate,compile">
-    <jar jarfile="${dist.home}/${dist.src}" basedir="."/>
-    <jar jarfile="${dist.home}/${dist.war}" basedir="${deploy.home}"/>
+  <target name="clean">
+    <delete dir="${deploy.home}"/>
   </target>
 
+  <!-- ============================================================================
+    "all" - Build entire project
+    ============================================================================ -->
+
+  <target name="all" depends="clean,mkbasedirs,prepare,fastupdate,compile,javadoc"/>
+
 </project>
-
-
-
-
diff --git a/etc/web.xml b/etc/web.xml
index c4a161a..d41965c 100644
--- a/etc/web.xml
+++ b/etc/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE web-app 
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" 
-    "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" 
+    "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
 <!--
     The contents of this file are subject to the Mozilla Public License Version 1.1
     (the "License"); you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
@@ -172,12 +172,6 @@
     <url-pattern>/passrecovery/*</url-pattern>
   </servlet-mapping>
 
-  <!-- The list of "welcome files" for the application -->
-  <welcome-file-list>
-    <welcome-file>default.jsp</welcome-file>
-    <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
-
   <servlet-mapping>
     <servlet-name>Gateway</servlet-name>
     <url-pattern>/gw</url-pattern>
@@ -203,6 +197,12 @@
     <session-timeout>60</session-timeout>    <!-- 1 hour -->
   </session-config>
 
+  <!-- The list of "welcome files" for the application -->
+  <welcome-file-list>
+    <welcome-file>default.jsp</welcome-file>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
   <!-- Tag library URL definitions. -->
   <taglib>
     <taglib-uri>/tlds/util</taglib-uri>
diff --git a/lib/.gitignore b/lib/.gitignore
index 780e3d3..ebe09ff 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -5,5 +5,6 @@ jakarta-regexp*.jar
 js.jar
 log4j.jar
 mysql.jar
+mysql-connector-*.jar
 mm.mysql*.jar
 tcljava.jar
diff --git a/setup/database.sql b/setup/database.sql
index ad97bc9..e2b8179 100644
--- a/setup/database.sql
+++ b/setup/database.sql
@@ -441,7 +441,7 @@ GRANT ALL PRIVILEGES ON venice.*
     TO erbo@'10.29.99.%' IDENTIFIED BY 'meesatest'
     WITH GRANT OPTION;
 
-GRANT INSERT, DELETE, UPDATE, SELECT ON venice.*
+GRANT INSERT, DELETE, UPDATE, SELECT, LOCK TABLES ON venice.*
     TO venicedb@localhost IDENTIFIED BY 'x00yes2K';
 
 ##############################################################################
diff --git a/src/com/silverwrist/util/ServletMultipartHandler.java b/src/com/silverwrist/util/ServletMultipartHandler.java
index 0f88f7c..b5cdb51 100644
--- a/src/com/silverwrist/util/ServletMultipartHandler.java
+++ b/src/com/silverwrist/util/ServletMultipartHandler.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -148,6 +148,33 @@ public final class ServletMultipartHandler
 
     } // end position
 
+    public int setBytes(long pos, byte[] bytes) throws SQLException
+    {
+      return setBytes(pos,bytes,0,bytes.length);
+
+    } // end setBytes
+
+    public int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException
+    {
+      logger.warn("setBytes() function is not implemented for MultipartDataValue");
+      throw new SQLException("function not implemented");
+
+    } // end setBytes
+
+    public OutputStream setBinaryStream(long pos) throws SQLException
+    {
+      logger.warn("setBinaryStream() function is not implemented for MultipartDataValue");
+      throw new SQLException("function not implemented");
+
+    } // end setBinaryStream
+
+    public void truncate(long len) throws SQLException
+    {
+      logger.warn("truncate() function is not implemented for MultipartDataValue");
+      throw new SQLException("function not implemented");
+
+    } // end truncate
+
   } // end class MultipartDataValue
 
   /*--------------------------------------------------------------------------------
diff --git a/src/com/silverwrist/util/cache/ObjectCache.java b/src/com/silverwrist/util/cache/ObjectCache.java
index 0e63a4a..f6bdccb 100644
--- a/src/com/silverwrist/util/cache/ObjectCache.java
+++ b/src/com/silverwrist/util/cache/ObjectCache.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -35,7 +35,7 @@ public class ObjectCache
    *--------------------------------------------------------------------------------
    */
 
-  private SoftRefHashMap the_data = new SoftRefHashMap();  // actual main data store
+  private ReferenceMap the_data = new ReferenceMap(ReferenceMap.HARD,ReferenceMap.SOFT); // actual main data store
   private LRUMap mru_cache;                                // most-recently-used map
   private ObjectFactory factory;                           // used to create new objects
 
@@ -85,7 +85,6 @@ public class ObjectCache
    */
   public synchronized Object get(Object key)
   {
-    the_data.purge();
     Object rc = mru_cache.get(key);
     if (rc==null)
     { // retrieve from main map, poke back into cache
@@ -137,7 +136,6 @@ public class ObjectCache
    */
   public synchronized void register(Object key, Object data)
   {
-    the_data.purge();
     if (the_data.get(key)!=null)
       throw new ObjectCacheException("object already in cache",key);
     the_data.put(key,data);
@@ -154,7 +152,6 @@ public class ObjectCache
   {
     mru_cache.remove(key);
     the_data.remove(key);
-    the_data.purge();
 
   } // end detach
 
@@ -162,7 +159,6 @@ public class ObjectCache
   {
     mru_cache.clear();
     the_data.clear();
-    the_data.purge();
 
   } // end shutdown
 
diff --git a/src/com/silverwrist/venice/db/WrappedConnection.java b/src/com/silverwrist/venice/db/WrappedConnection.java
index 857cbc3..dcea151 100644
--- a/src/com/silverwrist/venice/db/WrappedConnection.java
+++ b/src/com/silverwrist/venice/db/WrappedConnection.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -386,7 +386,7 @@ class WrappedConnection implements Connection
    * this connection.  The type map will be used for the
    * custom mapping of SQL structured types and distinct types.
    *
-   * @param the <code>java.util.Map</code> object to install
+   * @param map the <code>java.util.Map</code> object to install
    *        as the replacement for this <code>Connection</code>
    *        object's default type map
    * @since 1.2
@@ -398,8 +398,280 @@ class WrappedConnection implements Connection
 
   } // end setTypeMap
 
+  /**
+   * Changes the holdability of <code>ResultSet</code> objects created using this <code>Connection</code>
+   * object to the given holdability.
+   *
+   * @param holdability a <code>ResultSet</code> holdability constant; one of
+   *                    <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or
+   *                    <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code>
+   * @exception java.sql.SQLException if a database access occurs, the given parameter is not a <code>ResultSet</code>
+   *            constant indicating holdability, or the given holdability is not supported
+   * @since 1.4
+   * @see #getHoldability()
+   * @see java.sql.ResultSet
+   */
+  public void setHoldability(int holdability) throws SQLException
+  {
+    conn.setHoldability(holdability);
+
+  } // end setHoldability
+
+  /**
+   * Retrieves the current holdability of <code>ResultSet</code> objects created using this <code>Connection</code>
+   * object.
+   *
+   * @return the holdability, one of <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or
+   *         <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code>
+   * @exception java.sql.SQLException if a database access occurs
+   * @since 1.4
+   * @see #setHoldability(int)
+   * @see java.sql.ResultSet
+   */
+  public int getHoldability() throws SQLException
+  {
+    return conn.getHoldability();
+
+  } // end getHoldability
+
+  /**
+   * Creates an unnamed savepoint in the current transaction and returns the new <code>Savepoint</code> object that
+   * represents it.
+   *
+   * @return the new <code>Savepoint</code> object
+   * @exception java.sql.SQLException if a database access error occurs or this <code>Connection</code> object is
+   *            currently in auto-commit mode
+   * @since 1.4
+   * @see java.sql.Savepoint
+   */
+  public Savepoint setSavepoint() throws SQLException
+  {
+    return conn.setSavepoint();
+
+  } // end setSavepoint
+
+  /**
+   * Creates a savepoint with the given name in the current transaction and returns the new <code>Savepoint</code>
+   * object that represents it.
+   * 
+   * @param name a <code>String</code> containing the name of the savepoint
+   * @return the new <code>Savepoint</code> object
+   * @exception java.sql.SQLException if a database access error occurs or this <code>Connection</code> object is
+   *            currently in auto-commit mode
+   * @since 1.4
+   * @see java.sql.Savepoint
+   */
+  public Savepoint setSavepoint(String name) throws SQLException
+  {
+    return conn.setSavepoint(name);
+
+  } // end setSavepoint
+
+  /**
+   * Undoes all changes made after the given <code>Savepoint</code> object was set.<p>
+   * This method should be used only when auto-commit has been disabled. 
+   *
+   * @param savepoint the <code>Savepoint</code> object to roll back to
+   * @exception java.sql.SQLException if a database access error occurs, the Z<code>Savepoint</code> object is
+   *            no longer valid, or this <code>Connection</code> object is currently in auto-commit mode
+   * @since 1.4
+   * @see java.sql.Savepoint
+   * @see #rollback()
+   */
+  public void rollback(Savepoint savepoint) throws SQLException
+  {
+    conn.rollback(savepoint);
+
+  } // end rollback
+
+  /**
+   * Removes the given <code>Savepoint</code> object from the current transaction. Any reference to the savepoint
+   * after it have been removed will cause an <code>SQLException</code> to be thrown.
+   *
+   * @param savepoint the <code>Savepoint</code> object to be removed
+   * @exception java.sql.SQLException if a database access error occurs or the given <code>Savepoint</code> object
+   *            is not a valid savepoint in the current transaction
+   * @since 1.4
+   */
+  public void releaseSavepoint(Savepoint savepoint) throws SQLException
+  {
+    conn.releaseSavepoint(savepoint);
+
+  } // end releaseSavepoint
+
+  /**
+   * Creates a <code>Statement</code> object that will generate <code>ResultSet</code> objects with the given type,
+   * concurrency, and holdability. This method is the same as the <code>createStatement</code> method above, but it
+   * allows the default result set type, concurrency, and holdability to be overridden.
+   *
+   * @param resultSetType one of the following <code>ResultSet</code> constants:
+   *                      <code>ResultSet.TYPE_FORWARD_ONLY</code>, <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>,
+   *                      or <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+   * @param resultSetConcurrency one of the following <code>ResultSet</code> constants:
+   *                             <code>ResultSet.CONCUR_READ_ONLY</code> or <code>ResultSet.CONCUR_UPDATABLE</code>
+   * @param resultSetHoldability one of the following <code>ResultSet</code> constants:
+   *                             <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or
+   *                             <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code>
+   * @return a new <code>Statement</code> object that will generate <code>ResultSet</code> objects with the given
+   *         type, concurrency, and holdability
+   * @exception java.sql.SQLException if a database access error occurs or the given parameters are not
+   *            <code>ResultSet</code> constants indicating type, concurrency, and holdability
+   * @since 1.4
+   * @see java.sql.ResultSet
+   */
+  public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
+      throws SQLException
+  {
+    return conn.createStatement(resultSetType,resultSetConcurrency,resultSetHoldability);
+
+  } // end createStatement
+
+  /**
+   * Creates a <code>PreparedStatement</code> object that will generate <code>ResultSet</code> objects with the
+   * given type, concurrency, and holdability.<p>
+   * This method is the same as the <code>prepareStatement</code> method above, but it allows the default result
+   * set type, concurrency, and holdability to be overridden. 
+   *
+   * @param sql a <code>String</code> object that is the SQL statement to be sent to the database; may contain one
+   *            or more ? IN parameters
+   * @param resultSetType one of the following <code>ResultSet</code> constants:
+   *                      <code>ResultSet.TYPE_FORWARD_ONLY</code>, <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>,
+   *                      or <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+   * @param resultSetConcurrency one of the following <code>ResultSet</code> constants:
+   *                             <code>ResultSet.CONCUR_READ_ONLY</code> or <code>ResultSet.CONCUR_UPDATABLE</code>
+   * @param resultSetHoldability one of the following <code>ResultSet</code> constants:
+   *                             <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or
+   *                             <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code>
+   * @return a new <code>PreparedStatement</code> object, containing the pre-compiled SQL statement, that will
+   *         generate <code>ResultSet</code> objects with the given type, concurrency, and holdability
+   * @exception java.sql.SQLException if a database access error occurs or the given parameters are not
+   *            <code>ResultSet</code> constants indicating type, concurrency, and holdability
+   * @since 1.4
+   * @see java.sql.ResultSet
+   */
+  public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
+					    int resultSetHoldability) throws SQLException
+  {
+    return conn.prepareStatement(sql,resultSetType,resultSetConcurrency,resultSetHoldability);
+
+  } // end prepareStatement
+
+  /**
+   * Creates a <code>CallableStatement</code> object that will generate <code>ResultSet</code> objects with the
+   * given type and concurrency. This method is the same as the <code>prepareCall</code> method above, but it
+   * allows the default result set type, result set concurrency type and holdability to be overridden.
+   *
+   * @param sql a <code>String</code> object that is the SQL statement to be sent to the database; may contain one
+   *            or more ? parameters
+   * @param resultSetType one of the following <code>ResultSet</code> constants:
+   *                      <code>ResultSet.TYPE_FORWARD_ONLY</code>, <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>,
+   *                      or <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+   * @param resultSetConcurrency one of the following <code>ResultSet</code> constants:
+   *                             <code>ResultSet.CONCUR_READ_ONLY</code> or <code>ResultSet.CONCUR_UPDATABLE</code>
+   * @param resultSetHoldability one of the following <code>ResultSet</code> constants:
+   *                             <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or
+   *                             <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code>
+   * @return a new <code>CallableStatement</code> object, containing the pre-compiled SQL statement, that will
+   *         generate <code>ResultSet</code> objects with the given type, concurrency, and holdability
+   * @exception java.sql.SQLException if a database access error occurs or the given parameters are not
+   *            <code>ResultSet</code> constants indicating type, concurrency, and holdability
+   * @since 1.4
+   * @see java.sql.ResultSet
+   */
+  public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
+				       int resultSetHoldability) throws SQLException
+  {
+    return conn.prepareCall(sql,resultSetType,resultSetConcurrency,resultSetHoldability);
+
+  } // end prepareCall
+
+  /**
+   * Creates a default <code>PreparedStatement</code> object that has the capability to retrieve auto-generated
+   * keys. The given constant tells the driver whether it should make auto-generated keys available for retrieval.
+   * This parameter is ignored if the SQL statement is not an <code>INSERT</code> statement.<p>
+   * <b>Note:</b> This method is optimized for handling parametric SQL statements that benefit from precompilation.
+   * If the driver supports precompilation, the method <code>prepareStatement</code> will send the statement to the
+   * database for precompilation. Some drivers may not support precompilation. In this case, the statement may not
+   * be sent to the database until the <code>PreparedStatement</code> object is executed. This has no direct effect
+   * on users; however, it does affect which methods throw certain <code>SQLException</code>s.<p>
+   * Result sets created using the returned <code>PreparedStatement</code> object will by default be type
+   * <code>TYPE_FORWARD_ONLY</code> and have a concurrency level of <code>CONCUR_READ_ONLY</code>.
+   *
+   * @param sql an SQL statement that may contain one or more '?' IN parameter placeholders
+   * @param autoGeneratedKeys a flag indicating whether auto-generated keys should be returned; one of
+   *                          <code>Statement.RETURN_GENERATED_KEYS</code> or <code>Statement.NO_GENERATED_KEYS</code>
+   * @return a new <code>PreparedStatement</code> object, containing the pre-compiled SQL statement, that will
+   *         generate <code>ResultSet</code> objects with the given type, concurrency, and holdability
+   * @exception java.sql.SQLException if a database access error occurs or the given parameter is not a
+   *            <code>Statement</code> constant indicating whether auto-generated keys should be returned
+   * @since 1.4
+   */
+  public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException
+  {
+    return conn.prepareStatement(sql,autoGeneratedKeys);
+
+  } // end prepareStatement
+
+  /**
+   * Creates a default <code>PreparedStatement</code> object capable of returning the auto-generated keys designated
+   * by the given array. This array contains the indexes of the columns in the target table that contain the
+   * auto-generated keys that should be made available. This array is ignored if the SQL statement is not an
+   * <code>INSERT</code> statement.<p>
+   * An SQL statement with or without IN parameters can be pre-compiled and stored in a <code>PreparedStatement</code>
+   * object. This object can then be used to efficiently execute this statement multiple times.<p>
+   * <b>Note:</b> This method is optimized for handling parametric SQL statements that benefit from precompilation.
+   * If the driver supports precompilation, the method <code>prepareStatement</code> will send the statement to the
+   * database for precompilation. Some drivers may not support precompilation. In this case, the statement may not
+   * be sent to the database until the <code>PreparedStatement</code> object is executed. This has no direct effect
+   * on users; however, it does affect which methods throw certain <code>SQLException</code>s.<p>
+   * Result sets created using the returned <code>PreparedStatement</code> object will by default be type
+   * <code>TYPE_FORWARD_ONLY</code> and have a concurrency level of <code>CONCUR_READ_ONLY</code>.
+   *
+   * @param sql an SQL statement that may contain one or more '?' IN parameter placeholders
+   * @param columnIndexes an array of column indexes indicating the columns that should be returned from the
+   *                      inserted row or rows
+   * @return a new <code>PreparedStatement</code> object, containing the pre-compiled statement, that is capable
+   *         of returning the auto-generated keys designated by the given array of column indexes
+   * @exception java.sql.SQLException if a database access error occurs
+   * @since 1.4
+   */
+  public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException
+  {
+    return conn.prepareStatement(sql,columnIndexes);
+
+  } // end prepareStatement
+
+  /**
+   * Creates a default <code>PreparedStatement</code> object capable of returning the auto-generated keys designated
+   * by the given array. This array contains the names of the columns in the target table that contain the
+   * auto-generated keys that should be returned. This array is ignored if the SQL statement is not an
+   * <code>INSERT</code> statement.<p>
+   * An SQL statement with or without IN parameters can be pre-compiled and stored in a <code>PreparedStatement</code>
+   * object. This object can then be used to efficiently execute this statement multiple times.<p>
+   * <b>Note:</b> This method is optimized for handling parametric SQL statements that benefit from precompilation.
+   * If the driver supports precompilation, the method <code>prepareStatement</code> will send the statement to the
+   * database for precompilation. Some drivers may not support precompilation. In this case, the statement may not
+   * be sent to the database until the <code>PreparedStatement</code> object is executed. This has no direct effect
+   * on users; however, it does affect which methods throw certain <code>SQLException</code>s.<p>
+   * Result sets created using the returned <code>PreparedStatement</code> object will by default be type
+   * <code>TYPE_FORWARD_ONLY</code> and have a concurrency level of <code>CONCUR_READ_ONLY</code>.
+   *
+   * @param sql an SQL statement that may contain one or more '?' IN parameter placeholders
+   * @param columnNames an array of column names indicating the columns that should be returned from the inserted
+   *                    row or rows
+   * @return a new <code>PreparedStatement</code> object, containing the pre-compiled statement, that is capable
+   *         of returning the auto-generated keys designated by the given array of column names
+   * @exception java.sql.SQLException if a database access error occurs
+   * @since 1.4
+   */
+  public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException
+  {
+    return conn.prepareStatement(sql,columnNames);
+
+  } // end prepareStatement
+
   /*--------------------------------------------------------------------------------
-   * Attributes
+   * External operations
    *--------------------------------------------------------------------------------
    */
 
diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostBoxTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostBoxTag.java
index 31c00cb..1fe22ec 100644
--- a/src/com/silverwrist/venice/ui/conf/jsp/PostBoxTag.java
+++ b/src/com/silverwrist/venice/ui/conf/jsp/PostBoxTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -21,11 +21,19 @@ import java.io.IOException;
 import java.util.*;
 import javax.servlet.jsp.*;
 import javax.servlet.jsp.tagext.*;
+import org.apache.log4j.*;
 import com.silverwrist.venice.ui.*;
 import com.silverwrist.venice.ui.helpers.HTMLRendering;
 
 public class PostBoxTag extends VeniceConfBodyTagSupport
 {
+  /*--------------------------------------------------------------------------------
+   * Static data members
+   *--------------------------------------------------------------------------------
+   */
+
+  private static Category logger = Category.getInstance(PostBoxTag.class);
+
   /*--------------------------------------------------------------------------------
    * Attributes
    *--------------------------------------------------------------------------------
@@ -52,24 +60,30 @@ public class PostBoxTag extends VeniceConfBodyTagSupport
 
   public int doStartTag() throws JspException
   {
+    if (logger.isDebugEnabled())
+      logger.debug("PostBoxTag.doStartTag(): entry");
     if (action==null)
       throw new JspTagException("<post:box/> action= attribute not specified!");
     HTMLRendering html = (HTMLRendering)(getRequestInput().queryService(HTMLRendering.class));
     real_type = html.convertLinkType(type);
     if (real_type<0)
       throw new JspTagException("<post:box/> type= attribute not a valid link type");
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
   public int doAfterBody()
   {
+    if (logger.isDebugEnabled())
+      logger.debug("PostBoxTag.doAfterBody(): entry");
     return SKIP_BODY;
 
   } // end doAfterBody
 
   public int doEndTag() throws JspException
   {
+    if (logger.isDebugEnabled())
+      logger.debug("PostBoxTag.doEndTag(): entry");
     if (pseud_name==null)
       throw new JspTagException("<post:box/> tag has no <post:pseud/> tag inside it!");
     if (attach_name==null)
@@ -150,17 +164,10 @@ public class PostBoxTag extends VeniceConfBodyTagSupport
 
     } // end catch
 
-    return EVAL_PAGE;
-
-  } // end doEndTag
-
-  public void release()
-  {
-    super.release();
-    action = null;
-    type = "servlet";
-    real_type = -1;
+    // anything set by subtags must be cleared in doEndTag, not release
     params.clear();
+    newtopic_name = null;
+    newtopic_value = null;
     pseud_name = null;
     pseud_value = null;
     attach_name = null;
@@ -168,6 +175,18 @@ public class PostBoxTag extends VeniceConfBodyTagSupport
     text_name = null;
     text_value = null;
     buttons.clear();
+    return EVAL_PAGE;
+
+  } // end doEndTag
+
+  public void release()
+  {
+    if (logger.isDebugEnabled())
+      logger.debug("PostBoxTag.release(): entry");
+    super.release();
+    action = null;
+    type = "servlet";
+    real_type = -1;
 
   } // end release
 
@@ -195,6 +214,8 @@ public class PostBoxTag extends VeniceConfBodyTagSupport
 
   final void addParam(String name, String value)
   {
+    if (logger.isDebugEnabled())
+      logger.debug("PostBoxTag.addParam(\"" + name + "\",\"" + value + "\") entry");
     params.put(name,value);
 
   } // end addParam
@@ -212,6 +233,8 @@ public class PostBoxTag extends VeniceConfBodyTagSupport
 
   final void setPseud(String param_name, String value) throws JspException
   {
+    if (logger.isDebugEnabled())
+      logger.debug("PostBoxTag.setPseud(\"" + param_name + "\",\"" + value + "\") entry");
     if (pseud_name!=null)
       throw new JspTagException("<post:pseud/> may only appear once inside a <post:box/>!");
     if (param_name==null)
@@ -234,6 +257,8 @@ public class PostBoxTag extends VeniceConfBodyTagSupport
 
   final void setText(String param_name, String value) throws JspException
   {
+    if (logger.isDebugEnabled())
+      logger.debug("PostBoxTag.setText(\"" + param_name + "\",<value>) entry");
     if (text_name!=null)
       throw new JspTagException("<post:text/> may only appear once inside a <post:box/>!");
     if (param_name==null)
diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostNewTopicTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostNewTopicTag.java
index cc45a25..d49b23f 100644
--- a/src/com/silverwrist/venice/ui/conf/jsp/PostNewTopicTag.java
+++ b/src/com/silverwrist/venice/ui/conf/jsp/PostNewTopicTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -40,7 +40,7 @@ public class PostNewTopicTag extends VeniceConfBodyTagSupport
   {
     if (name==null)
       throw new JspTagException("<post:newtopic/> name= attribute not specified!");
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostParamTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostParamTag.java
index 3453dcb..ad7bae3 100644
--- a/src/com/silverwrist/venice/ui/conf/jsp/PostParamTag.java
+++ b/src/com/silverwrist/venice/ui/conf/jsp/PostParamTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -40,7 +40,7 @@ public class PostParamTag extends VeniceConfBodyTagSupport
   {
     if (name==null)
       throw new JspTagException("<post:param/> name= attribute not specified!");
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostPseudTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostPseudTag.java
index 7f0552e..eb75e45 100644
--- a/src/com/silverwrist/venice/ui/conf/jsp/PostPseudTag.java
+++ b/src/com/silverwrist/venice/ui/conf/jsp/PostPseudTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -30,6 +30,7 @@ public class PostPseudTag extends VeniceConfBodyTagSupport
    */
 
   private String name = null;
+  private String bodytext = null;
 
   /*--------------------------------------------------------------------------------
    * Overrides from class BodyTagSupport
@@ -40,20 +41,28 @@ public class PostPseudTag extends VeniceConfBodyTagSupport
   {
     if (name==null)
       throw new JspTagException("<post:pseud/> name= attribute not specified!");
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
   public int doAfterBody() throws JspException
   {
-    PostBoxTag postbox = (PostBoxTag)findAncestorWithClass(this,PostBoxTag.class);
-    if (postbox==null)
-      throw new JspTagException("<post:pseud/> tag must be within a <post:box/> tag!");
-    postbox.setPseud(name,getBodyContent().getString());
+    bodytext = getBodyContent().getString();
     return SKIP_BODY;
 
   } // end doAfterBody
 
+  public int doEndTag() throws JspException
+  {
+    PostBoxTag postbox = (PostBoxTag)findAncestorWithClass(this,PostBoxTag.class);
+    if (postbox==null)
+      throw new JspTagException("<post:pseud/> tag must be within a <post:box/> tag!");
+    postbox.setPseud(name,bodytext);
+    bodytext = null;
+    return EVAL_PAGE;
+
+  } // end doEndTag
+
   public void release()
   {
     super.release();
diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostTextTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostTextTag.java
index 7dc9293..0a4e19c 100644
--- a/src/com/silverwrist/venice/ui/conf/jsp/PostTextTag.java
+++ b/src/com/silverwrist/venice/ui/conf/jsp/PostTextTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -20,16 +20,25 @@ package com.silverwrist.venice.ui.conf.jsp;
 import java.io.IOException;
 import javax.servlet.jsp.*;
 import javax.servlet.jsp.tagext.*;
+import org.apache.log4j.*;
 import com.silverwrist.venice.ui.*;
 
 public class PostTextTag extends VeniceConfBodyTagSupport
 {
+  /*--------------------------------------------------------------------------------
+   * Static data members
+   *--------------------------------------------------------------------------------
+   */
+
+  private static Category logger = Category.getInstance(PostTextTag.class);
+
   /*--------------------------------------------------------------------------------
    * Attributes
    *--------------------------------------------------------------------------------
    */
 
   private String name = null;
+  private String bodytext = null;
 
   /*--------------------------------------------------------------------------------
    * Overrides from class BodyTagSupport
@@ -38,22 +47,36 @@ public class PostTextTag extends VeniceConfBodyTagSupport
 
   public int doStartTag() throws JspException
   {
+    if (logger.isDebugEnabled())
+      logger.debug("PostTextTag.doStartTag(): entry");
     if (name==null)
       throw new JspTagException("<post:text/> name= attribute not specified!");
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
   public int doAfterBody() throws JspException
   {
-    PostBoxTag postbox = (PostBoxTag)findAncestorWithClass(this,PostBoxTag.class);
-    if (postbox==null)
-      throw new JspTagException("<post:text/> tag must be within a <post:box/> tag!");
-    postbox.setText(name,getBodyContent().getString());
+    if (logger.isDebugEnabled())
+      logger.debug("PostTextTag.doAfterBody(): entry");
+    bodytext = getBodyContent().getString();
     return SKIP_BODY;
 
   } // end doAfterBody
 
+  public int doEndTag() throws JspException
+  {
+    if (logger.isDebugEnabled())
+      logger.debug("PostTextTag.doEndTag(): entry");
+    PostBoxTag postbox = (PostBoxTag)findAncestorWithClass(this,PostBoxTag.class);
+    if (postbox==null)
+      throw new JspTagException("<post:text/> tag must be within a <post:box/> tag!");
+    postbox.setText(name,bodytext);
+    bodytext = null;
+    return EVAL_PAGE;
+
+  } // end doEndTag
+
   public void release()
   {
     super.release();
@@ -68,6 +91,8 @@ public class PostTextTag extends VeniceConfBodyTagSupport
 
   public void setName(String v)
   {
+    if (logger.isDebugEnabled())
+      logger.debug("PostTextTag.setName(\"" + v + "\"): entry");
     name = v;
 
   } // end setName
diff --git a/src/com/silverwrist/venice/ui/helpers/LogInOrCreate.java b/src/com/silverwrist/venice/ui/helpers/LogInOrCreate.java
index 996722b..2ea7b3b 100644
--- a/src/com/silverwrist/venice/ui/helpers/LogInOrCreate.java
+++ b/src/com/silverwrist/venice/ui/helpers/LogInOrCreate.java
@@ -11,13 +11,14 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.venice.ui.helpers;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import javax.servlet.*;
 import com.silverwrist.util.StringUtil;
@@ -103,7 +104,16 @@ public class LogInOrCreate extends ThrowableContent implements ContentJSP
 
   public final String getTargetParam()
   {
-    return (rinput!=null) ? URLEncoder.encode(rinput.getLocation()) : null;
+    try
+    { // encode and return the location
+      return (rinput!=null) ? URLEncoder.encode(rinput.getLocation(),"UTF-8") : null;
+
+    } // end try
+    catch (UnsupportedEncodingException e)
+    { // shouldn't happen
+      return null;
+
+    } // end catch
 
   } // end getTargetParam
 
diff --git a/src/com/silverwrist/venice/ui/jsp/UtilFormTag.java b/src/com/silverwrist/venice/ui/jsp/UtilFormTag.java
index 7072cd5..5112378 100644
--- a/src/com/silverwrist/venice/ui/jsp/UtilFormTag.java
+++ b/src/com/silverwrist/venice/ui/jsp/UtilFormTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -67,12 +67,12 @@ public class UtilFormTag extends VeniceTagSupport
     if (ityp==-1)
       throw new JspTagException("<util:form/> invalid action type!");
 
-    // Do parameter replacement on the ACTION string if necessary.
-    if (action.indexOf(LOCATION_PARAM)>=0)
-      action = StringUtil.replaceAllInstances(action,LOCATION_PARAM,URLEncoder.encode(ri.getLocation()));
-
     try
-    { // write out what we came here to accomplish
+    { // Do parameter replacement on the ACTION string if necessary.
+      if (action.indexOf(LOCATION_PARAM)>=0)
+	action = StringUtil.replaceAllInstances(action,LOCATION_PARAM,URLEncoder.encode(ri.getLocation(),"UTF-8"));
+
+      // write out what we came here to accomplish
       JspWriter out = pageContext.getOut();
       out.write("<FORM METHOD=\"" + verb + "\" ");
       if (cls!=null)
diff --git a/src/com/silverwrist/venice/ui/jsp/UtilHeaderTag.java b/src/com/silverwrist/venice/ui/jsp/UtilHeaderTag.java
index 9a5bf1f..0192b6d 100644
--- a/src/com/silverwrist/venice/ui/jsp/UtilHeaderTag.java
+++ b/src/com/silverwrist/venice/ui/jsp/UtilHeaderTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -44,7 +44,7 @@ public class UtilHeaderTag extends VeniceBodyTagSupport
 
   public int doStartTag()
   {
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end UtilHeaderTag
 
@@ -87,6 +87,8 @@ public class UtilHeaderTag extends VeniceBodyTagSupport
 
     } // end catch
 
+    title = null;
+    subtitle = null;
     return EVAL_PAGE;
 
   } // end doEndTag
@@ -94,9 +96,7 @@ public class UtilHeaderTag extends VeniceBodyTagSupport
   public void release()
   {
     super.release();
-    title = null;
     stocktitle = null;
-    subtitle = null;
     stocksubtitle = null;
 
   } // end release
diff --git a/src/com/silverwrist/venice/ui/jsp/UtilHrefTag.java b/src/com/silverwrist/venice/ui/jsp/UtilHrefTag.java
index 944402a..529689f 100644
--- a/src/com/silverwrist/venice/ui/jsp/UtilHrefTag.java
+++ b/src/com/silverwrist/venice/ui/jsp/UtilHrefTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -45,7 +45,7 @@ public class UtilHrefTag extends VeniceBodyTagSupport
     real_type = html.convertLinkType(type);
     if (real_type<0)
       throw new JspTagException("<util:href/> type= attribute not a valid link type");
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
diff --git a/src/com/silverwrist/venice/ui/jsp/UtilImageTag.java b/src/com/silverwrist/venice/ui/jsp/UtilImageTag.java
index 7257255..226c64a 100644
--- a/src/com/silverwrist/venice/ui/jsp/UtilImageTag.java
+++ b/src/com/silverwrist/venice/ui/jsp/UtilImageTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -78,7 +78,7 @@ public class UtilImageTag extends VeniceBodyTagSupport
     if (src==null)
       throw new JspTagException("<util:image/> src= attribute not specified");
 
-    return EVAL_BODY_TAG;;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
@@ -130,6 +130,7 @@ public class UtilImageTag extends VeniceBodyTagSupport
 
     } // end catch
 
+    other_alt = null;
     return EVAL_PAGE;
 
   } // end doEndTag
@@ -143,7 +144,6 @@ public class UtilImageTag extends VeniceBodyTagSupport
     width = null;
     height = null;
     border = "0";
-    other_alt = null;
     align = null;
     hspace = null;
     vspace = null;
diff --git a/src/com/silverwrist/venice/ui/jsp/UtilLinkTag.java b/src/com/silverwrist/venice/ui/jsp/UtilLinkTag.java
index b2d368a..236f96c 100644
--- a/src/com/silverwrist/venice/ui/jsp/UtilLinkTag.java
+++ b/src/com/silverwrist/venice/ui/jsp/UtilLinkTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -65,12 +65,12 @@ public class UtilLinkTag extends VeniceTagSupport
     if (ityp==-1)
       throw new JspTagException("<util:link/> invalid link type!");
 
-    // Do parameter replacement on the HREF string if necessary.
-    if (href.indexOf(LOCATION_PARAM)>=0)
-      href = StringUtil.replaceAllInstances(href,LOCATION_PARAM,URLEncoder.encode(ri.getLocation()));
-
     try
-    { // write out what we came here to accomplish
+    { // Do parameter replacement on the HREF string if necessary.
+      if (href.indexOf(LOCATION_PARAM)>=0)
+	href = StringUtil.replaceAllInstances(href,LOCATION_PARAM,URLEncoder.encode(ri.getLocation(),"UTF-8"));
+
+      // write out what we came here to accomplish
       JspWriter out = pageContext.getOut();
       out.write("<A ");
       if (cls!=null)
diff --git a/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderItemTag.java b/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderItemTag.java
index ce40121..5c4c538 100644
--- a/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderItemTag.java
+++ b/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderItemTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -45,7 +45,7 @@ public class UtilMenuHeaderItemTag extends VeniceBodyTagSupport
   {
     if ((selected!=null) && selected.equals("true"))
       is_selected = true;
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
@@ -71,6 +71,9 @@ public class UtilMenuHeaderItemTag extends VeniceBodyTagSupport
     if (parent==null)
       throw new JspTagException("<util:menuheaderitem/> must be inside a <util:menuheader/>");
     parent.pushItem(href,real_type,text,is_selected);
+    href = null;
+    real_type = -1;
+    text = null;
     return EVAL_PAGE;
 
   } // end doEndTag
@@ -78,11 +81,8 @@ public class UtilMenuHeaderItemTag extends VeniceBodyTagSupport
   public void release()
   {
     super.release();
-    href = null;
     selected = null;
-    real_type = -1;
     is_selected = false;
-    text = null;
 
   } // end release
 
diff --git a/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderTag.java b/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderTag.java
index 05c6f5a..2bcbba4 100644
--- a/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderTag.java
+++ b/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -80,7 +80,7 @@ public class UtilMenuHeaderTag extends VeniceBodyTagSupport
   {
     if (caption==null)
       throw new JspTagException("<util:menuheader/> caption= attribute not specified");
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
@@ -133,6 +133,8 @@ public class UtilMenuHeaderTag extends VeniceBodyTagSupport
 
     } // end catch
 
+    items.clear();
+    selected_item = null;
     return EVAL_PAGE;
 
   } // end doEndTag
@@ -141,8 +143,6 @@ public class UtilMenuHeaderTag extends VeniceBodyTagSupport
   {
     super.release();
     caption = null;
-    items.clear();
-    selected_item = null;
 
   } // end release
 
diff --git a/src/com/silverwrist/venice/ui/jsp/UtilURLEncodeTag.java b/src/com/silverwrist/venice/ui/jsp/UtilURLEncodeTag.java
index 6ff1cb3..5ae5004 100644
--- a/src/com/silverwrist/venice/ui/jsp/UtilURLEncodeTag.java
+++ b/src/com/silverwrist/venice/ui/jsp/UtilURLEncodeTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -36,7 +36,7 @@ public class UtilURLEncodeTag extends VeniceBodyTagSupport
     try
     { // write the escaped information
       JspWriter out = body.getEnclosingWriter();
-      out.write(URLEncoder.encode(body.getString()));
+      out.write(URLEncoder.encode(body.getString(),"UTF-8"));
 
     } // end try
     catch (IOException e)
diff --git a/src/com/silverwrist/venice/ui/jsp/UtilXLinkTag.java b/src/com/silverwrist/venice/ui/jsp/UtilXLinkTag.java
index e2d28fa..ed4b570 100644
--- a/src/com/silverwrist/venice/ui/jsp/UtilXLinkTag.java
+++ b/src/com/silverwrist/venice/ui/jsp/UtilXLinkTag.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -53,7 +53,7 @@ public class UtilXLinkTag extends VeniceBodyTagSupport
 
   public int doStartTag()
   {
-    return EVAL_BODY_TAG;
+    return EVAL_BODY_BUFFERED;
 
   } // end doStartTag
 
@@ -73,15 +73,16 @@ public class UtilXLinkTag extends VeniceBodyTagSupport
     if (text==null)
       throw new JspTagException("<util:xlink/> does not have a <util:text/>!");
 
-    // Do parameter replacement on the HREF string if necessary.
+    // Dig out the RequestInput and HTMLRendering service.
     RequestInput ri = getRequestInput();
-    if (href.indexOf(LOCATION_PARAM)>=0)
-      href = StringUtil.replaceAllInstances(href,LOCATION_PARAM,URLEncoder.encode(ri.getLocation()));
-
     HTMLRendering html = (HTMLRendering)(ri.queryService(HTMLRendering.class));
 
     try
-    { // write out what we came here to accomplish
+    { // Do parameter replacement on the HREF string if necessary.
+      if (href.indexOf(LOCATION_PARAM)>=0)
+	href = StringUtil.replaceAllInstances(href,LOCATION_PARAM,URLEncoder.encode(ri.getLocation(),"UTF-8"));
+
+      // write out what we came here to accomplish
       JspWriter out = pageContext.getOut();
       out.write("<A ");
       if (cls!=null)
@@ -100,6 +101,10 @@ public class UtilXLinkTag extends VeniceBodyTagSupport
 
     } // end catch
 
+    href = null;
+    type = -1;
+    text = null;
+    title = null;
     return EVAL_PAGE;
 
   } // end doEndTag
@@ -107,12 +112,8 @@ public class UtilXLinkTag extends VeniceBodyTagSupport
   public void release()
   {
     super.release();
-    href = null;
-    type = -1;
     cls = null;
     target = null;
-    text = null;
-    title = null;
 
   } // end release
 
diff --git a/src/com/silverwrist/venice/ui/script/ScriptLibrary.java b/src/com/silverwrist/venice/ui/script/ScriptLibrary.java
index 5c7722c..a628ffc 100644
--- a/src/com/silverwrist/venice/ui/script/ScriptLibrary.java
+++ b/src/com/silverwrist/venice/ui/script/ScriptLibrary.java
@@ -11,12 +11,13 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.venice.ui.script;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.*;
 import org.w3c.dom.*;
@@ -187,7 +188,16 @@ public class ScriptLibrary
 
   public final String encodeURL(String s)
   {
-    return URLEncoder.encode(s);
+    try
+    { // encode and return the string
+      return URLEncoder.encode(s,"UTF-8");
+
+    } // end try
+    catch (UnsupportedEncodingException e)
+    { // shouldn't happen
+      return s;
+
+    } // end catch
 
   } // end encodeURL
 
diff --git a/src/com/silverwrist/venice/ui/script/ScriptManager.java b/src/com/silverwrist/venice/ui/script/ScriptManager.java
index 68b4084..e15c306 100644
--- a/src/com/silverwrist/venice/ui/script/ScriptManager.java
+++ b/src/com/silverwrist/venice/ui/script/ScriptManager.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -20,7 +20,7 @@ package com.silverwrist.venice.ui.script;
 import java.lang.reflect.*;
 import java.io.*;
 import java.util.*;
-import com.ibm.bsf.*;
+import org.apache.bsf.*;
 import org.apache.log4j.*;
 import com.silverwrist.util.*;
 import com.silverwrist.venice.ui.*;
diff --git a/src/com/silverwrist/venice/ui/servlet/GatewayServlet.java b/src/com/silverwrist/venice/ui/servlet/GatewayServlet.java
index 97f5b04..293605e 100644
--- a/src/com/silverwrist/venice/ui/servlet/GatewayServlet.java
+++ b/src/com/silverwrist/venice/ui/servlet/GatewayServlet.java
@@ -11,7 +11,7 @@
  * 
  * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -43,15 +43,24 @@ public class GatewayServlet extends BaseServlet
 
   public Object process(RequestInput req)
   {
-    String target = req.getQueryString();
-    if (target==null)
-      return new HTTPError(HttpServletResponse.SC_BAD_REQUEST,"no parameter specified");
-    if (logger.isDebugEnabled())
-      logger.debug("they want to redirect to: " + target);
-    if (req.getUser().isLoggedIn())
-      return new Redirect(target,LinkTypes.ABSOLUTE);
-    else
-      return new Redirect("login.js.vs?tgt=" + URLEncoder.encode(target),LinkTypes.SERVLET);
+    try
+    { // look up the servet we wanna bounce to and try to go there
+      String target = req.getQueryString();
+      if (target==null)
+	return new HTTPError(HttpServletResponse.SC_BAD_REQUEST,"no parameter specified");
+      if (logger.isDebugEnabled())
+	logger.debug("they want to redirect to: " + target);
+      if (req.getUser().isLoggedIn())
+	return new Redirect(target,LinkTypes.ABSOLUTE);
+      else
+	return new Redirect("login.js.vs?tgt=" + URLEncoder.encode(target,"UTF-8"),LinkTypes.SERVLET);
+
+    } // end try
+    catch (UnsupportedEncodingException e)
+    { // shouldn't happen
+      return new HTTPError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,"internal error: " + e.toString());
+
+    } // end catch
 
   } // end process
 
diff --git a/tlds/community-taglib.tld b/tlds/community-taglib.tld
index c603f4b..59a2e63 100644
--- a/tlds/community-taglib.tld
+++ b/tlds/community-taglib.tld
@@ -12,86 +12,80 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <!-- after this the default space is
-       "http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd" -->
-
-  <tlibversion>0.1</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>comm</shortname>
-  <uri></uri>
-  <info>Tag library used to access various community elements.</info>
+  <tlib-version>0.1</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>comm</short-name>
+  <uri>/tlds/community</uri>
+  <description>Tag library used to access various community elements.</description>
 
   <tag>
     <name>name</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.CommunityNameTag</tagclass>
-    <info>Substitutes the community name.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.CommunityNameTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the community name.</description>
   </tag>
 
   <tag>
     <name>ID</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.CommunityIDTag</tagclass>
-    <info>Substitutes the community ID.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.CommunityIDTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the community ID.</description>
   </tag>
 
   <tag>
     <name>can_join</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.CommunityCanJoinTag</tagclass>
-    <info>Includes its content if the user can join the community.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.CommunityCanJoinTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can join the community.</description>
   </tag>
 
   <tag>
     <name>cannot_join</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.CommunityCannotJoinTag</tagclass>
-    <info>Includes its content if the user cannot join the community.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.CommunityCannotJoinTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user cannot join the community.</description>
   </tag>
 
   <tag>
     <name>can_send_invite</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.CommunityCanSendInvitationTag</tagclass>
-    <info>Includes its content if the user can send an invitation to join the community.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.CommunityCanSendInvitationTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can send an invitation to join the community.</description>
   </tag>
 
   <tag>
     <name>is_public</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.CommunityIsPublicTag</tagclass>
-    <info>Includes its content if the community is a public community.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.CommunityIsPublicTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the community is a public community.</description>
   </tag>
 
   <tag>
     <name>is_private</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.CommunityIsPrivateTag</tagclass>
-    <info>Includes its content if the community is a private community.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.CommunityIsPrivateTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the community is a private community.</description>
   </tag>
 
   <tag>
     <name>synopsis</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.CommunitySynopsisTag</tagclass>
-    <info>Substitutes the community synopsis.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.CommunitySynopsisTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the community synopsis.</description>
   </tag>
 
   <tag>
     <name>alias</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.CommunityAliasTag</tagclass>
-    <info>Substitutes the community alias.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.CommunityAliasTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the community alias.</description>
   </tag>
 
 </taglib>
-
-
diff --git a/tlds/conference-taglib.tld b/tlds/conference-taglib.tld
index dcd65b2..4bc2b3d 100644
--- a/tlds/conference-taglib.tld
+++ b/tlds/conference-taglib.tld
@@ -12,84 +12,81 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <!-- after this the default space is
-       "http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd" -->
 
-  <tlibversion>0.1</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>conf</shortname>
-  <uri></uri>
-  <info>Tag library used to access various conference elements.</info>
+  <tlib-version>0.1</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>conf</short-name>
+  <uri>/tlds/conference</uri>
+  <description>Tag library used to access various conference elements.</description>
 
   <tag>
     <name>can_manage</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.ConferenceCanManageTag</tagclass>
-    <info>Includes its content if the user can manage conferences in the current community.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.ConferenceCanManageTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can manage conferences in the current community.</description>
   </tag>
 
   <tag>
     <name>can_create</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.ConferenceCanCreateTag</tagclass>
-    <info>Includes its content if the user can create conferences in the current community.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.ConferenceCanCreateTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can create conferences in the current community.</description>
   </tag>
 
   <tag>
     <name>name</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.ConferenceNameTag</tagclass>
-    <info>Substitutes the conference name.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.ConferenceNameTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the conference name.</description>
   </tag>
 
   <tag>
     <name>ID</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.ConferenceIDTag</tagclass>
-    <info>Substitutes the conference ID.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.ConferenceIDTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the conference ID.</description>
   </tag>
 
   <tag>
     <name>can_read_new</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.ConferenceCanReadNewTag</tagclass>
-    <info>Includes its content if the user can read new messages in the current conference.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.ConferenceCanReadNewTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can read new messages in the current conference.</description>
   </tag>
 
   <tag>
     <name>can_add_to_hotlist</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.ConferenceCanAddToHotlistTag</tagclass>
-    <info>Includes its content if the user can add the current conference to the hotlist.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.ConferenceCanAddToHotlistTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can add the current conference to the hotlist.</description>
   </tag>
 
   <tag>
     <name>default_pseud</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.ConferenceDefaultPseudTag</tagclass>
-    <info>Substitutes the user's default pseud for the conference.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.ConferenceDefaultPseudTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the user's default pseud for the conference.</description>
   </tag>
 
   <tag>
     <name>can_send_invite</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.ConferenceCanSendInviteTag</tagclass>
-    <info>Includes its content if the user can send an invitation for the current conference.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.ConferenceCanSendInviteTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can send an invitation for the current conference.</description>
   </tag>
 
   <tag>
     <name>can_post</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.ConferenceCanPostTag</tagclass>
-    <info>Includes its content if the user can post to the current conference.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.ConferenceCanPostTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can post to the current conference.</description>
   </tag>
 
 </taglib>
diff --git a/tlds/frame-taglib.tld b/tlds/frame-taglib.tld
index 5c896a8..2a48c42 100644
--- a/tlds/frame-taglib.tld
+++ b/tlds/frame-taglib.tld
@@ -12,35 +12,32 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <!-- after this the default space is
-       "http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd" -->
 
-  <tlibversion>0.1</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>frame</shortname>
-  <uri></uri>
-  <info>Tag library used by the frame JSP page to render portions of the UI.</info>
+  <tlib-version>0.1</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>frame</short-name>
+  <uri>/tlds/frame</uri>
+  <description>Tag library used by the frame JSP page to render portions of the UI.</description>
 
   <tag>
     <name>head</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameHeadTag</tagclass>
-    <info>Inserts the information inside the HEAD tag for the frame page.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameHeadTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts the information inside the HEAD tag for the frame page.</description>
   </tag>
 
   <tag>
     <name>body</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameBodyTag</tagclass>
-    <info>Replaces the standard BODY tags on the frame page.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameBodyTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Replaces the standard BODY tags on the frame page.</description>
     <attribute>
       <name>extra</name>
       <required>false</required>
@@ -50,65 +47,65 @@
 
   <tag>
     <name>sitelogo</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameSiteLogoTag</tagclass>
-    <info>Inserts the defined site logo and any link that goes around it.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameSiteLogoTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts the defined site logo and any link that goes around it.</description>
   </tag>
 
   <tag>
     <name>banner_ad</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameBannerAdTag</tagclass>
-    <info>Inserts a banner advertisement into the page.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameBannerAdTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts a banner advertisement into the page.</description>
   </tag>
 
   <tag>
     <name>display_login</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameDisplayLoginTag</tagclass>
-    <info>Includes the enclosed JSP text if the "displayLogin" flag is set on the request.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameDisplayLoginTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes the enclosed JSP text if the "displayLogin" flag is set on the request.</description>
   </tag>
 
   <tag>
     <name>no_display_login</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameNoDisplayLoginTag</tagclass>
-    <info>Includes the enclosed JSP text if the "displayLogin" flag is not set on the request.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameNoDisplayLoginTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes the enclosed JSP text if the "displayLogin" flag is not set on the request.</description>
   </tag>
 
   <tag>
     <name>QID</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameQIDTag</tagclass>
-    <info>Inserts the QID of this page into the page.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameQIDTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts the QID of this page into the page.</description>
   </tag>
 
   <tag>
     <name>if_QID</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameIfQIDTag</tagclass>
-    <info>Includes the enclosed JSP text if the current page has a QID.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameIfQIDTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes the enclosed JSP text if the current page has a QID.</description>
   </tag>
 
   <tag>
     <name>venice_logo</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameVeniceLogoTag</tagclass>
-    <info>Inserts the Venice logo into the page.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameVeniceLogoTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts the Venice logo into the page.</description>
   </tag>
 
   <tag>
     <name>content_here</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameContentHereTag</tagclass>
-    <info>Marks the point where the frame content gets inserted.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameContentHereTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Marks the point where the frame content gets inserted.</description>
   </tag>
 
   <tag>
     <name>leftmenu</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameLeftMenuTag</tagclass>
-    <info>Inserts a left menu bar menu.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameLeftMenuTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts a left menu bar menu.</description>
     <attribute>
       <name>name</name>
       <required>true</required>
@@ -118,9 +115,9 @@
 
   <tag>
     <name>currentmenu</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.FrameCurrentMenuTag</tagclass>
-    <info>Inserts the current "top" menu on the left menu bar.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.FrameCurrentMenuTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts the current "top" menu on the left menu bar.</description>
   </tag>
 
 </taglib>
diff --git a/tlds/global-taglib.tld b/tlds/global-taglib.tld
index 7191836..040e093 100644
--- a/tlds/global-taglib.tld
+++ b/tlds/global-taglib.tld
@@ -12,35 +12,32 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2002-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <!-- after this the default space is
-       "http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd" -->
 
-  <tlibversion>0.1</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>global</shortname>
-  <uri></uri>
-  <info>Tag library used to access various global elements.</info>
+  <tlib-version>0.1</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>global</short-name>
+  <uri>/tlds/global</uri>
+  <description>Tag library used to access various global elements.</description>
 
   <tag>
     <name>categories_enabled</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.GlobalCategoriesEnabledTag</tagclass>
-    <info>Includes its content if categories are enabled in the engine.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.GlobalCategoriesEnabledTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if categories are enabled in the engine.</description>
   </tag>
 
   <tag>
     <name>categories_disabled</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.GlobalCategoriesDisabledTag</tagclass>
-    <info>Includes its content if categories are disabled in the engine.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.GlobalCategoriesDisabledTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if categories are disabled in the engine.</description>
   </tag>
 
 </taglib>
diff --git a/tlds/post-taglib.tld b/tlds/post-taglib.tld
index a46e80a..5b5e2c3 100644
--- a/tlds/post-taglib.tld
+++ b/tlds/post-taglib.tld
@@ -12,35 +12,32 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <!-- after this the default space is
-       "http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd" -->
 
-  <tlibversion>0.1</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>post</shortname>
-  <uri></uri>
-  <info>Tag library relating to Venice post data.</info>
+  <tlib-version>0.1</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>post</short-name>
+  <uri>/tlds/post</uri>
+  <description>Tag library relating to Venice post data.</description>
 
   <tag>
     <name>rewrite</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.PostRewriteTag</tagclass>
-    <info>Rewrites post data for display, resolving postlink: and userlink: URIs.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.PostRewriteTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Rewrites post data for display, resolving postlink: and userlink: URIs.</description>
   </tag>
 
   <tag>
     <name>box</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.PostBoxTag</tagclass>
-    <info>Template for the post box.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.PostBoxTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Template for the post box.</description>
     <attribute>
       <name>action</name>
       <required>true</required>
@@ -55,9 +52,9 @@
 
   <tag>
     <name>param</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.PostParamTag</tagclass>
-    <info>Specifies a hidden parameter for the post box.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.PostParamTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Specifies a hidden parameter for the post box.</description>
     <attribute>
       <name>name</name>
       <required>true</required>
@@ -67,9 +64,11 @@
 
   <tag>
     <name>newtopic</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.PostNewTopicTag</tagclass>
-    <info>Specifies the name of the optional "new topic name" field of the post box, and its contents.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.PostNewTopicTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+      Specifies the name of the optional "new topic name" field of the post box, and its contents.
+    </description>
     <attribute>
       <name>name</name>
       <required>true</required>
@@ -79,9 +78,9 @@
 
   <tag>
     <name>pseud</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.PostPseudTag</tagclass>
-    <info>Specifies the name of the pseud field of the post box, and its contents.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.PostPseudTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Specifies the name of the pseud field of the post box, and its contents.</description>
     <attribute>
       <name>name</name>
       <required>true</required>
@@ -91,9 +90,9 @@
 
   <tag>
     <name>attach</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.PostAttachTag</tagclass>
-    <info>Specifies the name of the attach checkbox of the post box, and whether it is checked.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.PostAttachTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Specifies the name of the attach checkbox of the post box, and whether it is checked.</description>
     <attribute>
       <name>name</name>
       <required>true</required>
@@ -108,9 +107,9 @@
 
   <tag>
     <name>text</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.PostTextTag</tagclass>
-    <info>Specifies the name of the TEXTAREA of the post box, and its contents.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.PostTextTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Specifies the name of the TEXTAREA of the post box, and its contents.</description>
     <attribute>
       <name>name</name>
       <required>true</required>
@@ -120,9 +119,9 @@
 
   <tag>
     <name>button</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.PostButtonTag</tagclass>
-    <info>Inserts a standard button into the post box command buttons area.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.PostButtonTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts a standard button into the post box command buttons area.</description>
     <attribute>
       <name>id</name>
       <required>true</required>
diff --git a/tlds/topic-taglib.tld b/tlds/topic-taglib.tld
index 966fc12..73dfd6c 100644
--- a/tlds/topic-taglib.tld
+++ b/tlds/topic-taglib.tld
@@ -12,161 +12,158 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <!-- after this the default space is
-       "http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd" -->
 
-  <tlibversion>0.1</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>topic</shortname>
-  <uri></uri>
-  <info>Tag library used to access various topic elements.</info>
+  <tlib-version>0.1</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>topic</short-name>
+  <uri>/tlds/topic</uri>
+  <description>Tag library used to access various topic elements.</description>
 
   <tag>
     <name>can_create</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicCanCreateTag</tagclass>
-    <info>Includes its content if the user can create topics in the current conference.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicCanCreateTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can create topics in the current conference.</description>
   </tag>
 
   <tag>
     <name>can_freeze</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicCanFreezeTag</tagclass>
-    <info>Includes its content if the user can freeze or unfreeze the current topic.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicCanFreezeTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can freeze or unfreeze the current topic.</description>
   </tag>
 
   <tag>
     <name>can_archive</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicCanArchiveTag</tagclass>
-    <info>Includes its content if the user can archive or unarchive the current topic.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicCanArchiveTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can archive or unarchive the current topic.</description>
   </tag>
 
   <tag>
     <name>can_delete</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicCanDeleteTag</tagclass>
-    <info>Includes its content if the user can delete the current topic.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicCanDeleteTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can delete the current topic.</description>
   </tag>
 
   <tag>
     <name>ID</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicIDTag</tagclass>
-    <info>Substitutes the topic ID.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicIDTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the topic ID.</description>
   </tag>
 
   <tag>
     <name>number</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicNumberTag</tagclass>
-    <info>Substitutes the topic number.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicNumberTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the topic number.</description>
   </tag>
 
   <tag>
     <name>name</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicNameTag</tagclass>
-    <info>Substitutes the topic name.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicNameTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the topic name.</description>
   </tag>
 
   <tag>
     <name>is_archived</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicIsArchivedTag</tagclass>
-    <info>Includes its content if the topic is archived.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicIsArchivedTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the topic is archived.</description>
   </tag>
 
   <tag>
     <name>is_not_archived</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicIsNotArchivedTag</tagclass>
-    <info>Includes its content if the topic is not archived.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicIsNotArchivedTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the topic is not archived.</description>
   </tag>
 
   <tag>
     <name>is_frozen</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicIsFrozenTag</tagclass>
-    <info>Includes its content if the topic is frozen.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicIsFrozenTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the topic is frozen.</description>
   </tag>
 
   <tag>
     <name>is_not_frozen</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicIsNotFrozenTag</tagclass>
-    <info>Includes its content if the topic is not frozen.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicIsNotFrozenTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the topic is not frozen.</description>
   </tag>
 
   <tag>
     <name>is_hidden</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicIsHiddenTag</tagclass>
-    <info>Includes its content if the topic is hidden.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicIsHiddenTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the topic is hidden.</description>
   </tag>
 
   <tag>
     <name>is_not_hidden</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicIsNotHiddenTag</tagclass>
-    <info>Includes its content if the topic is not hidden.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicIsNotHiddenTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the topic is not hidden.</description>
   </tag>
 
   <tag>
     <name>last_message</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicLastMessageTag</tagclass>
-    <info>Substitutes the index of the last message in the topic.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicLastMessageTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the index of the last message in the topic.</description>
   </tag>
 
   <tag>
     <name>subscribed</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicSubscribedTag</tagclass>
-    <info>Includes its content if the user is subscribed to this topic.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicSubscribedTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user is subscribed to this topic.</description>
   </tag>
 
   <tag>
     <name>not_subscribed</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicNotSubscribedTag</tagclass>
-    <info>Includes its content if the user is not subscribed to this topic.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicNotSubscribedTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user is not subscribed to this topic.</description>
   </tag>
 
   <tag>
     <name>can_send_invite</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicCanSendInvitationTag</tagclass>
-    <info>Includes its content if the user can send an invitation to the current topic.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicCanSendInvitationTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can send an invitation to the current topic.</description>
   </tag>
 
   <tag>
     <name>specified</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicSpecifiedTag</tagclass>
-    <info>Includes its content if the topic was specified.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicSpecifiedTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the topic was specified.</description>
   </tag>
 
   <tag>
     <name>not_specified</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicNotSpecifiedTag</tagclass>
-    <info>Includes its content if the topic was not specified.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicNotSpecifiedTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the topic was not specified.</description>
   </tag>
 
   <tag>
     <name>can_post</name>
-    <tagclass>com.silverwrist.venice.ui.conf.jsp.TopicCanPostTag</tagclass>
-    <info>Includes its content if the user can post to the current topic.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.conf.jsp.TopicCanPostTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user can post to the current topic.</description>
   </tag>
 
 </taglib>
diff --git a/tlds/user-taglib.tld b/tlds/user-taglib.tld
index e121ac1..414151b 100644
--- a/tlds/user-taglib.tld
+++ b/tlds/user-taglib.tld
@@ -12,56 +12,53 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <!-- after this the default space is
-       "http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd" -->
 
-  <tlibversion>0.1</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>user</shortname>
-  <uri></uri>
-  <info>Tag library used to access various user elements.</info>
+  <tlib-version>0.1</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>user</short-name>
+  <uri>/tlds/user</uri>
+  <description>Tag library used to access various user elements.</description>
 
   <tag>
     <name>is_logged_in</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UserIsLoggedInTag</tagclass>
-    <info>Includes its content if the user is logged in.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UserIsLoggedInTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user is logged in.</description>
   </tag>
 
   <tag>
     <name>is_not_logged_in</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UserIsNotLoggedInTag</tagclass>
-    <info>Includes its content if the user is not logged in.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UserIsNotLoggedInTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user is not logged in.</description>
   </tag>
 
   <tag>
     <name>name</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UserNameTag</tagclass>
-    <info>Substitutes the user name.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UserNameTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Substitutes the user name.</description>
   </tag>
 
   <tag>
     <name>is_verified</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UserIsVerifiedTag</tagclass>
-    <info>Includes its content if the user's E-mail address has been verified.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UserIsVerifiedTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user's E-mail address has been verified.</description>
   </tag>
 
   <tag>
     <name>is_not_verified</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UserIsNotVerifiedTag</tagclass>
-    <info>Includes its content if the user's E-mail address has not been verified.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UserIsNotVerifiedTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes its content if the user's E-mail address has not been verified.</description>
   </tag>
 
 </taglib>
diff --git a/tlds/utils-taglib.tld b/tlds/utils-taglib.tld
index fa0883c..c7ace24 100644
--- a/tlds/utils-taglib.tld
+++ b/tlds/utils-taglib.tld
@@ -12,35 +12,32 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+                        "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <!-- after this the default space is
-       "http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd" -->
 
-  <tlibversion>0.1</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>util</shortname>
-  <uri></uri>
-  <info>Utility tag library for JSP renderings.</info>
+  <tlib-version>0.1</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>util</short-name>
+  <uri>/tlds/util</uri>
+  <description>Utility tag library for JSP renderings.</description>
 
   <tag>
     <name>comment</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilCommentTag</tagclass>
-    <info>Conditionally includes HTML comments.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilCommentTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Conditionally includes HTML comments.</description>
   </tag>
 
   <tag>
     <name>color</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilColorTag</tagclass>
-    <info>References a standard color from the configuration.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilColorTag</tag-class>
+    <body-content>empty</body-content>
+    <description>References a standard color from the configuration.</description>
     <attribute>
       <name>name</name>
       <required>true</required>
@@ -50,9 +47,9 @@
 
   <tag>
     <name>font</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilFontTag</tagclass>
-    <info>Includes a standard FONT tag pair.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilFontTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes a standard FONT tag pair.</description>
     <attribute>
       <name>color</name>
       <required>false</required>
@@ -67,9 +64,9 @@
 
   <tag>
     <name>link</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilLinkTag</tagclass>
-    <info>Includes an A tag with the URL possibly modified by the system.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilLinkTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes an A tag with the URL possibly modified by the system.</description>
     <attribute>
       <name>href</name>
       <required>true</required>
@@ -99,23 +96,23 @@
 
   <tag>
     <name>escape</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilEscapeTag</tagclass>
-    <info>Escapes its content so that it's not interpreted as HTML.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilEscapeTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Escapes its content so that it's not interpreted as HTML.</description>
   </tag>
 
   <tag>
     <name>urlencode</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilURLEncodeTag</tagclass>
-    <info>URL-encodes its content.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilURLEncodeTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>URL-encodes its content.</description>
   </tag>
 
   <tag>
     <name>stock_message</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilStockMessageTag</tagclass>
-    <info>References a stock message from the configuration file.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilStockMessageTag</tag-class>
+    <body-content>empty</body-content>
+    <description>References a stock message from the configuration file.</description>
     <attribute>
       <name>key</name>
       <required>true</required>
@@ -125,9 +122,9 @@
 
   <tag>
     <name>button</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilButtonTag</tagclass>
-    <info>Inserts a standard button graphic.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilButtonTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts a standard button graphic.</description>
     <attribute>
       <name>id</name>
       <required>true</required>
@@ -142,9 +139,9 @@
 
   <tag>
     <name>header</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilHeaderTag</tagclass>
-    <info>Inserts a standard content header.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilHeaderTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Inserts a standard content header.</description>
     <attribute>
       <name>title</name>
       <required>false</required>
@@ -169,23 +166,23 @@
 
   <tag>
     <name>title</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilTitleTag</tagclass>
-    <info>Supplies a title for the content header.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilTitleTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Supplies a title for the content header.</description>
   </tag>
 
   <tag>
     <name>subtitle</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilSubtitleTag</tagclass>
-    <info>Supplies a subtitle for the content header.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilSubtitleTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Supplies a subtitle for the content header.</description>
   </tag>
 
   <tag>
     <name>menuheader</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilMenuHeaderTag</tagclass>
-    <info>Demarcates a block that becomes a "menu" header.  Contains util:menuheaderitem tags.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilMenuHeaderTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Demarcates a block that becomes a "menu" header.  Contains util:menuheaderitem tags.</description>
     <attribute>
       <name>caption</name>
       <required>true</required>
@@ -195,9 +192,9 @@
 
   <tag>
     <name>menuheaderitem</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilMenuHeaderItemTag</tagclass>
-    <info>Denotes an item for a menu header.  Must be contained within a util:menuheader tag.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilMenuHeaderItemTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Denotes an item for a menu header.  Must be contained within a util:menuheader tag.</description>
     <attribute>
       <name>selected</name>
       <required>false</required>
@@ -207,9 +204,9 @@
 
   <tag>
     <name>href</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilHrefTag</tagclass>
-    <info>Supplies a HREF link and type for the util:menuheaderitem and util:xlink tags.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilHrefTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Supplies a HREF link and type for the util:menuheaderitem and util:xlink tags.</description>
     <attribute>
       <name>type</name>
       <required>true</required>
@@ -219,16 +216,16 @@
 
   <tag>
     <name>text</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilTextTag</tagclass>
-    <info>Supplies the text for the util:menuheaderitem and util:xlink tags.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilTextTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Supplies the text for the util:menuheaderitem and util:xlink tags.</description>
   </tag>
 
   <tag>
     <name>form</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilFormTag</tagclass>
-    <info>Includes a FORM tag with the URL possibly modified by the system.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilFormTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes a FORM tag with the URL possibly modified by the system.</description>
     <attribute>
       <name>verb</name>
       <required>false</required>
@@ -258,16 +255,16 @@
 
   <tag>
     <name>stdbullet</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilStdBulletTag</tagclass>
-    <info>Inserts the standard "bullet" graphic.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilStdBulletTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Inserts the standard "bullet" graphic.</description>
   </tag>
 
   <tag>
     <name>xlink</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilXLinkTag</tagclass>
-    <info>Includes an A tag built up piecemeal with util:text and util:href.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilXLinkTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Includes an A tag built up piecemeal with util:text and util:href.</description>
     <attribute>
       <name>aclass</name>
       <required>false</required>
@@ -282,16 +279,16 @@
 
   <tag>
     <name>expand_servlet</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilExpandServletTag</tagclass>
-    <info>Expands the servlet address in its body into a full URL.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilExpandServletTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Expands the servlet address in its body into a full URL.</description>
   </tag>
 
   <tag>
     <name>image</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilImageTag</tagclass>
-    <info>Inserts an IMG tag with its URL optionally fixed up.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilImageTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Inserts an IMG tag with its URL optionally fixed up.</description>
     <attribute>
       <name>src</name>
       <required>true</required>
@@ -346,30 +343,30 @@
 
   <tag>
     <name>alt</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilAltTag</tagclass>
-    <info>Supplies the ALT text for the util:image tag.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilAltTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Supplies the ALT text for the util:image tag.</description>
   </tag>
 
   <tag>
     <name>linktitle</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilLinkTitleTag</tagclass>
-    <info>Supplies a title for the xlink tag.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilLinkTitleTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Supplies a title for the xlink tag.</description>
   </tag>
 
   <tag>
     <name>target</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilTargetTag</tagclass>
-    <info>Supplies a target for the xlink tag.</info>
-    <bodycontent>JSP</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilTargetTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>Supplies a target for the xlink tag.</description>
   </tag>
 
   <tag>
     <name>call_jsp</name>
-    <tagclass>com.silverwrist.venice.ui.jsp.UtilCallJSPTag</tagclass>
-    <info>Calls another JSP page from within this one.</info>
-    <bodycontent>EMPTY</bodycontent>
+    <tag-class>com.silverwrist.venice.ui.jsp.UtilCallJSPTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Calls another JSP page from within this one.</description>
     <attribute>
       <name>name</name>
       <required>true</required>